- Fix changes label

- Fix field highlights issue for new local unit
IFRCGo · Dec 23, 2024 · 1624014 · 1624014
1 parent 08c1d9a
commit 1624014
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/...ontextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx b/...ontextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
@@ -650,21 +650,6 @@ function LocalUnitsForm(props: Props) {
         [revertChanges, setShowRevertChangesModalFalse],
     );
 
-    const latestChangesFormFields = useMemo(() => {
-        if (isDefined(localUnitDetailsResponse) && isDefined(previousData)) {
-            return getLatestChangesFormFields(
-                localUnitDetailsResponse,
-                previousData,
-            );
-        }
-        return undefined;
-    }, [localUnitDetailsResponse, previousData]);
-
-    const baseMapFormFieldsChanges = useMemo(() => ({
-        lat: latestChangesFormFields?.['location_json.lat'],
-        lng: latestChangesFormFields?.['location_json.lng'],
-    }), [latestChangesFormFields]);
-
     const onDoneButtonClick = useCallback(
         () => {
             const result = validate();
@@ -745,6 +730,24 @@ function LocalUnitsForm(props: Props) {
         return false;
     }, [previousData]);
 
+    const latestChangesFormFields = useMemo(() => {
+        if (isNewLocalUnit) {
+            return undefined;
+        }
+        if (isDefined(localUnitDetailsResponse) && isDefined(previousData)) {
+            return getLatestChangesFormFields(
+                localUnitDetailsResponse,
+                previousData,
+            );
+        }
+        return undefined;
+    }, [localUnitDetailsResponse, previousData, isNewLocalUnit]);
+
+    const baseMapFormFieldsChanges = useMemo(() => ({
+        lat: latestChangesFormFields?.['location_json.lat'],
+        lng: latestChangesFormFields?.['location_json.lng'],
+    }), [latestChangesFormFields]);
+
     return (
         <div className={styles.localUnitsForm}>
             {isDefined(localUnitDetailsResponse)
@@ -1187,7 +1190,7 @@ function LocalUnitsForm(props: Props) {
                             />
                             <TextInput
                                 inputSectionClassName={_cs(
-                                    latestChangesFormFields?.city_cn
+                                    latestChangesFormFields?.city_en
                                     && styles.changes,
                                 )}
                                 label={strings.localityEn}

diff --git a/...tionalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/useLocalUnitFormFieldLabels.ts b/...tionalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/useLocalUnitFormFieldLabels.ts
@@ -28,7 +28,7 @@ function useLocalUnitFormFieldLabels(props: Props) {
         address_loc: strings.addressLocal,
         city_en: strings.localityEn,
         city_loc: strings.localityLocal,
-        postCode: strings.postCode,
+        postcode: strings.postCode,
         phone: strings.phone,
         email: strings.email,
         link: strings.website,