Fix small bugs & address review comments

Expensify · Apr 29, 2024 · f7da8c4 · f7da8c4
1 parent 40b9a28
commit f7da8c4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
@@ -1833,7 +1833,7 @@ function updateAddress(policyID: string, newAddress: CompanyAddress) {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         'data[state]': newAddress.state,
         // eslint-disable-next-line @typescript-eslint/naming-convention
-        'data[zipCode]': newAddress.zip,
+        'data[zipCode]': newAddress.zipCode,
     };
 
     const optimisticData: OnyxUpdate[] = [

diff --git a/src/pages/workspace/WorkspaceProfileAddressPage.tsx b/src/pages/workspace/WorkspaceProfileAddressPage.tsx
@@ -1,5 +1,5 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import AddressForm from '@components/AddressForm';
 import type {FormOnyxValues} from '@components/Form/types';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -23,10 +23,10 @@ function WorkspaceProfileAddressPage({policy}: WorkspaceProfileAddressPageProps)
     const {translate} = useLocalize();
     const address = useMemo(() => policy?.address, [policy]);
     const [currentCountry, setCurrentCountry] = useState(address?.country);
-    const [street1, street2] = (address?.addressStreet ?? '').split('\n');
+    const [[street1, street2], setStreets] = useState((address?.addressStreet ?? '').split('\n'));
     const [state, setState] = useState(address?.state);
     const [city, setCity] = useState(address?.city);
-    const [zipcode, setZipcode] = useState(address?.zip);
+    const [zipcode, setZipcode] = useState(address?.zipCode);
 
     const updatePolicyAddress = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM>) => {
         if (!policy) {
@@ -36,7 +36,7 @@ function WorkspaceProfileAddressPage({policy}: WorkspaceProfileAddressPageProps)
             addressStreet: `${values.addressLine1?.trim() ?? ''}\n${values.addressLine2?.trim() ?? ''}`,
             city: values.city.trim(),
             state: values.state.trim(),
-            zip: values?.zipPostCode?.trim().toUpperCase() ?? '',
+            zipCode: values?.zipPostCode?.trim().toUpperCase() ?? '',
             country: values.country,
         });
         Navigation.goBack();
@@ -46,7 +46,7 @@ function WorkspaceProfileAddressPage({policy}: WorkspaceProfileAddressPageProps)
         const countryValue = value as Country | '';
         const addressKey = key as keyof CompanyAddress;
 
-        if (addressKey !== 'country' && addressKey !== 'state' && addressKey !== 'city' && addressKey !== 'zip') {
+        if (addressKey !== 'country' && addressKey !== 'state' && addressKey !== 'city' && addressKey !== 'zipCode') {
             return;
         }
         if (addressKey === 'country') {
@@ -70,6 +70,17 @@ function WorkspaceProfileAddressPage({policy}: WorkspaceProfileAddressPageProps)
         setZipcode(countryValue);
     }, []);
 
+    useEffect(() => {
+        if (!address) {
+            return;
+        }
+        setStreets((address?.addressStreet ?? '').split('\n'));
+        setState(address.state);
+        setCurrentCountry(address.country);
+        setCity(address.city);
+        setZipcode(address.zipCode);
+    }, [address]);
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}

diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -59,7 +59,9 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
 
     const [street1, street2] = (policy?.address?.addressStreet ?? '').split('\n');
     const formattedAddress =
-        !isEmptyObject(policy) && !isEmptyObject(policy.address) ? `${street1.trim()}, ${street2.trim()}, ${policy.address.city}, ${policy.address.state} ${policy.address.zip}` : '';
+        !isEmptyObject(policy) && !isEmptyObject(policy.address)
+            ? `${street1?.trim()}, ${street2 ? `${street2.trim()}, ` : ''}${policy.address.city}, ${policy.address.state} ${policy.address.zipCode ?? ''}`
+            : '';
 
     const onPressCurrency = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_CURRENCY.getRoute(policy?.id ?? '')), [policy?.id]);
     const onPressAddress = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(policy?.id ?? '')), [policy?.id]);

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
@@ -35,7 +35,7 @@ type CompanyAddress = {
     addressStreet: string;
     city: string;
     state: string;
-    zip: string;
+    zipCode: string;
     country: Country | '';
 };