Merge branch 'feature/email-otp' into otp-manual-input-e2e-tests

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

Author: hajinsuha1

e2e/tests/desktop/extra-features.spec.js

@@ -32,7 +32,7 @@ test('Verify passwordless login request', async ({page}) => {
     await page.locator('#email').scrollIntoViewIfNeeded()
     await page.fill('#email', config.PWA_E2E_USER_EMAIL)
 
-    await page.getByRole('button', {name: 'Continue Securely'}).click()
+    await page.getByRole('button', {name: 'Continue'}).click()
 
     await page.waitForResponse(
         '**/mobify/slas/private/shopper/auth/v1/organizations/*/oauth2/passwordless/login'

e2e/tests/mobile/extra-features.spec.js

@@ -33,8 +33,8 @@ test('Verify passwordless login request on mobile', async ({page}) => {
     await page.locator('#email').scrollIntoViewIfNeeded()
     await page.fill('#email', config.PWA_E2E_USER_EMAIL)
 
-    await page.getByRole('button', {name: 'Continue Securely'}).scrollIntoViewIfNeeded()
-    await page.getByRole('button', {name: 'Continue Securely'}).click()
+    await page.getByRole('button', {name: 'Continue'}).scrollIntoViewIfNeeded()
+    await page.getByRole('button', {name: 'Continue'}).click()
 
     await page.waitForResponse(
         '**/mobify/slas/private/shopper/auth/v1/organizations/*/oauth2/passwordless/login'

packages/template-retail-react-app/CHANGELOG.md

@@ -1,12 +1,12 @@
 ## v8.4.0-dev (Dec 17, 2025)
 - [Feature] Add `fuzzyPathMatching` to reduce computational overhead of route generation at time of application load [#3530](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3530)
+- Update passwordless login and password reset to use email mode by default. The mode can now be configured across the login page, auth modal, and checkout page [#3492](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3492) [#3547](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3547)
+- Update "Continue Securely" button text to "Continue" for passwordless login [#3556](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3556)
 
 ## v8.3.0 (Dec 17, 2025)
 - [Bugfix] Fix Forgot Password link not working from Account Profile password update form [#3493](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3493)
 - Introduce Address Autocompletion feature in the checkout flow, powered by Google Maps Platform [#3071](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3071)
 
-- Update passwordless login and password reset to use email mode by default. The mode can now be configured across the login page, auth modal, and checkout page [#3492](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3492) [#3547](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3547)
-
 ## v8.2.0 (Nov 04, 2025)
 - Add support for Rule Based Promotions for Choice of Bonus Products. We are currently supporting only one product level rule based promotion per product [#3418](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3418)
 - Add support for Rule Based Promotions for Choice of Bonus Products. We are currently supporting only one product level rule based promotion per product [#3418](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3418)

packages/template-retail-react-app/app/components/login/index.test.js

@@ -23,14 +23,14 @@ describe('LoginForm', () => {
             expect(screen.getByText(/Welcome Back/)).toBeInTheDocument()
             expect(screen.getByLabelText('Email')).toBeInTheDocument()
             expect(screen.queryByLabelText('Password')).not.toBeInTheDocument()
-            expect(screen.getByRole('button', {name: 'Continue Securely'})).toBeInTheDocument()
+            expect(screen.getByRole('button', {name: 'Continue'})).toBeInTheDocument()
             expect(screen.getByText(/Or Login With/)).toBeInTheDocument()
             expect(screen.getByRole('button', {name: 'Password'})).toBeInTheDocument()
             expect(screen.getByText(/Don't have an account/)).toBeInTheDocument()
             expect(screen.getByRole('button', {name: 'Create account'})).toBeInTheDocument()
         })
 
-        test('renders form errors when "Continue Securely" button is clicked', async () => {
+        test('renders form errors when "Continue" button is clicked', async () => {
             const mockPasswordlessLoginClick = jest.fn()
             const {user} = renderWithProviders(
                 <WrapperComponent
@@ -39,7 +39,7 @@ describe('LoginForm', () => {
                 />
             )
 
-            await user.click(screen.getByRole('button', {name: 'Continue Securely'}))
+            await user.click(screen.getByRole('button', {name: 'Continue'}))
             expect(screen.getByText(/Please enter your email address./)).toBeInTheDocument()
         })
 

packages/template-retail-react-app/app/components/passwordless-login/index.jsx

@@ -54,7 +54,7 @@ const PasswordlessLogin = ({
                         isLoading={form.formState.isSubmitting}
                     >
                         <FormattedMessage
-                            defaultMessage="Continue Securely"
+                            defaultMessage="Continue"
                             id="login_form.button.continue_securely"
                         />
                     </Button>

packages/template-retail-react-app/app/components/passwordless-login/index.test.js

@@ -25,7 +25,7 @@ describe('PasswordlessLogin component', () => {
 
         expect(screen.getByLabelText('Email')).toBeInTheDocument()
         expect(screen.queryByLabelText('Password')).not.toBeInTheDocument()
-        expect(screen.getByRole('button', {name: 'Continue Securely'})).toBeInTheDocument()
+        expect(screen.getByRole('button', {name: 'Continue'})).toBeInTheDocument()
         expect(screen.getByText(/Or Login With/)).toBeInTheDocument()
         expect(screen.getByRole('button', {name: 'Password'})).toBeInTheDocument()
     })

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

@@ -192,7 +192,7 @@ test('allows regular login via Enter key in password mode', async () => {
     await user.click(trigger)
 
     await waitFor(() => {
-        expect(screen.getByText(/continue securely/i)).toBeInTheDocument()
+        expect(screen.getByText(/Continue/i)).toBeInTheDocument()
     })
 
     // enter email and switch to password mode
@@ -223,7 +223,7 @@ describe('Passwordless enabled', () => {
         await user.click(trigger)
 
         await waitFor(() => {
-            expect(screen.getByText(/continue securely/i)).toBeInTheDocument()
+            expect(screen.getByText(/Continue/i)).toBeInTheDocument()
         })
     })
 
@@ -240,14 +240,14 @@ describe('Passwordless enabled', () => {
         await user.click(trigger)
 
         await waitFor(() => {
-            expect(screen.getByText(/continue securely/i)).toBeInTheDocument()
+            expect(screen.getByText(/Continue/i)).toBeInTheDocument()
         })
 
         // enter a valid email address
         await user.type(screen.getByLabelText('Email'), validEmail)
 
         // initiate passwordless login
-        const passwordlessLoginButton = screen.getByText(/continue securely/i)
+        const passwordlessLoginButton = screen.getByText(/Continue/i)
         await user.click(passwordlessLoginButton)
         expect(
             mockAuthHelperFunctions[AuthHelpers.AuthorizePasswordless].mutateAsync
@@ -289,7 +289,7 @@ describe('Passwordless enabled', () => {
         await user.click(trigger)
 
         await waitFor(() => {
-            expect(screen.getByText(/continue securely/i)).toBeInTheDocument()
+            expect(screen.getByText(/Continue/i)).toBeInTheDocument()
         })
 
         // enter a valid email address
@@ -343,11 +343,11 @@ describe('Passwordless enabled', () => {
         await user.click(trigger)
 
         await waitFor(() => {
-            expect(screen.getByText(/continue securely/i)).toBeInTheDocument()
+            expect(screen.getByText(/Continue/i)).toBeInTheDocument()
         })
 
         await user.type(screen.getByLabelText('Email'), validEmail)
-        await user.click(screen.getByText(/continue securely/i))
+        await user.click(screen.getByText(/Continue/i))
 
         expect(
             mockAuthHelperFunctions[AuthHelpers.AuthorizePasswordless].mutateAsync

packages/template-retail-react-app/app/pages/login/index.test.js

@@ -362,7 +362,7 @@ describe('Passwordless login tests', () => {
         await user.type(screen.getByLabelText('Email'), testEmail)
 
         // Click the submit button
-        await user.click(screen.getByRole('button', {name: /Continue Securely/i}))
+        await user.click(screen.getByRole('button', {name: /Continue/i}))
 
         // Verify that authorizePasswordless is called with correct parameters
         await waitFor(() => {

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

@@ -2624,7 +2624,7 @@
   "login_form.button.continue_securely": [
     {
       "type": 0,
-      "value": "Continue Securely"
+      "value": "Continue"
     }
   ],
   "login_form.button.google": [

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

@@ -2624,7 +2624,7 @@
   "login_form.button.continue_securely": [
     {
       "type": 0,
-      "value": "Continue Securely"
+      "value": "Continue"
     }
   ],
   "login_form.button.google": [