W-21241548: resolve conflicts

Author: rvishwanathbhat

packages/template-retail-react-app/app/ssr.js

@@ -361,7 +361,8 @@ const {handler} = runtime.createHandler(options, (app) => {
                         // Default source for product images - replace with your CDN
                         '*.commercecloud.salesforce.com',
                         // TODO: Used to load icons
-                        '*.demandware.net'
+                        '*.demandware.net',
+                        '*.adyen.com'
                     ],
                     'script-src': [
                         // Used by the service worker in /worker/main.js

packages/template-retail-react-app/app/utils/sf-payments-utils.js

@@ -22,6 +22,16 @@ export const getSFPaymentsInstrument = (basketOrOrder) => {
     )
 }
 
+/**
+ * Returns the client secret from a payment instrument (e.g. Stripe PaymentIntent client_secret).
+ * Used by express payment flows to pass through to the payment SDK.
+ * @param {Object} paymentInstrument - Payment instrument with paymentReference.gatewayProperties
+ * @returns {string|undefined} Client secret for the payment gateway, or undefined if not present
+ */
+export const getClientSecret = (paymentInstrument) => {
+    return paymentInstrument?.paymentReference?.gatewayProperties?.stripe?.clientSecret
+}
+
 /**
  * Transform billing and shipping address details from payment provider format to basket format.
  * Determines the appropriate source for billing address (PayPal/Venmo may not provide complete billing details).