Skip to content

sync integrations/makeswift branch w/ canary#2838

Merged
jorgemoya merged 27 commits into
integrations/makeswiftfrom
sync-integrations-makeswift
Jan 27, 2026
Merged

sync integrations/makeswift branch w/ canary#2838
jorgemoya merged 27 commits into
integrations/makeswiftfrom
sync-integrations-makeswift

Conversation

@jorgemoya

Copy link
Copy Markdown
Contributor

What/Why?

Syncs integrations/makeswift with latest 1.4.1 changes from canary

Testing

  • Confirm preview branch deploys without issue, perform manual testing

Migration

See CHANGELOG for individual PR migrations

chanceaclark and others added 25 commits January 6, 2026 20:28
When the sort option is changed in the product filter, the before/after
pagination query params are now removed. This prevents stale pagination
cursors from being used with the new sort order, which could lead to
incorrect results or empty pages.

Changes:
- Updated Sorting component to use useQueryStates instead of useQueryState
- Now manages sort, before, and after params together
- Clears before and after params when sort value changes

Co-authored-by: Claude <noreply@anthropic.com>
* fix(core): delete duplicate select component

* fix: remove console.log
* fix(core): persist checkbox modifier in PDP

* fix: handle default value for checkbox

* fix: revert form changes but keep track of options in params

* fix: update changset
* feat(core): add required prop to Label component and update form elements

- Introduced a `required` prop to the Label component to indicate mandatory fields.
- Updated Input, Textarea, NumberInput, Select, Checkbox, RadioGroup, and other form components to utilize the new `required` prop for better accessibility and user experience.

* refactor(core): format required indicator in Label component for improved readability

* display optional text for form fields instead of required asterisk

* fix linting

* add internationalization and translated messages for optional text

* remove formatting from da.json file

* removed formatting from language files

* removed formatting from language files

* added changeset

* remove 'optional' field from multiple language files

* ensure required prop is passed down in form input components

* pass required prop to RadioGroupPrimitive.Root

* fix linting

* removed optional text from checkbox

* Pass field.required to CheckboxGroup and Checkbox so that optional text can be displayed
* Add preventDefault to login form to prevent resetting of form on failed login attempt

* added changeset

* remove passing of action to form since actions is called manually in onSubmit handler
* chore(ci): BIGCOMMERCE_STORE_HASH secret is now var

* chore(ci): BIGCOMMERCE_CHANNEL_ID secret is now var
* refactor: decouple fields from state in DynamicForms

* fix: remove options from fields

* fix: pass passwordComplexity as an arg

* fix: remove fields from return state in contact form

* chore: add changeset
* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
* fix(core): remove decorative price element from accessibility tree

* fix: update to include accessibility best practices

* fix: update changeset

* fix: add price label component
* Updated gift certificate balance placeholder

* remove placeholders from gift certificates form

* add placeholders for coupon code and gift certificate on cart page

* added changelog

* remove placeholder for coupon code
* chore(catalyst): CATALYST-1297 Run E2E tests on PRs

* fix(catalyst): Fix required prop missing on cart shipping form

* chore(catalyst): CATALYST-1297 Use test matrix
* chore(ci): pass channel-specific env vars to vercel deploy

* chore(ci): harden deploy workflow security

replace eval with bash arrays, add timeouts, improve secret handling

* chore(ci): add b2b env vars to deploy workflow
* feat(other): LOCAL-1444 delivery translation

* chore(core): create translations patch

---------

Co-authored-by: bc-svc-local <bc-svc-local@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@jorgemoya
jorgemoya requested a review from a team January 26, 2026 22:23
@changeset-bot

changeset-bot Bot commented Jan 26, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 9529c3e

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@vercel

vercel Bot commented Jan 26, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Review Updated (UTC)
catalyst Ready Ready Preview, Comment Jan 27, 2026 4:16pm

Request Review

Comment thread core/package.json Outdated
Comment thread core/CHANGELOG.md Outdated
@@ -1,5 +1,1070 @@
# Changelog

## 1.4.1

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah you'll probably want to remove this too.

@jorgemoya jorgemoya Jan 27, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the entire changelog changes?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, you'll add a new changeset that basically says refer to the Catalyst 1.4.1 changelog which will then generate a new 1.4.1 changelog.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jorgemoya
jorgemoya merged commit 9529c3e into integrations/makeswift Jan 27, 2026
9 of 12 checks passed
@jorgemoya
jorgemoya deleted the sync-integrations-makeswift branch January 27, 2026 16:46
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