Merge branch 'feature/1cc_merge' into W-20448811-shopper-can-manually-enter-otp-in-login-flows-2

Signed-off-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com>

Author: hajinsuha1

packages/template-retail-react-app/app/pages/checkout-one-click/partials/one-click-contact-info.jsx

@@ -244,6 +244,8 @@ const ContactInfo = ({isSocialEnabled = false, idps = [], onRegisteredUserChoseG
                 lastEmailSentRef.current = normalizedEmail
                 return {isRegistered: true}
             } catch (error) {
+                const message = formatMessage(getAuthorizePasswordlessErrorMessage(error.message))
+                setError(message)
                 // Keep continue button visible if email is valid (for unregistered users)
                 if (isValidEmail(email)) {
                     setShowContinueButton(true)
@@ -300,8 +302,7 @@ const ContactInfo = ({isSocialEnabled = false, idps = [], onRegisteredUserChoseG
             // Proceed to next step (shipping address)
             goToNextStep()
         } catch (error) {
-            const message = formatMessage(getAuthorizePasswordlessErrorMessage(error.message))
-            setError(message)
+            setError(error.message)
         }
     }