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

feat: add error message to retry modal #7643

Merged
merged 5 commits into from
Nov 10, 2023

Conversation

stanleyyconsensys
Copy link
Contributor

@stanleyyconsensys stanleyyconsensys commented Oct 30, 2023

Description

  • Modify retry modal to display error message
  • Add transaction exception type for cancel and speedup transaction
  • In Transaction component, when transactionObject has error, throw exception base on the cancel / speedup
  • In Transaction component, toggleRetry should take error message instead of error
  • In Transaction component, error message should pass into retry modal

Related issues

Fixes: #

Manual testing steps

  1. Go to this page...

Screenshots/Recordings

Before

After

Pre-merge author checklist

  • I’ve followed MetaMask Coding Standards.
  • I've clearly explained what problem this PR is solving and how it is solved.
  • I've linked related issues
  • I've included manual testing steps
  • I've included screenshots/recordings if applicable
  • I’ve included tests if applicable
  • I’ve documented my code using JSDoc format if applicable
  • I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.
  • I’ve properly set the pull request status:
    • In case it's not yet "ready for review", I've set it to "draft".
    • In case it's "ready for review", I've changed it from "draft" to "non-draft".

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.

@github-actions
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.

@codecov-commenter
Copy link

codecov-commenter commented Oct 30, 2023

Codecov Report

Attention: 15 lines in your changes are missing coverage. Please review.

Comparison is base (f20b42b) 34.98% compared to head (549bc97) 34.95%.
Report is 39 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7643      +/-   ##
==========================================
- Coverage   34.98%   34.95%   -0.03%     
==========================================
  Files        1030     1035       +5     
  Lines       27376    27552     +176     
  Branches     2253     2301      +48     
==========================================
+ Hits         9577     9632      +55     
- Misses      17289    17407     +118     
- Partials      510      513       +3     
Files Coverage Δ
...pp/components/UI/Transactions/RetryModal/index.tsx 28.57% <50.00%> (-4.77%) ⬇️
app/core/Transaction/TransactionError.ts 0.00% <0.00%> (ø)
app/components/UI/Transactions/index.js 3.43% <0.00%> (-0.13%) ⬇️

... and 65 files with indirect coverage changes

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

@dawnseeker8 dawnseeker8 added the Ledger Ledger hardware wallet related issue or development label Nov 1, 2023
@dawnseeker8 dawnseeker8 marked this pull request as ready for review November 1, 2023 03:59
@dawnseeker8 dawnseeker8 requested a review from a team as a code owner November 1, 2023 03:59
Copy link
Contributor

github-actions bot commented Nov 1, 2023

E2E test started on Bitrise: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/6f40610b-cefa-462e-a3ac-5f9907b2e924
You can also kick off another Bitrise E2E smoke test by removing and re-applying the (Run Smoke E2E) label

igorms-cons
igorms-cons previously approved these changes Nov 2, 2023
Copy link
Contributor

@Cal-L Cal-L left a comment

Choose a reason for hiding this comment

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

left some comments

app/components/UI/Transactions/RetryModal/index.tsx Outdated Show resolved Hide resolved
app/components/UI/Transactions/RetryModal/index.tsx Outdated Show resolved Hide resolved
app/components/UI/Transactions/index.js Outdated Show resolved Hide resolved
Copy link

sonarcloud bot commented Nov 9, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

3.6% 3.6% Coverage
0.0% 0.0% Duplication

Copy link
Contributor

@Cal-L Cal-L left a comment

Choose a reason for hiding this comment

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

LGTM

@dawnseeker8 dawnseeker8 merged commit 1072a0a into main Nov 10, 2023
26 checks passed
@dawnseeker8 dawnseeker8 deleted the feat/add-error-msg-to-retry-modal branch November 10, 2023 00:23
@github-actions github-actions bot locked and limited conversation to collaborators Nov 10, 2023
@metamaskbot metamaskbot added the release-7.12.0 Issue or pull request that will be included in release 7.12.0 label Nov 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Ledger Ledger hardware wallet related issue or development release-7.12.0 Issue or pull request that will be included in release 7.12.0 team-accounts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants