chore: cherry-pick xchain swaps UI into v12.10.0 #29259
Closed
+3,746
−2,595
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<!-- 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. --> ## **Description** When a hardware wallet user declines a transaction during the bridge process, they are redirected back to the bridge setup page. This PR adds an info message to clarify why they were redirected and prompt them to get a new quote. <!-- 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? --> [](https://codespaces.new/MetaMask/metamask-extension/pull/29198?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to bridge with a hardware wallet 2. Attempt bridge 3. Decline transaction on hardware wallet 4. See info message when you're redirected ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After**  <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [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-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **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.
<!-- 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. --> Changes include - layout and styling updates for the landing screen - re-styling input fields, including asset pickers - integrates the multichain asset list into bridge's token list generator - style + copy updates in quote display components - advanced settings modal - input and quote validation alerts - bug fixes This depends on 3 open PRs 1. tracking events: #28713 2. multichain AssetPicker: #28975 3. NetworkAvatar style update: #28976 Changes from #2 and #3 are currently included here, but will mainly just contain bridge component updates after those are merged. Since those are being reviewed by external teams, reviews on this one should be focused on bridge-specific files/directories Figma: https://www.figma.com/design/IuOIRmU3wI0IdJIfol0ESu/Cross-Chain-Swaps?node-id=7-24563&node-type=canvas&m=dev <!-- 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? --> [](https://codespaces.new/MetaMask/metamask-extension/pull/28373?quickstart=1) Fixes: https://consensyssoftware.atlassian.net/browse/MMS-1451 1. Set these in .metamaskrc and run `yarn webpack --watch` ``` SEGMENT_HOST='http://localhost:9090' SEGMENT_WRITE_KEY='FAKE' BRIDGE_USE_DEV_APIS=1 ``` 2. Try out the Bridge page, asset picker, submitting txs, viewing quotes etc 3. Open the background console network tab to see emitted events <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> <!-- [screenshots/recordings] -->  <!-- [screenshots/recordings] --> - [X] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [X] I've completed the PR template to the best of my ability - [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-extension/blob/develop/.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: infiniteflower <[email protected]> Co-authored-by: Jack Clancy <[email protected]>
|
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. |
micaelae
changed the title
micaelae
changed the title
micaelae
changed the title
Builds ready [322fb6f]
Page Load Metrics (2009 ± 139 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
ghgoodreau
previously approved these changes
Dec 17, 2024
jclancy93
previously approved these changes
Dec 17, 2024
<!-- 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. --> ## **Description** Fixes sentry tests for bridge token loading status in Firefox <!-- 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? --> [](https://codespaces.new/MetaMask/metamask-extension/pull/29285?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [X] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [X] I've completed the PR template to the best of my ability - [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-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **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.
ghgoodreau
approved these changes
Dec 17, 2024
Builds ready [bd0938f]
Page Load Metrics (1834 ± 97 ms)
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
jclancy93
approved these changes
Dec 17, 2024
](https://codespaces.new/MetaMask/metamask-extension/pull/29198?quickstart=1){kind=link}
](https://codespaces.new/MetaMask/metamask-extension/pull/28373?quickstart=1){kind=link}
](https://codespaces.new/MetaMask/metamask-extension/pull/29285?quickstart=1){kind=link}
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Cherry-picks these PRs into V-12.10.0
The included PRs have been thoroughly tested by cross-chain swaps QA. However they got blocked last week due to a benchmarking failure.
Related issues
Fixes:
Manual testing steps
Screenshots/Recordings
Before
After
Pre-merge author checklist
Pre-merge reviewer checklist