Merge branch 'W-17458039-handle-error-states' into W-17271709-passwordless-login-in-checkout

Author: hajinsuha1

packages/template-retail-react-app/app/constants.js

@@ -99,6 +99,10 @@ export const FEATURE_UNAVAILABLE_ERROR_MESSAGE = defineMessage({
     defaultMessage: 'This feature is not currently available.',
     id: 'global.error.feature_unavailable'
 })
+export const CREATE_ACCOUNT_FIRST_ERROR_MESSAGE = defineMessage({
+    defaultMessage: 'This feature is not currently available. You must create an account to access this feature.',
+    id: 'global.error.create_account'
+})
 
 export const HOME_HREF = '/'
 
@@ -255,7 +259,6 @@ export const PASSWORDLESS_LOGIN_LANDING_PATH = '/passwordless-login-landing'
 
 export const PASSWORDLESS_ERROR_MESSAGES = [
     /callback_uri doesn't match/i,
-    /error getting user info/i,
     /passwordless permissions error/i,
     /client secret is not provided/i,
 ]

packages/template-retail-react-app/app/hooks/use-auth-modal.js

@@ -31,7 +31,7 @@ import ResetPasswordForm from '@salesforce/retail-react-app/app/components/reset
 import RegisterForm from '@salesforce/retail-react-app/app/components/register'
 import PasswordlessEmailConfirmation from '@salesforce/retail-react-app/app/components/email-confirmation/index'
 import {noop} from '@salesforce/retail-react-app/app/utils/utils'
-import {API_ERROR_MESSAGE, FEATURE_UNAVAILABLE_ERROR_MESSAGE, LOGIN_TYPES, PASSWORDLESS_ERROR_MESSAGES} from '@salesforce/retail-react-app/app/constants'
+import {API_ERROR_MESSAGE, FEATURE_UNAVAILABLE_ERROR_MESSAGE, CREATE_ACCOUNT_FIRST_ERROR_MESSAGE, LOGIN_TYPES, PASSWORDLESS_ERROR_MESSAGES} from '@salesforce/retail-react-app/app/constants'
 import useNavigation from '@salesforce/retail-react-app/app/hooks/use-navigation'
 import {usePrevious} from '@salesforce/retail-react-app/app/hooks/use-previous'
 import {usePasswordReset} from '@salesforce/retail-react-app/app/hooks/use-password-reset'
@@ -105,9 +105,11 @@ export const AuthModal = ({
                 }
                 setCurrentView(EMAIL_VIEW)
             } catch (error) {
-                const message = PASSWORDLESS_ERROR_MESSAGES.some(msg => msg.test(error.message))
-                    ? formatMessage(FEATURE_UNAVAILABLE_ERROR_MESSAGE)
-                    : formatMessage(API_ERROR_MESSAGE)
+                const message = /error getting user info/i.test(error.message)
+                    ? formatMessage(CREATE_ACCOUNT_FIRST_ERROR_MESSAGE)
+                    : PASSWORDLESS_ERROR_MESSAGES.some(msg => msg.test(error.message))
+                        ? formatMessage(FEATURE_UNAVAILABLE_ERROR_MESSAGE)
+                        : formatMessage(API_ERROR_MESSAGE)
                 form.setError('global', { type: 'manual', message })
             }
         }

packages/template-retail-react-app/app/pages/login/index.jsx

@@ -31,7 +31,8 @@ import {
     FEATURE_UNAVAILABLE_ERROR_MESSAGE,
     LOGIN_TYPES,
     PASSWORDLESS_LOGIN_LANDING_PATH,
-    PASSWORDLESS_ERROR_MESSAGES
+    PASSWORDLESS_ERROR_MESSAGES,
+    CREATE_ACCOUNT_FIRST_ERROR_MESSAGE
 } from '@salesforce/retail-react-app/app/constants'
 import {usePrevious} from '@salesforce/retail-react-app/app/hooks/use-previous'
 import {isServer} from '@salesforce/retail-react-app/app/utils/utils'
