@W-19014904 – Adyen Apple Pay PDP by mmccullom-sf · Pull Request #2787 · SalesforceCommerceCloud/pwa-kit

mmccullom-sf · 2025-07-11T00:19:33Z

Description

Adding Apple Pay to the PDP page of the agent.

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)

salesforce-cla · 2025-07-11T00:19:39Z

Thanks for the contribution! Unfortunately we can't verify the commit author(s): mmccullom <m***@s***.com>. One possible solution is to add that email to your GitHub account. Alternatively you can change your commits to another email and force push the change. After getting your commits associated with your GitHub account, refresh the status of this Pull Request.

cc-prodsec · 2025-07-11T00:19:44Z

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

✅ security/snyk check is complete. No issues have been found. (View Details)

✅ license/snyk check is complete. No issues have been found. (View Details)

Signed-off-by: mmccullom-sf <mmccullom+@salesforce.com>

…to adyenApplePayPDP

jbisaSF · 2025-07-24T15:39:23Z

packages/template-retail-react-app/app/api/adyen/paymentMethods/standalone.js

+ */
+export default async function handler(req, res) {
+    if (req.method !== 'GET') {
+        return res.status(405).json({error: 'Method not allowed'})


These aren't shopper facing error messages right?

They're API error messages, so if for whatever reason someone tried to hit this API with postman or something and had an invalid method they would see these errors.

packages/template-retail-react-app/app/api/adyen/paymentMethods/standalone.js

...te-retail-react-app/app/components/apple-pay-express/hooks/use-standalone-payment-methods.js

Signed-off-by: mmccullom-sf <mmccullom+@salesforce.com>

jhagama · 2025-07-24T19:20:39Z

packages/template-retail-react-app/app/components/apple-pay-express/index.jsx

+        regularAdyenData.adyenEnvironment
+
+    const adyenPaymentMethods = usingStandalone ? standalonePaymentMethods : regularAdyenData.adyenPaymentMethods
+    const basket = regularAdyenData.basket


Probably an area for more testing like you mentioned, but do you know if this is going to return the right basket every time?

I believe regularAdyenData.basket is coming from the useCurrentBasket() hook. This gets all customer baskets and returns the first if no basketId was specified:

const currentBasket = basketsData?.baskets?.find((basket) => basket?.basketId === id) || basketsData?.baskets?.[0]

cleanupTemporaryBasket() should take care of this though is the thought?

You're right actually good catch, I think this could depend on a race condition where the API response timing could decide which basket gets chosen, I'll fix it to guarantee we're getting the temporary basket if it's PDP.

jbisaSF · 2025-07-25T12:15:15Z

packages/template-retail-react-app/app/components/apple-pay-express/index.jsx

+
+                applePayAmount = currentBasket.orderTotal || currentBasket.productTotal || 0
+
+                // CRITICAL: Force final order calculation before payment


Let's update the tests to cover these scenarios.

Can we do this in a follow up PR?

Yes we can.

jbisaSF · 2025-07-25T12:26:39Z

packages/template-retail-react-app/app/components/express/index.jsx

        getToken()
    }, [])

+    // PostMessage listener for SKU updates


Since the MIAW side changes are going into the develop branch, when will those be merged into main?

Since we're not releasing ApplePay on PDP for the July 31st release, I'm wondering if this should be in a separate branch and merge it into adyenApplePayBranch3 when the MIAW side changes are also merged into its main branch.

Also, are we defaulting isPdpMode=false and do we have sufficient null checks in place for ApplePay in Checkout to work without the MIAW changes?

We've solved the prior issues, but to focus on your second question, yes, even without MIAW changes checkout will still function as per usual.

jbisaSF · 2025-07-25T13:32:06Z

packages/template-retail-react-app/app/components/express/index.jsx

                navigate={navigate}
            >
-                <ApplePayExpress />
+                <ApplePayExpress sku={currentSku} quantity={currentQuantity} isPdpMode={isPdpMode} />


To reduce the number of params, we could wrap them in an object like pdpData.

Signed-off-by: mmccullom-sf <mmccullom+@salesforce.com>

jbisaSF and others added 2 commits July 7, 2025 17:43

Adyen ApplePay Integration into Shopper Agent

dfe881b

Apple Pay PDP

d02f2b5

salesforce-cla bot added the cla:missing label Jul 11, 2025

mmccullom-sf and others added 14 commits July 10, 2025 20:22

Merge branch 'adyenApplePayBranch3' into adyenApplePayPDP

965619d

Signed-off-by: mmccullom-sf <mmccullom+@salesforce.com>

remove from product page

546f3eb

Merge branch 'adyenApplePayPDP' of github.com:mmccullom-sf/pwa-kit in…

5d62212

…to adyenApplePayPDP

remove readme

f6703c9

pdp work

eb44ff3

apple pay pdp

1d728f4

remove readme

3bdcc25

remove readme

fdf5d7a

Merge branch 'adyenApplePayBranch3' into adyenApplePayPDP

0663d4c

code cleanup

3910120

PWA kit PDP

6f74b09

PWA kit PDP

e48b7a0

PWA kit PDP

07f0727

fix main cart issue

9c98ff7

mmccullom-sf changed the title ~~Adyen Apple Pay PDP~~ @W-19014904 – Adyen Apple Pay PDP Jul 24, 2025

mmccullom-sf marked this pull request as ready for review July 24, 2025 14:20

mmccullom-sf requested a review from a team as a code owner July 24, 2025 14:20

mmccullom added 2 commits July 24, 2025 10:28

fix shipping issue

a8b6031

cleanup

cdccb7e

mmccullom-sf requested review from jbisaSF, jeffraab-sfdc and jhagama July 24, 2025 14:44

quantity fixes

6a9560f

jbisaSF reviewed Jul 24, 2025

View reviewed changes

small fixes to lint error

daf9575

mmccullom and others added 2 commits July 24, 2025 12:48

ssr.js

5fb1ba2

Update ssr.js

f871173

Signed-off-by: mmccullom-sf <mmccullom+@salesforce.com>

jhagama reviewed Jul 24, 2025

View reviewed changes

jbisaSF reviewed Jul 25, 2025

View reviewed changes

mmccullom-sf changed the base branch from adyenExpressPayments to adyenExpressPaymentsDreamForce July 25, 2025 15:01

address comment about basket choice

655fd19

jbisaSF approved these changes Jul 25, 2025

View reviewed changes

mmccullom and others added 3 commits July 30, 2025 14:40

remove quantity

23d0ba0

Merge branch 'adyenExpressPaymentsDreamForce' into adyenApplePayPDP

56ee560

Signed-off-by: mmccullom-sf <mmccullom+@salesforce.com>

merge with Google Pay

8c4e8d4

mmccullom-sf merged commit 2b7eebf into SalesforceCommerceCloud:adyenExpressPaymentsDreamForce Jul 30, 2025
8 of 9 checks passed

mmccullom-sf deleted the adyenApplePayPDP branch July 30, 2025 19:59


		applePayAmount = currentBasket.orderTotal \|\| currentBasket.productTotal \|\| 0

		// CRITICAL: Force final order calculation before payment

Conversation

mmccullom-sf commented Jul 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of Changes

Changes

How to Test-Drive This PR

Checklists

General

Accessibility Compliance

Localization

Uh oh!

salesforce-cla bot commented Jul 11, 2025

Uh oh!

cc-prodsec commented Jul 11, 2025 • 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!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mmccullom-sf commented Jul 11, 2025 •

edited

Loading

cc-prodsec commented Jul 11, 2025 •

edited

Loading