Skip to content

fix: cherry-pick 7.47.0 include gas and gas price in PPOM requests (#15836)#16155

Merged
NicolasMassart merged 2 commits intorelease/7.47.0from
cherry-pick-89cd619
Jun 6, 2025
Merged

fix: cherry-pick 7.47.0 include gas and gas price in PPOM requests (#15836)#16155
NicolasMassart merged 2 commits intorelease/7.47.0from
cherry-pick-89cd619

Conversation

@digiwand
Copy link
Contributor

@digiwand digiwand commented Jun 5, 2025

Cherry-picks #15836

Delta:

  • app/components/Views/confirmations/utils/transaction.ts does not have addMMOriginatedTransaction method yet. missing +1 -1 from this
  • app/lib/ppom/ppom-util.test.ts
    • add TransactionMeta import
    • multiple line diffs using former ppomUtil.validateRequest params
  • app/lib/ppom/ppom-util.ts 1 line delta which was a line with 1 bracket
       }
    

Similar to MetaMask/metamask-extension#33180 with variations

  • Extract gas properties from TransactionMeta.
  • Continue to pass all request properties to PPOM (Tests are expecting these, and I don't see how this would block the work in this PR)
  • Use constant names > magic names

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/5005

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

Similar to MetaMask/metamask-extension#33180
with variations

- Extract gas properties from TransactionMeta.
- Continue to pass all request properties to PPOM (Tests are expecting
these, and I don't see how this would block the work in this PR)
- Use constant names > magic names

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/5005

1. Go to this page...
2.
3.

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

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

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

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] 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.

- [ ] 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.

---------

Co-authored-by: OGPoyraz <[email protected]>
@digiwand digiwand requested review from a team as code owners June 5, 2025 22:46
@github-actions
Copy link
Contributor

github-actions bot commented Jun 5, 2025

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 team-confirmations Push issues to confirmations team INVALID-PR-TEMPLATE PR's body doesn't match template labels Jun 5, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Jun 5, 2025

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: 4a1b098
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/6ba4cacb-ea32-45da-97ed-9d1594a6c09a

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

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 85.29412% with 5 lines in your changes missing coverage. Please review.

Project coverage is 68.81%. Comparing base (6238b39) to head (4a1b098).
Report is 4 commits behind head on release/7.47.0.

Files with missing lines Patch % Lines
app/lib/ppom/ppom-util.ts 90.00% 1 Missing and 2 partials ⚠️
app/core/WalletConnect/WalletConnect.js 0.00% 1 Missing ⚠️
app/core/WalletConnect/WalletConnect2Session.ts 0.00% 1 Missing ⚠️
Additional details and impacted files
@@                Coverage Diff                 @@
##           release/7.47.0   #16155      +/-   ##
==================================================
+ Coverage           68.78%   68.81%   +0.02%     
==================================================
  Files                2382     2384       +2     
  Lines               51531    51578      +47     
  Branches             7719     7729      +10     
==================================================
+ Hits                35448    35491      +43     
- Misses              13817    13821       +4     
  Partials             2266     2266              

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@sonarqubecloud
Copy link

sonarqubecloud bot commented Jun 5, 2025

@NicolasMassart NicolasMassart merged commit e96fdcb into release/7.47.0 Jun 6, 2025
38 of 40 checks passed
@NicolasMassart NicolasMassart deleted the cherry-pick-89cd619 branch June 6, 2025 08:16
@github-actions github-actions bot locked and limited conversation to collaborators Jun 6, 2025
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 team-confirmations Push issues to confirmations team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants