fix merge errors

hajinsuha1 · hajinsuha1 · commit 88643c6ea6bc · 2026-02-03T14:14:22.000-05:00
diff --git a/packages/template-retail-react-app/app/pages/login/index.jsx b/packages/template-retail-react-app/app/pages/login/index.jsx
@@ -31,7 +31,7 @@ import {usePrevious} from '@salesforce/retail-react-app/app/hooks/use-previous'
 import {isServer, noop} from '@salesforce/retail-react-app/app/utils/utils'
 import {
     getAuthorizePasswordlessErrorMessage,
-    getLoginPasswordlessErrorMessage
+    getLoginPasswordlessErrorMessage,
     getPasswordlessCallbackUrl
 } from '@salesforce/retail-react-app/app/utils/auth-utils'
 import {getConfig} from '@salesforce/pwa-kit-runtime/utils/ssr-config'
diff --git a/packages/template-retail-react-app/app/utils/auth-utils.js b/packages/template-retail-react-app/app/utils/auth-utils.js
@@ -64,7 +64,7 @@ export const getPasswordlessCallbackUrl = (callbackURI) => {
 }
 
 /**
- * Maps an error message to the appropriate user-friendly error message descriptor
+ * Maps error message from authorizePasswordless mutation to the appropriate user-friendly error message descriptor
  * for passwordless login feature errors.
  *
  * @param {string} errorMessage - The error message from the API

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export const getPasswordlessCallbackUrl = (callbackURI) => {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/**`
`67`		`- * Maps an error message to the appropriate user-friendly error message descriptor`
	`67`	`+ * Maps error message from authorizePasswordless mutation to the appropriate user-friendly error message descriptor`
`68`	`68`	`* for passwordless login feature errors.`
`69`	`69`	`*`
`70`	`70`	`* @param {string} errorMessage - The error message from the API`