W-21890244: Fix Express Checkout toggles in PWA by rasbhat · Pull Request #3775 · SalesforceCommerceCloud/pwa-kit

rasbhat · 2026-04-03T18:52:15Z

The express Checkout toggles were not being taken into account for rendering Express Checkout buttons. This PR fixes it for PDP, Checkout, Cart, Mini Cart.

Description

Types of Changes

Bug fix (non-breaking change that fixes an issue)
New feature (non-breaking change that adds functionality)
Documentation update
Breaking change (could cause existing functionality to not work as expected)
Other changes (non-breaking changes that does not fit any of the above)

Breaking changes include:

Removing a public function or component or prop

Adding a required argument to a function

Changing the data type of a function parameter or return value

Adding a new peer dependency to package.json

Changes

(change1)

How to Test-Drive This PR

(step1)

Checklists

General

Changes are covered by test cases
CHANGELOG.md updated with a short description of changes (not required for documentation updates)

Accessibility Compliance

You must check off all items in one of the follow two lists:

There are no changes to UI

or...

Changes were tested with a Screen Reader (iOS VoiceOver or Android Talkback) and had no issues
Changes comply with WCAG 2.0 guidelines levels A and AA
Changes to common UI patterns and interactions comply with WAI-ARIA best practices

Localization

Changes include a UI text update in the Retail React App (which requires translation)

git2gus · 2026-04-03T18:52:18Z

Git2Gus App is installed but the .git2gus/config.json doesn't have right values. You should add the required configuration.

cc-prodsec · 2026-04-03T18:52:30Z

✅ Snyk checks have passed. No issues have been found so far.

Status	Scan Engine	Critical	High	Medium	Low	Total (0)
✅	Open Source Security	0	0	0	0	0 issues
✅	Licenses	0	0	0	0	0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

stutiarorasf · 2026-04-03T19:01:55Z

                                </Alert>
                            )}
