Skip to content

W-21436534: Merge from Develop to feature branch#3713

Merged
rasbhat merged 6 commits intot/team404/sfp-on-pwafrom
rvishwanathbhat/merge-changes-from-develop
Mar 4, 2026
Merged

W-21436534: Merge from Develop to feature branch#3713
rasbhat merged 6 commits intot/team404/sfp-on-pwafrom
rvishwanathbhat/merge-changes-from-develop

Conversation

@rasbhat
Copy link

@rasbhat rasbhat commented Mar 4, 2026

Updating feature branch t/team404/sfp-pn-pwa branch with latest develop branch to:

  1. Resolve merge conflicts
  2. Resolve failing checks

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...

Localization

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

mitesh-patel-crm and others added 6 commits February 24, 2026 13:15
…pper Consents hooks (#3674)

- Updated Email Subscription component (in the footer section) with Shopper Consents hooks, also with updated styling and labels.
- Updated commerce-sdk-react to use Shopper Consents hooks.
- Fix for email validation on marketing consent capture: TLD must be more than 1 character.
- Increase package max size from 90KB to 95KB, accounting for footer component size.
- Check for feature enablement via Shopper Configurations API (feature=>`EnableConsentWithMarketingCloud`)
…3693)

* @W-21362507: Fix for custom billing address as registered shoppers

Signed-off-by: d.phan <d.phan@salesforce.com>

* add changelog

Signed-off-by: d.phan <d.phan@salesforce.com>

---------

Signed-off-by: d.phan <d.phan@salesforce.com>
* Bump dependencies versions

* Update lock files

* Fix npm registry

* Update jest breaking changes

* One click checkout tests with configurable mocks

* Solve merge conflicts

* Update package-lock.json
…ayout (#3682)

* feat: update the banner with click events
* @W-21294742: No error toast for non-applicable shipping method

Signed-off-by: d.phan <d.phan@salesforce.com>

* add changelog

Signed-off-by: d.phan <d.phan@salesforce.com>

* fix for multi-shipment

Signed-off-by: d.phan <d.phan@salesforce.com>

* fix edge cases

Signed-off-by: d.phan <d.phan@salesforce.com>

* minor comment remove

Signed-off-by: d.phan <d.phan@salesforce.com>

* fixes

Signed-off-by: d.phan <d.phan@salesforce.com>

* fix duplicate error toast

Signed-off-by: d.phan <d.phan@salesforce.com>

* fix for false positives error toast

Signed-off-by: d.phan <d.phan@salesforce.com>

* reuse util func

Signed-off-by: d.phan <d.phan@salesforce.com>

* lint fix test

Signed-off-by: d.phan <d.phan@salesforce.com>

* fix a11y cart issue

Signed-off-by: d.phan <d.phan@salesforce.com>

* skip test temporarily

Signed-off-by: d.phan <d.phan@salesforce.com>

---------

Signed-off-by: d.phan <d.phan@salesforce.com>
Signed-off-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com>
@rasbhat rasbhat requested review from a team as code owners March 4, 2026 05:56
@cc-prodsec
Copy link
Collaborator

cc-prodsec commented Mar 4, 2026

Snyk checks have failed. 1 issues have been found so far.

Status Scanner Critical High Medium Low Total (1)
Open Source Security 0 1 0 0 1 issues
Licenses 0 0 0 0 0 issues

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

@rasbhat rasbhat merged commit e6fc8cb into t/team404/sfp-on-pwa Mar 4, 2026
7 of 16 checks passed
@rasbhat rasbhat deleted the rvishwanathbhat/merge-changes-from-develop branch March 4, 2026 19:52
rasbhat added a commit that referenced this pull request Mar 5, 2026
…/merge-changes-from-develop

W-21436534: Merge from Develop to feature branch
rasbhat added a commit that referenced this pull request Mar 5, 2026
…/merge-changes-from-develop

W-21436534: Merge from Develop to feature branch
rasbhat added a commit that referenced this pull request Mar 5, 2026
…/merge-changes-from-develop

W-21436534: Merge from Develop to feature branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants