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

fix: Allow to re-submit a cancelled swap if cancelled via a HW wallet #27210

Merged
merged 2 commits into from
Sep 17, 2024

Conversation

dan437
Copy link
Contributor

@dan437 dan437 commented Sep 17, 2024

Description

This PR is a partial cherry pick of this one and fixes an edge case for this PR, where when a swap was cancelled on a HW device, the submit button for swaps was disabled. Now a user can resubmit cancelled swaps repeatedly.

It was already fixed here about a month ago, but it's not in the v12.3.0 release. That's why this partial cherry-pick is needed.

Manual testing steps

  1. Go to Swaps with a HW wallet on Ethereum Mainnet and Smart Transactions enabled in Advanced Settings
  2. Submit a swap, but cancel it on a HW device
  3. You should see the quote overview page again and the Swap button should be enabled

Screenshots/Recordings

Before

After

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.

@dan437 dan437 added the team-transactions Transactions team label Sep 17, 2024
@dan437 dan437 requested review from a team as code owners September 17, 2024 11:54
@dan437 dan437 changed the title V12.3.0 stx hw wallet swap fix: Allow to re-submit a cancelled swap if cancelled via a HW wallet Sep 17, 2024
Copy link
Contributor

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.

@metamaskbot metamaskbot added the INVALID-PR-TEMPLATE PR's body doesn't match template label Sep 17, 2024
@danjm danjm added team-transactions Transactions team and removed team-transactions Transactions team labels Sep 17, 2024
@metamaskbot
Copy link
Collaborator

Builds ready [92749ba]
Page Load Metrics (1981 ± 129 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint166825261993278133
domContentLoaded162025131935270130
load167025251981270129
domInteractive209839178

Copy link

codecov bot commented Sep 17, 2024

Codecov Report

Attention: Patch coverage is 40.00000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 70.26%. Comparing base (439f7d6) to head (92749ba).
Report is 10 commits behind head on Version-v12.3.0.

Files with missing lines Patch % Lines
ui/pages/swaps/prepare-swap-page/review-quote.js 50.00% 2 Missing ⚠️
ui/ducks/swaps/swaps.js 0.00% 1 Missing ⚠️
Additional details and impacted files
@@                 Coverage Diff                 @@
##           Version-v12.3.0   #27210      +/-   ##
===================================================
+ Coverage            70.24%   70.26%   +0.01%     
===================================================
  Files                 1426     1427       +1     
  Lines                50239    50255      +16     
  Branches             13954    13963       +9     
===================================================
+ Hits                 35289    35307      +18     
+ Misses               14950    14948       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@martahj martahj left a comment

Choose a reason for hiding this comment

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

Code LGTM but I'm having trouble getting 12.3 and related branches to load 🤔

@danjm danjm merged commit 2d660df into Version-v12.3.0 Sep 17, 2024
72 checks passed
@danjm danjm deleted the v12.3.0-stx-hw-wallet-swap branch September 17, 2024 14:09
@github-actions github-actions bot locked and limited conversation to collaborators Sep 17, 2024
@metamaskbot metamaskbot added the release-12.3.0 Issue or pull request that will be included in release 12.3.0 label Sep 26, 2024
@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-12.3.0 on PR, as PR was added to branch 12.3.0 when release was cut.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
INVALID-PR-TEMPLATE PR's body doesn't match template release-12.3.0 Issue or pull request that will be included in release 12.3.0 team-transactions Transactions team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants