Update logic to store and update phone number code

sumup-oss · Jul 5, 2024 · ba02bb2 · ba02bb2
1 parent 73b9fb8
commit ba02bb2
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/packages/circuit-ui/components/PhoneNumberInput/PhoneNumberInput.tsx b/packages/circuit-ui/components/PhoneNumberInput/PhoneNumberInput.tsx
@@ -240,10 +240,21 @@ export const PhoneNumberInput = forwardRef<
       ) {
         return;
       }
+
+      const selectedCountry = countryCodeRef?.current?.value;
+      if (!selectedCountry) {
+        return;
+      }
+      const code = countryCode.options
+        // Match longer, more specific country codes first
+        .sort((a, b) => a.code.length - b.code.length)
+        .find(({ country }) => country === selectedCountry)?.code;
+
+      if (!code) {
+        return;
+      }
       const phoneNumber = normalizePhoneNumber(
-        countryCode.options.find(
-          ({ country }) => country === countryCodeRef?.current?.value,
-        )?.code as string,
+        code,
         subscriberNumberRef.current.value,
       );
       onChange(phoneNumber);