diff --git a/src/pages/settings/Profile/PersonalDetails/AddressPage.js b/src/pages/settings/Profile/PersonalDetails/AddressPage.js
index 65c106a4e9aa..4c5603e4cdcf 100644
--- a/src/pages/settings/Profile/PersonalDetails/AddressPage.js
+++ b/src/pages/settings/Profile/PersonalDetails/AddressPage.js
@@ -69,7 +69,7 @@ function AddressPage({privatePersonalDetails}) {
const address = lodashGet(privatePersonalDetails, 'address') || {};
const [street1, street2] = (address.street || '').split('\n');
-
+ const [state, setState] = useState(address.state);
/**
* @param {Function} translate - translate function
* @param {Boolean} isUSAForm - selected country ISO code is US
@@ -116,10 +116,15 @@ function AddressPage({privatePersonalDetails}) {
}, []);
const handleAddressChange = (value, key) => {
- if (key !== 'country') {
+ if (key !== 'country' && key !== 'state') {
+ return;
+ }
+ if (key === 'country') {
+ setCurrentCountry(value);
+ setState('');
return;
}
- setCurrentCountry(value);
+ setState(value);
};
if (lodashGet(privatePersonalDetails, 'isLoading', true)) {
@@ -182,7 +187,8 @@ function AddressPage({privatePersonalDetails}) {
) : (
@@ -191,9 +197,10 @@ function AddressPage({privatePersonalDetails}) {
label={translate('common.stateOrProvince')}
accessibilityLabel={translate('common.stateOrProvince')}
accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
- defaultValue={address.state || ''}
+ value={state || ''}
maxLength={CONST.FORM_CHARACTER_LIMIT}
spellCheck={false}
+ onValueChange={handleAddressChange}
/>
)}