Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release 1.41 into 1.42 #2868

Merged
merged 10 commits into from
Jul 12, 2023
Merged

Conversation

anxolin
Copy link
Contributor

@anxolin anxolin commented Jul 12, 2023

Summary

DO NOT SQUASH

Brings the changes from the fixes for 1.41 into 1.42

I just created the PR since there were a bunch of merge conflicts I had to manually fix.
As long as it compiles and work, I will merge and then merge to develop

shoom3301 and others added 10 commits July 12, 2023 12:59
* feat(trade): generalise wrap/unwrap flow for all trade widgets (#2774)

* chore: fix merge conflicts
Without this, instead of the default behaviour, the SDK defaults to `barn` endpoint
* chore: make pixel events more resilient

* fix: do not redirect to unknown network
)

* chore: export and move isParsedOrder to parseOrder utils

* chore: add constants to control surplus modal display

* refactor: update types to use Nullish

* feat: return showSurplus from useGetSurplusData

* chore: do not render surplus modal if it shouldn't

* chore: move showSurplus to parent

* feat: do not show surplus modal on confirmation modal when it shouldn't

* feat: do not show independent surplus modal when it shouldn't

* chore: remove debug logs
@vercel
Copy link

vercel bot commented Jul 12, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
swap-dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jul 12, 2023 2:50pm

@anxolin anxolin merged commit f77957a into release/1.42 Jul 12, 2023
10 of 11 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Jul 12, 2023
@anxolin anxolin deleted the merge-release-1.41-into-1.42 branch August 16, 2023 11:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants