Merged in fix/parse-phonenumber-before-submit (pull request #2376)

fix: now parses phone number before submitting on edit profile and signup

Approved-by: Linus Flood

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx

@@ -2,7 +2,6 @@
 
 import { zodResolver } from "@hookform/resolvers/zod"
 import { cx } from "class-variance-authority"
-import { type CountryCode, parsePhoneNumberFromString } from "libphonenumber-js"
 import { usePathname, useRouter, useSearchParams } from "next/navigation"
 import { useCallback, useEffect, useState } from "react"
 import { Label } from "react-aria-components"
@@ -33,6 +32,7 @@ import { useAvailablePaymentOptions } from "@/hooks/booking/useAvailablePaymentO
 import { useHandleBookingStatus } from "@/hooks/booking/useHandleBookingStatus"
 import useLang from "@/hooks/useLang"
 import useStickyPosition from "@/hooks/useStickyPosition"
+import { formatPhoneNumber } from "@/utils/phone"
 import { trackPaymentEvent } from "@/utils/tracking"
 import { trackEvent } from "@/utils/tracking/base"
 import { trackGlaSaveCardAttempt } from "@/utils/tracking/myStay"
@@ -391,21 +391,10 @@ export default function PaymentClient({
             rateCode = booking.rooms[idx].rateCode
           }
 
-          let phoneNumber = room.guest.phoneNumber
-          const phoneNumberCC =
-            room.guest.phoneNumberCC.toUpperCase() as CountryCode
-          let parsedPhonenumber
-          if (phoneNumberCC) {
-            parsedPhonenumber = parsePhoneNumberFromString(
-              phoneNumber,
-              phoneNumberCC
-            )
-          } else {
-            parsedPhonenumber = parsePhoneNumberFromString(phoneNumber)
-          }
-          if (parsedPhonenumber?.isValid()) {
-            phoneNumber = parsedPhonenumber.number
-          }
+          const phoneNumber = formatPhoneNumber(
+            room.guest.phoneNumber,
+            room.guest.phoneNumberCC
+          )
 
           return {
             adults: room.adults,