fix: update tokens controllers to use selectedAccountId instead of selectedAddress #4219
Conversation
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
Contributor
Author
|
@metamaskbot publish-preview |
montelaidev
force-pushed
the
fix/ap381/update-tokens-controllers-to-use-internal-accounts
branch
from
78ef3b5 to
6c0595d
Compare
Contributor
Author
|
@metamaskbot publish-preview |
1 similar comment
Contributor
Author
|
@metamaskbot publish-preview |
Contributor
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
Contributor
Author
montelaidev
force-pushed
the
fix/ap381/update-tokens-controllers-to-use-internal-accounts
branch
from
cb17e99 to
1e319a0
Compare
mcmire
reviewed
Jun 5, 2024
| */ | ||
| constructor({ | ||
| selectedAddress, | ||
| selectedAccountId, |
Contributor
There was a problem hiding this comment.
Similar comment as here — what are your thoughts on using the messenger to get the current value of this later on in the constructor rather than having the controller take this as an argument?
| onPreferencesStateChange, | ||
| selectedAccountId, | ||
| getInternalAccount, | ||
| onSelectedAccountChange, |
Contributor
There was a problem hiding this comment.
Similar comment as above, but in addition, instead of continuing with the callback pattern is it possible to listen to the AccountsController:selectedAccountChange event instead?
| constructor({ | ||
| chainId: initialChainId, | ||
| selectedAddress, | ||
| selectedAccountId, |
3 tasks
gantunesr
reviewed
Jun 6, 2024
packages/assets-controllers/src/TokenBalancesController.test.ts
Outdated
Show resolved
Hide resolved
…ns-controllers-to-use-internal-accounts
…ns-controllers-to-use-internal-accounts
ccharly
reviewed
Jun 14, 2024
Comment on lines
277
to
280
| const selectedAccount = this.messagingSystem.call( | ||
| 'AccountsController:getAccount', | ||
| this.#selectedAccountId, | ||
| ); |
Contributor
There was a problem hiding this comment.
Suggested change
| const selectedAccount = this.messagingSystem.call( | |
| 'AccountsController:getAccount', | |
| this.#selectedAccountId, | |
| ); | |
| const selectedAddress = this.#getSelectedAddress(); |
And use selectedAddress afterward
Contributor
There was a problem hiding this comment.
WDYT about this suggestion ⬆️?
Closed
ccharly
reviewed
Jun 18, 2024
ccharly
reviewed
Jun 18, 2024
Comment on lines
277
to
280
| const selectedAccount = this.messagingSystem.call( | ||
| 'AccountsController:getAccount', | ||
| this.#selectedAccountId, | ||
| ); |
Contributor
There was a problem hiding this comment.
WDYT about this suggestion ⬆️?
…ns-controllers-to-use-internal-accounts
Contributor
Author
|
@metamaskbot publish-preview |
Contributor
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
ccharly
reviewed
Jun 20, 2024
ccharly
reviewed
Jun 20, 2024
ccharly
reviewed
Jun 20, 2024
ccharly
approved these changes
Jun 20, 2024
Contributor
ccharly
left a comment
ccharly
left a comment
There was a problem hiding this comment.
Good job :) this was a big one! :)
montelaidev
deleted the
fix/ap381/update-tokens-controllers-to-use-internal-accounts
branch
Contributor
Author
|
@metamaskbot publish-preview |
mcmire
pushed a commit
that referenced
this pull request
Jun 20, 2024
…lectedAddress (#4219) ## Explanation This PR updates the `selectedAccount` to `selectedAccountId` in the token controllers ## References Fixes MetaMask/accounts-planning#381 ## Changelog ### `@metamask/assets-controllers` - **BREAKING**: `TokenBalancesController` update `PreferencesConrtollerGetStateAction` to `AccountsControllerGetSelectedAccountAction` - **BREAKING**: `TokenDetectionController` change `selectedAddress` to `selectedAccountId` - **ADDED**: `TokenDetectionController` add `getAccountAction` - **BREAKING**: `TokenRatesController` change `selectedAddress` to `selectedAccountId` - **BREAKING**: `onPreferencesStateChange` arg removed and `getInternalAccount` and `onSelectedAccountChange` added in `TokenRatesController` - **ADDED**: `getAccountAction` added in`TokensController` - **BREAKING**: Changed `selectedAddress` to `selectedAccountId` and `PreferencesControllerStateChangeEvent` to `AccountsControllerSelectedEvmAccountChangeEvent` in the `TokensController` - **ADDED**: `getAccountAction` added in`TokensController` ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've highlighted breaking changes using the "BREAKING" category above as appropriate
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Explanation
This PR updates the
selectedAccounttoselectedAccountIdin the token controllersReferences
Fixes https://github.com/MetaMask/accounts-planning/issues/381
Changelog
@metamask/assets-controllersTokenBalancesControllermessenger must allow the actionAccountsController:getSelectedAccountand removePreferencesController:getState.TokenDetectionControllermessenger must allow the actionAccountsController:getAccount.TokenDetectionControllermessenger must allow the eventAccountsController:selectedEvmAccountChangeand removeAccountsController:selectedAccountChange.TokenDetectionControllerremovesselectedAddressconstructor argument.TokenRatesControllermessenger must allow the actionAccountsController:getAccount,AccountsController:getSelectedAccountand removePreferencesController:getState.TokenRatesControllermessenger must allow the eventAccountsController:selectedEvmAccountChangeand removePreferencesController:stateChange.TokensControllermessenger must allow the actionAccountsController:getAccount,AccountsController:getSelectedAccount.TokensControllermessenger must allow the eventAccountsController:selectedEvmAccountChange.TokensControllerremovesselectedAddressconstructor argument.Checklist