[rasbhat]

Merging changes from develop.
MRT: https://sfpaymentstesting01-production.sfdc-3vx9f4-commerceecom.exp-delivery-staging.com/
List of conflicted files resolved:

packages/commerce-sdk-react/package.json
packages/commerce-sdk-react/src/hooks/types.ts
packages/commerce-sdk-react/src/hooks/helpers.ts
packages/commerce-sdk-react/src/hooks/ShopperConfigurations/cache.ts
packages/commerce-sdk-react/src/hooks/ShopperConfigurations/index.test.ts
packages/commerce-sdk-react/src/hooks/ShopperCustomers/index.test.ts
packages/commerce-sdk-react/src/hooks/ShopperExperience/index.test.ts
packages/commerce-sdk-react/src/hooks/ShopperLogin/index.test.ts
packages/template-retail-react-app/app/components/bonus-product-view-modal/index.test.js
packages/template-retail-react-app/app/hooks/use-add-to-cart-modal.test.js
packages/template-retail-react-app/app/pages/cart/index.jsx
packages/template-retail-react-app/app/pages/checkout/index.jsx
packages/template-retail-react-app/app/pages/checkout/util/checkout-context.js
packages/template-retail-react-app/app/ssr.js
packages/template-retail-react-app/config/default.js
packages/template-retail-react-app/app/static/translations/compiled/en-US.json
packages/template-retail-react-app/app/static/translations/compiled/en-GB.json
packages/template-retail-react-app/app/static/translations/compiled/en-XA.json
packages/template-retail-react-app/translations/en-US.json
packages/template-retail-react-app/translations/en-GB.json

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)

[cc-prodsec]

⛔ Snyk checks have failed. 7 issues have been found so far.

Status	Scanner	Critical	High	Medium	Low	Total (7)
⛔	Open Source Security	0	7	0	0	7 issues
✅	Licenses	0	0	0	0	0 issues

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

[amittapalli]

@rasbhat, I am trying to see if we can gradually reduce the number of checks that are failing.
--We can fix the bundle size one (think there is a value to upgrade and sometimes our code changes require that we do
--did you run the lint check on the merge branch? Some checks may be because of that?
--maybe the package.json lock files are not in sync? If they didn't have merge conflicts (since they usually tend to), then npm ci command passes. Normally for develop we run npm install but CI/CD runs npm ci (based on package.json lock files)

Lets try some of these after we confirm that things are still working on MRT

[rasbhat]

@rasbhat, I am trying to see if we can gradually reduce the number of checks that are failing. --We can fix the bundle size one (think there is a value to upgrade and sometimes our code changes require that we do --did you run the lint check on the merge branch? Some checks may be because of that? --maybe the package.json lock files are not in sync? If they didn't have merge conflicts (since they usually tend to), then npm ci command passes. Normally for develop we run npm install but CI/CD runs npm ci (based on package.json lock files)

Lets try some of these after we confirm that things are still working on MRT

Deleted a couple of duplicates and pushed a couple of changes onto the branch. I've run lint. Hopefully that would pass a few checks.

[jeffraab-sfdc]

This is to get the feature branch up to date, so if things are working in general I'm fine with merging this to move forward. Any failing checks etc will need to be addressed before the feature branch merge anyway. If it's less disruptive to do these tasks in this PR that's fine too.

[amittapalli]

Yes, I agree. We are not planning on fixing all of these right now. Just a note so if there is any low hanging stuff we can, else we make note and do later. But so far we only tested credit card with this merged branch. We can quickly test Express and/or another gateway and if all good merge