Increase number of ETH decimals displayed in the balance view from 3 …#5710
Merged
Conversation
whymarrh
approved these changes
Nov 9, 2018
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Apr 25, 2025
… `^21.0.4` (#32287) <!-- 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** <!-- 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? --> Bumping `@metamask/keyring-controller` to `^21.0.4` ```markdown ## [21.0.4] ### Fixed - Ensure no duplicate accounts are persisted ([#5710](MetaMask/core#5710)) ``` [](https://codespaces.new/MetaMask/metamask-extension/pull/32287?quickstart=1) ## **Related issues** Fixes: #32097 ## **Manual testing steps** ### In order to test the fix, you first need a wallet bricked because of a duplicate account: - Checkout on the v12.16.0 release branch and build locally (a version with multi-srp support) - Import or create an SRP (I used `child guilt hollow arrive average popular nasty soon summer like scheme diary pill country rapid`) - Import an account that is part of the mnemonic (e.g. I used `0x80842b7e3cfb1118e86a427cdec418e3b4179ef5bbbfd71c02a76349831c8a8b` which is the account at index 2 of the above SRP) - Add a new account on the main HD - note that you'll be able to add the account, but (1) the account is the same as the imported one (expectable) and (2) the newly added account is wrongly labeled as "imported" - Lock the wallet - Unlock it with the right password - you will see the reported error: ``` Error: KeyringController - The account you are trying to import is a duplicate await in withLock submitPassword @ metamask-controller.js:4343 await in submitPassword (anonymous) @ createMetaRPCHandler.js:23 ``` ### Testing the fix - Without removing the extension from the browser, switch to this PR branch and build again - Visit [chrome://extensions/](chrome://extensions/) and reload the extension - Try to login again, you should be able to access the wallet again ## **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** - [ ] 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). - [ ] 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-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.
DDDDDanica
pushed a commit
that referenced
this pull request
Apr 25, 2025
… `^21.0.4` (#32287) <!-- 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. --> <!-- 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? --> Bumping `@metamask/keyring-controller` to `^21.0.4` ```markdown - Ensure no duplicate accounts are persisted ([#5710](MetaMask/core#5710)) ``` [](https://codespaces.new/MetaMask/metamask-extension/pull/32287?quickstart=1) Fixes: #32097 a duplicate account: - Checkout on the v12.16.0 release branch and build locally (a version with multi-srp support) - Import or create an SRP (I used `child guilt hollow arrive average popular nasty soon summer like scheme diary pill country rapid`) - Import an account that is part of the mnemonic (e.g. I used `0x80842b7e3cfb1118e86a427cdec418e3b4179ef5bbbfd71c02a76349831c8a8b` which is the account at index 2 of the above SRP) - Add a new account on the main HD - note that you'll be able to add the account, but (1) the account is the same as the imported one (expectable) and (2) the newly added account is wrongly labeled as "imported" - Lock the wallet - Unlock it with the right password - you will see the reported error: ``` Error: KeyringController - The account you are trying to import is a duplicate await in withLock submitPassword @ metamask-controller.js:4343 await in submitPassword (anonymous) @ createMetaRPCHandler.js:23 ``` - Without removing the extension from the browser, switch to this PR branch and build again - Visit [chrome://extensions/](chrome://extensions/) and reload the extension - Try to login again, you should be able to access the wallet again <!-- 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 Extension Coding Standards](https://github.com/MetaMask/metamask-extension/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-extension/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.
runway-github Bot
pushed a commit
that referenced
this pull request
Apr 25, 2025
…ntroller` from `^21.0.3` to `^21.0.4` (#32287) <!-- 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** <!-- 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? --> Bumping `@metamask/keyring-controller` to `^21.0.4` ```markdown ## [21.0.4] ### Fixed - Ensure no duplicate accounts are persisted ([#5710](MetaMask/core#5710)) ``` [](https://codespaces.new/MetaMask/metamask-extension/pull/32287?quickstart=1) ## **Related issues** Fixes: #32097 ## **Manual testing steps** ### In order to test the fix, you first need a wallet bricked because of a duplicate account: - Checkout on the v12.16.0 release branch and build locally (a version with multi-srp support) - Import or create an SRP (I used `child guilt hollow arrive average popular nasty soon summer like scheme diary pill country rapid`) - Import an account that is part of the mnemonic (e.g. I used `0x80842b7e3cfb1118e86a427cdec418e3b4179ef5bbbfd71c02a76349831c8a8b` which is the account at index 2 of the above SRP) - Add a new account on the main HD - note that you'll be able to add the account, but (1) the account is the same as the imported one (expectable) and (2) the newly added account is wrongly labeled as "imported" - Lock the wallet - Unlock it with the right password - you will see the reported error: ``` Error: KeyringController - The account you are trying to import is a duplicate await in withLock submitPassword @ metamask-controller.js:4343 await in submitPassword (anonymous) @ createMetaRPCHandler.js:23 ``` ### Testing the fix - Without removing the extension from the browser, switch to this PR branch and build again - Visit [chrome://extensions/](chrome://extensions/) and reload the extension - Try to login again, you should be able to access the wallet again ## **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** - [ ] 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). - [ ] 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-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.
DDDDDanica
added a commit
that referenced
this pull request
Apr 25, 2025
… `^21.0.4`(#32287) cp-12.17.0 (#32291) <!-- 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** Cherry-pick #32287 <!-- 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? --> Bumping `@metamask/keyring-controller` to `^21.0.4` ```markdown ## [21.0.4] ### Fixed - Ensure no duplicate accounts are persisted ([#5710](MetaMask/core#5710)) ``` [](https://codespaces.new/MetaMask/metamask-extension/pull/32287?quickstart=1) ## **Related issues** Fixes: #32097 ## **Manual testing steps** ### In order to test the fix, you first need a wallet bricked because of a duplicate account: - Checkout on the v12.16.0 release branch and build locally (a version with multi-srp support) - Import or create an SRP (I used `child guilt hollow arrive average popular nasty soon summer like scheme diary pill country rapid`) - Import an account that is part of the mnemonic (e.g. I used `0x80842b7e3cfb1118e86a427cdec418e3b4179ef5bbbfd71c02a76349831c8a8b` which is the account at index 2 of the above SRP) - Add a new account on the main HD - note that you'll be able to add the account, but (1) the account is the same as the imported one (expectable) and (2) the newly added account is wrongly labeled as "imported" - Lock the wallet - Unlock it with the right password - you will see the reported error: ``` Error: KeyringController - The account you are trying to import is a duplicate await in withLock submitPassword @ metamask-controller.js:4343 await in submitPassword (anonymous) @ createMetaRPCHandler.js:23 ``` ### Testing the fix - Without removing the extension from the browser, switch to this PR branch and build again - Visit [chrome://extensions/](chrome://extensions/) and reload the extension - Try to login again, you should be able to access the wallet again ## **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** - [ ] 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). - [ ] 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-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. --> ## **Description** <!-- 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/32291?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** - [ ] 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). - [ ] 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-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. --------- Co-authored-by: Michele Esposito <34438276+mikesposito@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
…to 4
Fixes #5639