Description

This PR cherry-picks #8615

Related issues

Fixes:

Manual testing steps

1. Go to this page...

Screenshots/Recordings

Smoke test run: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/46e749cb-c149-4ced-bc40-a9e5e1bed3c8
Regression test run: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/88873d22-4fea-45c3-83f3-eb034aa3ee32

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.