Merge pull request #30831 from DylanDylann/fix/30304-adress-zipcode-i…

…s-saved-when-chaging-country Fix/30304: zipcode does not clear when country change
Expensify · Nov 6, 2023 · 8d17c95 · 8d17c95
2 parents b5d3f90 + 040c8a7
commit 8d17c95
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/pages/settings/Profile/PersonalDetails/AddressPage.js b/src/pages/settings/Profile/PersonalDetails/AddressPage.js
@@ -81,6 +81,7 @@ function AddressPage({privatePersonalDetails, route}) {
     const [street1, street2] = (address.street || '').split('\n');
     const [state, setState] = useState(address.state);
     const [city, setCity] = useState(address.city);
+    const [zipcode, setZipcode] = useState(address.zip);
 
     useEffect(() => {
         if (!address) {
@@ -89,6 +90,7 @@ function AddressPage({privatePersonalDetails, route}) {
         setState(address.state);
         setCurrentCountry(address.country);
         setCity(address.city);
+        setZipcode(address.zip);
     }, [address]);
 
     /**
@@ -137,20 +139,28 @@ function AddressPage({privatePersonalDetails, route}) {
     }, []);
 
     const handleAddressChange = useCallback((value, key) => {
-        if (key !== 'country' && key !== 'state' && key !== 'city') {
+        if (key !== 'country' && key !== 'state' && key !== 'city' && key !== 'zipPostCode') {
             return;
         }
         if (key === 'country') {
             setCurrentCountry(value);
             setState('');
             setCity('');
+            setZipcode('');
             return;
         }
         if (key === 'state') {
             setState(value);
+            setCity('');
+            setZipcode('');
+            return;
+        }
+        if (key === 'city') {
+            setCity(value);
+            setZipcode('');
             return;
         }
-        setCity(value);
+        setZipcode(value);
     }, []);
 
     useEffect(() => {
@@ -254,9 +264,10 @@ function AddressPage({privatePersonalDetails, route}) {
                         accessibilityLabel={translate('common.zipPostCode')}
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
                         autoCapitalize="characters"
-                        defaultValue={address.zip || ''}
+                        value={zipcode || ''}
                         maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE}
                         hint={zipFormat}
+                        onValueChange={handleAddressChange}
                     />
                 </Form>
             )}