resolve merge conflicts

Author: kumaravinashcommercecloud

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

@@ -1,6 +1,7 @@
 ## v9.1.0-dev
 - Add Page Designer Support [#3727](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3727)
 - [Feature] Add Salesforce Payments support in checkout [#3725](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3725)
+- One Click Checkout removed from Developer Preview. When shoppers use passwordless OTP login with one-click checkout, the system saves their shipping and payment information for faster checkout in the future. Security safeguards required: (1) Captcha - Protects the passwordless login from bots. (2) OTP for Email Changes - Verifies identity before an email update, prevents accidental account lockouts from typos, and prevents unauthorized access to saved payment methods.
 - Update jest-fetch-mock and Jest 29 dependencies [#3663](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3663)
 - Add Node 24 support. Drop Node 16 support [#3652](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3652)
 - [Bugfix] Fix error toast for no applicable shipping methods in one-click checkout [#3673](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3673)
@@ -9,7 +10,9 @@
 - [Feature] Add translations for text in 1CC [#3703](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3703)
 
 ## v9.0.0 (Feb 12, 2026)
-- [Feature] One Click Checkout (in Developer Preview) [#3552](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3552)
+- [Feature] One Click Checkout [#3552](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3552)
+  - When shoppers use passwordless OTP login with one-click checkout, the system saves their shipping and payment information for faster checkout in the future.
+  - Security safeguards required: (1) Captcha - Protects the passwordless login from bots. (2) OTP for Email Changes - Verifies identity before an email update, prevents accidental account lockouts from typos, and prevents unauthorized access to saved payment methods.
 - [Feature] Add `fuzzyPathMatching` to reduce computational overhead of route generation at time of application load [#3530](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3530)
 - [Bugfix] Fix Passwordless Login landingPath, Reset Password landingPath, and Social Login redirectUri value in config not being used [#3560](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3560)
 - [Feature] PWA Integration with OMS

packages/template-retail-react-app/app/routes.jsx

@@ -81,6 +81,8 @@ export const routes = [
     {
         path: '/checkout',
         component: (props) => {
+            // One Click Checkout: Saves shipping/payment for returning shoppers. Security required:
+            // (1) Captcha for passwordless login, (2) OTP for email changes. See config/default.js for details.
             const enabled = getConfig()?.app?.oneClickCheckout?.enabled
             return enabled ? <CheckoutOneClick {...props} /> : <Checkout {...props} />
         },

packages/template-retail-react-app/config/default.js

@@ -74,9 +74,12 @@ module.exports = {
             appSourceId: '7ae070a6-f4ec-4def-a383-d9cacc3f20a1',
             tenantId: 'g82wgnrvm-ywk9dggrrw8mtggy.pc-rnd'
         },
-        // Note: this feature is in Developer Preview at this time. To use One Click Checkout,
-        // enable the oneClickCheckout flag and configure private SLAS client. For more details, please
-        // check https://github.com/SalesforceCommerceCloud/pwa-kit/releases/tag/v3.16.0
+        // One Click Checkout: When enabled, shoppers using passwordless OTP login can save shipping
+        // and payment information for faster checkout in the future. To use, enable the flag and
+        // configure private SLAS client. Security safeguards required:
+        // 1. Captcha - Protects the passwordless login from bots (e.g., Cloudflare Turnstile).
+        // 2. OTP for Email Changes - Verifies identity before an email update, prevents accidental
+        //    account lockouts from typos, and prevents unauthorized access to saved payment methods.
         oneClickCheckout: {
             enabled: false
         },

packages/template-retail-react-app/config/mocks/default.js

@@ -119,6 +119,8 @@ module.exports = {
             appSourceId: '7ae070a6-f4ec-4def-a383-d9cacc3f20a1',
             tenantId: 'g82wgnrvm-ywk9dggrrw8mtggy.pc-rnd'
         },
+        // One Click Checkout: Saves shipping/payment for returning shoppers. Requires: (1) Captcha
+        // for passwordless login, (2) OTP for email changes. See config/default.js for full notes.
         oneClickCheckout: {
             enabled: false
         },