Fix country defaulting to "Afghan" bug

woocommerce · Mar 13, 2023 · e99a18d · e99a18d
1 parent 9409cf9
commit e99a18d
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/assets/js/extensions/shipping-methods/pickup-location/edit-location/form.tsx b/assets/js/extensions/shipping-methods/pickup-location/edit-location/form.tsx
@@ -117,12 +117,20 @@ const Form = ( {
 					'Country / State',
 					'woo-gutenberg-products-block'
 				) }
-				value={ `${ selectedCountry }${
-					selectedState &&
-					states[ selectedCountry ]?.[ selectedState ]
-						? ':' + selectedState
-						: ''
-				}` }
+				value={ ( () => {
+					if ( ! selectedState && countryHasStates ) {
+						return `${ selectedCountry }:${
+							Object.keys( states[ selectedCountry ] )[ 0 ]
+						}`;
+					}
+
+					return `${ selectedCountry }${
+						selectedState &&
+						states[ selectedCountry ]?.[ selectedState ]
+							? ':' + selectedState
+							: ''
+					}`;
+				} )() }
 				onChange={ ( val: string ) => {
 					const [ country, state = '' ] = val.split( ':' );
 					setLocationAddressField( 'country' )( country );