Skip to content

Commit

Permalink
fix: clean-up token autodetection (#4916)
Browse files Browse the repository at this point in the history
## Explanation
clean up PR for token autodetection controller

<!--
Thanks for your contribution! Take a moment to answer these questions so
that reviewers have the information they need to properly understand
your changes:

* What is the current state of things and why does it need to change?
* What is the solution your changes offer and how does it work?
* Are there any changes whose purpose might not obvious to those
unfamiliar with the domain?
* If your primary goal was to update one package but you found you had
to update another one along the way, why did you do so?
* If you had to upgrade a dependency, why did you do so?
-->

## References

<!--
Are there any issues that this pull request is tied to?
Are there other links that reviewers should consult to understand these
changes better?
Are there client or consumer pull requests to adopt any breaking
changes?

For example:

* Fixes #12345
* Related to #67890
-->

## Changelog

<!--
If you're making any consumer-facing changes, list those changes here as
if you were updating a changelog, using the template below as a guide.

(CATEGORY is one of BREAKING, ADDED, CHANGED, DEPRECATED, REMOVED, or
FIXED. For security-related issues, follow the Security Advisory
process.)

Please take care to name the exact pieces of the API you've added or
changed (e.g. types, interfaces, functions, or methods).

If there are any breaking changes, make sure to offer a solution for
consumers to follow once they upgrade to the changes.

Finally, if you're only making changes to development scripts or tests,
you may replace the template below with "None".
-->

### `@metamask/assets-controllers`

- **CHANGED**:  change some variables names

## Checklist

- [ ] I've updated the test suite for new or updated code as appropriate
- [ ] I've updated documentation (JSDoc, Markdown, etc.) for new or
updated code as appropriate
- [ ] I've highlighted breaking changes using the "BREAKING" category
above as appropriate
- [ ] I've prepared draft pull requests for clients and consumer
packages to resolve any breaking changes
  • Loading branch information
salimtb authored Nov 12, 2024
1 parent 25e3182 commit 028b8cc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ describe('TokenDetectionController', () => {
},
},

// Salim ....
async ({ controller, mockTokenListGetState, callActionSpy }) => {
mockMultiChainAccountsService();
mockTokenListGetState({
Expand Down Expand Up @@ -2350,7 +2349,6 @@ describe('TokenDetectionController', () => {
options: {
disabled: false,
getBalancesInSingleCall: mockGetBalancesInSingleCall,
// useAccountsAPI: true, // USING ACCOUNTS API
},
mocks: {
getSelectedAccount: selectedAccount,
Expand Down
16 changes: 7 additions & 9 deletions packages/assets-controllers/src/TokensController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -503,15 +503,13 @@ export class TokensController extends BaseController<
).configuration.chainId;
}

const newDetectedTokens =
interactingChainId &&
allDetectedTokens[interactingChainId]?.[this.#getSelectedAddress()]
? allDetectedTokens[interactingChainId]?.[
this.#getSelectedAddress()
].filter(
(token: Token) => !importedTokensMap[token.address.toLowerCase()],
)
: [];
const detectedTokensForGivenChain = interactingChainId
? allDetectedTokens?.[interactingChainId]?.[this.#getSelectedAddress()]
: [];

const newDetectedTokens = detectedTokensForGivenChain?.filter(
(t) => !importedTokensMap[t.address.toLowerCase()],
);

const { newAllTokens, newAllDetectedTokens, newAllIgnoredTokens } =
this.#getNewAllTokensState({
Expand Down

0 comments on commit 028b8cc

Please sign in to comment.