fix: Reset state selector value

commercelayer · Feb 1, 2022 · 90fdb3f · 90fdb3f
1 parent 9ba8a71
commit 90fdb3f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/components/AddressStateSelector.tsx b/src/components/AddressStateSelector.tsx
@@ -63,7 +63,11 @@ const AddressStateSelector: FunctionComponent<AddressStateSelectorProps> = (
       billingCountryCode,
       countryCode !== billingCountryCode,
     ].every(Boolean)
-    if (changeBillingCountry && !isValidState(val, billingCountryCode)) {
+    if (
+      changeBillingCountry &&
+      !isValidState(val, billingCountryCode) &&
+      !isEmptyStates(billingCountryCode)
+    ) {
       billingAddress.resetField && billingAddress.resetField(name)
       setVal('')
     }
@@ -72,7 +76,11 @@ const AddressStateSelector: FunctionComponent<AddressStateSelectorProps> = (
       shippingCountryCode,
       countryCode !== shippingCountryCode,
     ].every(Boolean)
-    if (changeShippingCountry && !isValidState(val, shippingCountryCode)) {
+    if (
+      changeShippingCountry &&
+      !isValidState(val, shippingCountryCode) &&
+      !isEmptyStates(shippingCountryCode)
+    ) {
       shippingAddress.resetField && shippingAddress.resetField(name)
       setVal('')
     }