-                            {sfPaymentsEnabled && (
+                            {sfPaymentsEnabled && expressOnCheckout && (


I brought it up to @rasbhat too but do we need to check if express checkout is enabled at all before trying read the 4 flags?

From what I can tell, in ecom ShopperConfigurationsService calls PaymentConfigurationServiceImpl and that gets the site config values from PaymentsSiteConfig. That last one has code like this so we should be all set

boolean generalDisabled = siteConfig.isExpressCheckoutDisabled(); this.expressOnPdpEnabled = !generalDisabled && !siteConfig.isExpressOnPdpDisabled();

jeffraab-sfdc · 2026-04-06T18:03:39Z


-test('renders SFPaymentsExpress when sfPayments is enabled', () => {
-    // Enable sfPayments
+test('renders SFPaymentsExpress when sfPayments is enabled and MINICART is in expressOnCheckoutPagesEnabled', () => {


nit: test description still has the all caps name

vcua-mobify · 2026-04-08T22:46:07Z

        const inventoryId = selectedStore?.inventoryId
        const sfPaymentsEnabled = useSFPaymentsEnabled()
+        const {pdp: expressOnPDP} = useExpressCheckoutEnabled()
+        const showExpressOnPDP = sfPaymentsEnabled && expressOnPDP


Do we still need sfPaymentsEnabled? Is there a scenario where sfPaymentsEnabled is false but expressOnPDP is true?

If expressOnPDP is only ever true when sfPaymentsEnabled is true then this could be adjusted to be

const showExpressOnPDP = expressOnPDP

vcua-mobify · 2026-04-08T22:49:03Z

        : 0
    const sfPaymentsEnabled = useSFPaymentsEnabled()
+    const {miniCart: expressOnMiniCart} = useExpressCheckoutEnabled()
+    const showExpressOnMiniCart = sfPaymentsEnabled && expressOnMiniCart


Same question here. Does it make sense to simplify this to just

const showExpressOnMiniCart = expressOnMiniCart

vcua-mobify · 2026-04-08T22:52:10Z

 const CartCta = () => {
    const sfPaymentsEnabled = useSFPaymentsEnabled()
+    const {cart: expressOnCart} = useExpressCheckoutEnabled()
+    const showExpressOnCart = sfPaymentsEnabled && expressOnCart


Here as well

vcua-mobify · 2026-04-08T22:52:53Z

    const multishipEnabled = getConfig()?.app?.multishipEnabled ?? true
    const sfPaymentsEnabled = useSFPaymentsEnabled()
+    const {checkout: expressOnCheckout} = useExpressCheckoutEnabled()
+    const showExpressOnCheckout = sfPaymentsEnabled && expressOnCheckout


vcua-mobify · 2026-04-08T22:54:10Z

+ * Custom hook to get the express checkout enablement flags per page.
+ * @returns {{pdp: boolean, miniCart: boolean, cart: boolean, checkout: boolean}} Per-page express checkout flags
+ */
+export const useExpressCheckoutEnabled = () => {


It might be a good idea to have the check for sfPaymentsEnabled here so that it isn't repeated in the other files

This makes sense. Checking sfPaymentsEnabled in use-sf-payments.js. Simplified all other checks.

vcua-mobify

Thanks for making that change @rasbhat !

rasbhat requested review from amittapalli, jeffraab-sfdc and stutiarorasf April 3, 2026 18:52

stutiarorasf reviewed Apr 3, 2026

View reviewed changes

jeffraab-sfdc reviewed Apr 3, 2026

View reviewed changes

Comment thread packages/template-retail-react-app/app/pages/cart/partials/cart-cta.jsx Outdated

jeffraab-sfdc reviewed Apr 3, 2026

View reviewed changes

Comment thread packages/template-retail-react-app/app/hooks/use-sf-payments.js Outdated

rasbhat force-pushed the rvishwanathbhat.W-21890244-fix-express-checkout-display-toggles branch 2 times, most recently from 0f1891e to 961ef38 Compare April 6, 2026 17:33

jeffraab-sfdc reviewed Apr 6, 2026

View reviewed changes

rasbhat marked this pull request as ready for review April 6, 2026 18:03

rasbhat requested a review from a team as a code owner April 6, 2026 18:03

rasbhat added 2 commits April 6, 2026 12:55

W-21890244: Addressing comments

af567c4

W-21890244: Addressing comments

8a768d5

rasbhat force-pushed the rvishwanathbhat.W-21890244-fix-express-checkout-display-toggles branch from fc9e67d to 8a768d5 Compare April 6, 2026 19:56

jeffraab-sfdc previously approved these changes Apr 6, 2026

View reviewed changes

stutiarorasf approved these changes Apr 6, 2026

View reviewed changes

amittapalli previously approved these changes Apr 7, 2026

View reviewed changes

W-21890244: Changelog

4f24f9c

rasbhat dismissed stale reviews from amittapalli and jeffraab-sfdc via 4f24f9c April 7, 2026 19:37

W-21890244: Changelog

b58141b

jeffraab-sfdc previously approved these changes Apr 7, 2026

View reviewed changes

amittapalli previously approved these changes Apr 8, 2026

View reviewed changes

vcua-mobify reviewed Apr 8, 2026

View reviewed changes

W-21890244: Adressing comments

1ebddc0

rasbhat dismissed stale reviews from amittapalli and jeffraab-sfdc via 1ebddc0 April 9, 2026 00:26

vcua-mobify approved these changes Apr 9, 2026

View reviewed changes

amittapalli approved these changes Apr 9, 2026

View reviewed changes

rasbhat merged commit 77e2f85 into develop Apr 9, 2026
73 of 74 checks passed

rasbhat deleted the rvishwanathbhat.W-21890244-fix-express-checkout-display-toggles branch April 9, 2026 01:50

adamraya mentioned this pull request May 7, 2026

Bump versions for 3.18.0 (@W-22373270@) #3824

Merged

4 tasks

Uh oh!

Conversation

rasbhat commented Apr 3, 2026

Description

Types of Changes

Changes

How to Test-Drive This PR

Checklists

General

Accessibility Compliance

Localization

Uh oh!

git2gus Bot commented Apr 3, 2026

Uh oh!

cc-prodsec commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Snyk checks have passed. No issues have been found so far.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vcua-mobify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

cc-prodsec commented Apr 3, 2026 •

edited

Loading