Merge pull request #1388 from gyordong/1188sort

Custom rate and named standard rate for units (Issue #1216)

src/client/app/components/conversion/CreateConversionModalComponent.tsx

@@ -77,9 +77,6 @@ export default function CreateConversionModalComponent() {
 		setConversionState(defaultValues);
 	};
 
-	// Unlike edit, we decided to discard and inputs when you choose to leave the page. The reasoning is
-	// that create starts from an empty template.
-
 	// Submit
 	const handleSubmit = () => {
 		if (validConversion) {

src/client/app/components/conversion/EditConversionModalComponent.tsx

@@ -103,8 +103,8 @@ export default function EditConversionModalComponent(props: EditConversionModalC
 	};
 
 	const handleClose = () => {
-		resetState();
 		props.handleClose();
+		resetState();
 	};
 
 	// Save changes

src/client/app/components/groups/CreateGroupModalComponent.tsx

@@ -178,9 +178,6 @@ export default function CreateGroupModalComponent() {
 		setGraphicUnitsState(graphicUnitsStateDefaults);
 	};
 
-	// Unlike edit, we decided to discard inputs when you choose to leave the page. The reasoning is
-	// that create starts from an empty template.
-
 	// Save changes
 	const handleSubmit = () => {
 		// Close modal first to avoid repeat clicks

src/client/app/components/meters/CreateMeterModalComponent.tsx

@@ -102,9 +102,6 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 		resetState();
 	};
 
-	// Unlike edit, we decided to discard and inputs when you choose to leave the page. The reasoning is
-	// that create starts from an empty template.
-
 	// Submit
 	const handleSubmit = async () => {
 		// Close modal first to avoid repeat clicks
@@ -683,4 +680,4 @@ export default function CreateMeterModalComponent(props: CreateMeterModalProps):
 			</Modal >
 		</>
 	);
-}
+}