-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## **Description** This PR fixes one part of the bug shown in this github issue: #20106 When you try to send a token on polygon network and you are on the confirmation page; it shows the value of matic without a unit not an icon to indicate the network. If you are on ethereum network and you try to send an ERC20, it shows ethereum icon. In this PR i am using the AvatarNetwork component that is used on the main tokens page to indicate the network of tokens. ## **Manual testing steps** _1. Switch to polygon _2. Choose an ERC20 token and click send. _3. Add amount in amount input and click confirm and notice there is no unit/network icon displayed ## **Screenshots/Recordings** _If applicable, add screenshots and/or recordings to visualize the before and after of your change._ ### **Before** Ethereum: ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/a7ab2281-9661-4661-9d1a-2d58c91e3026) Polygon ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/1b2d6565-34c6-4381-a228-88f6af57d2b4) BNB ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/6a1f1285-1837-4201-ba8c-185ec1dc5f2d) ### **After** Ethereum: ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/faadf071-8ae4-4f04-8647-36cedf11d633) Polygon: ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/2cd289c5-4e60-4021-a29d-482c94ca096d) BNB: ![image](https://github.com/MetaMask/metamask-extension/assets/10994169/a9094246-7afa-4368-aa70-03c6af9a4d67) ## **Related issues** [_Fixes #MMASSETS-26](https://consensyssoftware.atlassian.net/browse/MMASSETS-26) ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've clearly explained: - [x] What problem this PR is solving. - [x] How this problem was solved. - [x] How reviewers can test my changes. - [x] I’ve indicated what issue this PR is linked to: Fixes #??? - [x] I’ve included tests if applicable. - [x] I’ve documented any added code. - [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)). - [x] 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.
- Loading branch information
1 parent
edeb99c
commit 0f3d46c
Showing
14 changed files
with
205 additions
and
61 deletions.
There are no files selected for viewing
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
11 changes: 8 additions & 3 deletions
11
...onents/app/confirm-page-container/confirm-detail-row/confirm-detail-row.component.test.js
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
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
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
9 changes: 8 additions & 1 deletion
9
...ancel-transaction/cancel-transaction-gas-fee/cancel-transaction-gas-fee.component.test.js
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
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
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
11 changes: 8 additions & 3 deletions
11
...omponents/app/user-preferenced-currency-display/user-preferenced-currency-display.test.js
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
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
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
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
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
Oops, something went wrong.