Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Token] official token should override imported one #1610

Merged
merged 3 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/libs/tokens/tokenHelperFn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ export const buildTokenList = (tokenList: TokenList[]): Token[] => {

const lsImportedTokens = lsService.getItem('importedTokens') ?? [];
const result = new Map<string, Token>();
for (const token of tokens) result.set(token.address, token);
for (const token of lsImportedTokens) result.set(token.address, token);
for (const token of tokens) result.set(token.address, token);
return Array.from(result.values());
};

Expand Down
2 changes: 1 addition & 1 deletion src/store/useTokensStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export const useTokensStore = (): TokensStore => {
const tokens = useMemo(() => {
if (!tokensQuery.data?.length) return [];
const result = new Map<string, Token>();
for (const token of tokensQuery.data) result.set(token.address, token);
for (const token of importedTokens) result.set(token.address, token);
for (const token of tokensQuery.data) result.set(token.address, token);
return Array.from(result.values());
}, [tokensQuery.data, importedTokens]);

Expand Down