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 latest master into develop #3766

Merged
merged 64 commits into from
Jul 20, 2023
Merged

Merge latest master into develop #3766

merged 64 commits into from
Jul 20, 2023

Conversation

timjrobinson
Copy link
Contributor

There were many hotfixes that haven't been merged into develop yet. This is a merge of all of them with conflicts fixed.

garethfuller and others added 30 commits July 17, 2023 14:56
* chore: Ensure all BalActionStep errors are marked as fatal

* chore: Improve original error parsing
* Use tokenApprovalActions for Swaps

Refactor swapping to use TokenApprovalActions so that it checks the user
has made their allowance high enough to swap their token.

* Rename isEthSwap to isNativeAssetSwap to be clearer for Polygon

* Make Lido rate provider work on Goerli

* Disable swap button into approvals have loaded
* fix: Exit queries need to be retrigged if the wallet changes

* fix: Only trigger single asset max refetch on bpt balance change
* fix: Try to capture original error

* chore: fix lint
@vercel
Copy link

vercel bot commented Jul 20, 2023

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

Name Status Preview Comments Updated (UTC)
beta-app-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jul 20, 2023 7:34am
1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
app-v2 ⬜️ Ignored (Inspect) Jul 20, 2023 7:34am

@timjrobinson timjrobinson merged commit 9471db2 into develop Jul 20, 2023
4 checks passed
@timjrobinson timjrobinson deleted the merge-master branch July 20, 2023 09:30
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.

8 participants