@@ -113,9 +114,11 @@ const Login = ({initialView = LOGIN_VIEW}) => {
                 }
                 setCurrentView(EMAIL_VIEW)
             } catch (error) {
-                const message = PASSWORDLESS_ERROR_MESSAGES.some(msg => msg.test(error.message))
-                    ? formatMessage(FEATURE_UNAVAILABLE_ERROR_MESSAGE)
-                    : formatMessage(API_ERROR_MESSAGE)
+                const message = /error getting user info/i.test(error.message)
+                    ? formatMessage(CREATE_ACCOUNT_FIRST_ERROR_MESSAGE)
+                    : PASSWORDLESS_ERROR_MESSAGES.some(msg => msg.test(error.message))
+                        ? formatMessage(FEATURE_UNAVAILABLE_ERROR_MESSAGE)
+                        : formatMessage(API_ERROR_MESSAGE)
                 form.setError('global', { type: 'manual', message })
             }
         }
@@ -133,7 +136,6 @@ const Login = ({initialView = LOGIN_VIEW}) => {
                     }
                     handleMergeBasket()
                 } else if (loginType === LOGIN_TYPES.PASSWORDLESS) {
-                    setCurrentView(EMAIL_VIEW)
                     setPasswordlessLoginEmail(data.email)
                     await handlePasswordlessLogin(data.email)
                 }

packages/template-retail-react-app/app/static/translations/compiled/en-GB.json

@@ -1527,6 +1527,12 @@
       "value": "Wishlist"
     }
   ],
+  "global.error.create_account": [
+    {
+      "type": 0,
+      "value": "This feature is not currently available. You must create an account to access this feature."
+    }
+  ],
   "global.error.feature_unavailable": [
     {
       "type": 0,

packages/template-retail-react-app/app/static/translations/compiled/en-US.json

@@ -1527,6 +1527,12 @@
       "value": "Wishlist"
     }
   ],
+  "global.error.create_account": [
+    {
+      "type": 0,
+      "value": "This feature is not currently available. You must create an account to access this feature."
+    }
+  ],
   "global.error.feature_unavailable": [
     {
       "type": 0,

packages/template-retail-react-app/app/static/translations/compiled/en-XA.json

@@ -3199,6 +3199,20 @@
       "value": "]"
     }
   ],
+  "global.error.create_account": [
+    {
+      "type": 0,
+      "value": "["
+    },
+    {
+      "type": 0,
+      "value": "Ŧħīş ƒḗḗȧȧŧŭŭřḗḗ īş ƞǿǿŧ ƈŭŭřřḗḗƞŧŀẏ ȧȧṽȧȧīŀȧȧƀŀḗḗ. Ẏǿǿŭŭ ḿŭŭşŧ ƈřḗḗȧȧŧḗḗ ȧȧƞ ȧȧƈƈǿǿŭŭƞŧ ŧǿǿ ȧȧƈƈḗḗşş ŧħīş ƒḗḗȧȧŧŭŭřḗḗ."
+    },
+    {
+      "type": 0,
+      "value": "]"
+    }
+  ],
   "global.error.feature_unavailable": [
     {
       "type": 0,

packages/template-retail-react-app/translations/en-GB.json

@@ -630,6 +630,9 @@
   "global.account.link.wishlist": {
     "defaultMessage": "Wishlist"
   },
+  "global.error.create_account": {
+    "defaultMessage": "This feature is not currently available. You must create an account to access this feature."
+  },
   "global.error.feature_unavailable": {
     "defaultMessage": "This feature is not currently available."
   },

packages/template-retail-react-app/translations/en-US.json

@@ -630,6 +630,9 @@
   "global.account.link.wishlist": {
     "defaultMessage": "Wishlist"
   },
+  "global.error.create_account": {
+    "defaultMessage": "This feature is not currently available. You must create an account to access this feature."
+  },
   "global.error.feature_unavailable": {
     "defaultMessage": "This feature is not currently available."
   },