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.

Sign up for GitHub

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

Jump to bottom

fix: fix approve flow on swap #11532

Merged
merged 8 commits into from
Oct 10, 2024
Merged

fix: fix approve flow on swap #11532

merged 8 commits into from
Oct 10, 2024

Conversation

sahar-fehri
Copy link
Contributor

Description

PR to fix the approve flow when users swap tokens.

Related issues

Fixes: #10834

Manual testing steps

  1. Switch to base network
  2. Swap WETH against any other token, exp USDC
  3. See approval screen; it should have the buttons enabled and you should be able to see token icon and spending cap

Screenshots/Recordings

Before

Screen.Recording.2024-10-01.at.15.18.01.mov

After

swapFix.mov

Pre-merge author checklist

Pre-merge reviewer checklist

  • I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
  • I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

@sahar-fehri sahar-fehri requested review from a team as code owners October 1, 2024 13:19
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 1, 2024

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@sahar-fehri sahar-fehri added needs-assets-ux-review A shared label between the Assets and UX team to flag PRs ready for consolidated team review. Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 1, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 1, 2024 •
edited by metamaskbot
Loading

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: 2a7c3ef
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/1fe8aad5-6e67-4dd6-abad-2cb3d51131d5

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

Tip

  • Check the documentation if you have any doubts on how to understand the failure on bitrise

@sahar-fehri sahar-fehri marked this pull request as draft October 1, 2024 13:33
@sahar-fehri sahar-fehri marked this pull request as ready for review October 1, 2024 13:35
@sahar-fehri sahar-fehri added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 1, 2024
@sahar-fehri sahar-fehri added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 2, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 2, 2024 •
edited by metamaskbot
Loading

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: 72006c8
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/d3bec1d2-9d34-4e51-92a4-743c2022a69e

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

Tip

  • Check the documentation if you have any doubts on how to understand the failure on bitrise

@sahar-fehri sahar-fehri added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 2, 2024
@sahar-fehri sahar-fehri requested a review from a team as a code owner October 3, 2024 14:40
@sahar-fehri sahar-fehri added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 9, 2024 •
edited by metamaskbot
Loading

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 61d4f30
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/f7f750a8-2d48-4e85-afd6-f2b20e6f339f

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

@sahar-fehri sahar-fehri added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 10, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 10, 2024 •
edited by metamaskbot
Loading

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: eeb61b4
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/cd7c0ded-b6c3-4297-af70-a3a51acd715e

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

@sahar-fehri sahar-fehri added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 10, 2024
@github-actions GitHub Actions
Copy link
Contributor

https://bitrise.io/ Bitrise

🔄🔄🔄 pr_smoke_e2e_pipeline started on Bitrise...🔄🔄🔄

Commit hash: 6ca005f
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/09cb7715-267a-4749-b596-68aba8040b7c

Note

  • This comment will auto-update when build completes
  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

NicolasMassart
NicolasMassart reviewed Oct 10, 2024
View reviewed changes
Copy link
Contributor

@NicolasMassart NicolasMassart left a comment

Choose a reason for hiding this comment

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

Only one comment on the second test, make sure you are not adding useless actions or missing testing them

app/components/Views/confirmations/components/ApproveTransactionReview/index.test.tsx Outdated Show resolved Hide resolved
@sahar-fehri sahar-fehri added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 10, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 10, 2024 •
edited by metamaskbot
Loading

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 3cb2d4d
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/2aa3daae-b5b2-4b7c-bc1d-e50e9a1a2af5

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

NicolasMassart
NicolasMassart approved these changes Oct 10, 2024
View reviewed changes
Copy link
Contributor

@NicolasMassart NicolasMassart left a comment

Choose a reason for hiding this comment

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

Looks good to me.
Thanks for all the changes you made and you patience!

@sahar-fehri sahar-fehri added this pull request to the merge queue Oct 10, 2024
Merged via the queue into main with commit b0ef1a7 Oct 10, 2024
43 checks passed
@sahar-fehri sahar-fehri deleted the fix/fix-approve-button-for-swap-flow branch October 10, 2024 16:04
@github-actions github-actions bot locked and limited conversation to collaborators Oct 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@NicolasMassart NicolasMassart NicolasMassart approved these changes

@pedronfigueiredo pedronfigueiredo pedronfigueiredo left review comments

@andreahaku andreahaku andreahaku left review comments

@davibroc davibroc davibroc left review comments

@andrepimenta andrepimenta Awaiting requested review from andrepimenta

@tommasini tommasini Awaiting requested review from tommasini

Assignees
No one assigned
Labels
needs-assets-ux-review A shared label between the Assets and UX team to flag PRs ready for consolidated team review. QA Passed A successful QA run through has been done release-7.34.0 Run Smoke E2E Triggers smoke e2e on Bitrise team-assets
Projects
PR review queue
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: Approve button disabled for Approvals of ERC20 tokens
8 participants
@sahar-fehri @NicolasMassart @davibroc @andreahaku @pedronfigueiredo @tommasini @gauthierpetetin @martahj