Skip to content

chore: cherry-pick #8929#8940

Merged
sethkfman merged 1 commit into
release/7.18.0from
chore/cherry-pick-8929
Mar 14, 2024
Merged

chore: cherry-pick #8929#8940
sethkfman merged 1 commit into
release/7.18.0from
chore/cherry-pick-8929

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

This PR cherry-picks #8929

…8933)

## **Description**

This PR will fix #8917  for the release 7.17.1.

The fix is quite simple to move the `await
this.persistTransactionParameters(transaction);` above ledger code in
`Confirm/index.js` file so that TransactionController can persist all
gas relative tx parameter before ledger process signTransaction.

> ⚠️ : Due to `main` branch have TransactionController upgrade which use
`@ethereumjs/tx` library, which cause another issue in ledger
transaction flow, this PR will not fix the issue on `main` branch,
however we should still merge this PR to `main` branch and then i will
fix another ledger transaction issue due to `@ethereumjs/tx` upgrade.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

## **Related issues**

Fixes: #8917 

## **Manual testing steps**

1. Connect Ledger device
2. Switch network to Linea Testnet
3. Send transaction from Ledger account to Account 2 (normal account)
4. Confirm transaction on Ledger device
5. Transaction should successfully submitted.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

https://github.com/MetaMask/metamask-mobile/assets/106310394/0ae2fddb-40d1-4b13-af8c-0143525bf28f

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->


https://github.com/MetaMask/metamask-mobile/assets/7315988/326b34a7-904e-4f01-9d18-52c47cd072bc




## **Pre-merge author checklist**

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

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] 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.
@dawnseeker8 dawnseeker8 marked this pull request as ready for review March 14, 2024 15:53
@dawnseeker8 dawnseeker8 requested a review from a team as a code owner March 14, 2024 15:53
@github-actions

github-actions Bot commented Mar 14, 2024

Copy link
Copy Markdown
Contributor Author

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 2c4cbe4
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/a33569b0-41f7-4d48-bca2-644283a2a44a

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

@sethkfman sethkfman left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@sethkfman sethkfman merged commit f907234 into release/7.18.0 Mar 14, 2024
@sethkfman sethkfman deleted the chore/cherry-pick-8929 branch March 14, 2024 16:56
@github-actions github-actions Bot locked and limited conversation to collaborators Mar 14, 2024
@metamaskbot metamaskbot added the release-7.18.0 Issue or pull request that will be included in release 7.18.0 label Mar 14, 2024
@metamaskbot

Copy link
Copy Markdown
Collaborator

No release label on PR. Adding release label release-7.18.0 on PR, as PR was cherry-picked in branch 7.18.0.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

release-7.18.0 Issue or pull request that will be included in release 7.18.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants