Skip to content

Commit 5ce177e

Browse files
committed
fix: solve breaking changes from multichain ignored assets implementation
1 parent 2ab1ee7 commit 5ce177e

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

ui/selectors/assets.ts

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ import {
4242
import { findAssetByAddress } from '../pages/asset/util';
4343
import { isEvmChainId } from '../../shared/lib/asset-utils';
4444
import { getSelectedInternalAccount } from './accounts';
45-
import { getMultichainBalances } from './multichain';
45+
import {
46+
getMultichainAssetsControllerState,
47+
getMultichainBalances,
48+
} from './multichain';
4649
import { EMPTY_OBJECT } from './shared';
4750
import {
4851
getCurrencyRates,
@@ -649,6 +652,14 @@ const selectMultichainBalancesStateForBalances = createSelector(
649652
(balances) => ({ balances }),
650653
);
651654

655+
/**
656+
* Wraps multichain assets for core balance computations.
657+
*/
658+
const selectMultichainAssetsStateForBalances = createSelector(
659+
[getMultichainAssetsControllerState],
660+
(multichainAssetsState) => multichainAssetsState,
661+
);
662+
652663
/**
653664
* Normalizes tokens state and supplies explicit empty maps for optional pieces.
654665
*
@@ -697,6 +708,7 @@ export const selectBalanceForAllWallets = createSelector(
697708
selectTokenRatesStateForBalances,
698709
selectMultichainRatesStateForBalances,
699710
selectMultichainBalancesStateForBalances,
711+
selectMultichainAssetsStateForBalances,
700712
selectTokensStateForBalances,
701713
selectCurrencyRateStateForBalances,
702714
selectEnabledNetworkMapForBalances,
@@ -708,6 +720,7 @@ export const selectBalanceForAllWallets = createSelector(
708720
tokenRatesState,
709721
multichainRatesState,
710722
multichainBalancesState,
723+
multichainAssetsState,
711724
tokensState,
712725
currencyRateState,
713726
enabledNetworkMap,
@@ -720,6 +733,7 @@ export const selectBalanceForAllWallets = createSelector(
720733
tokenRatesState,
721734
multichainRatesState,
722735
multichainBalancesState,
736+
multichainAssetsState,
723737
tokensState,
724738
currencyRateState,
725739
enabledNetworkMap,
@@ -742,6 +756,7 @@ export const selectBalanceChangeForAllWallets = (period: BalanceChangePeriod) =>
742756
selectTokenRatesStateForBalances,
743757
selectMultichainRatesStateForBalances,
744758
selectMultichainBalancesStateForBalances,
759+
selectMultichainAssetsStateForBalances,
745760
selectTokensStateForBalances,
746761
selectCurrencyRateStateForBalances,
747762
selectEnabledNetworkMapForBalances,
@@ -753,6 +768,7 @@ export const selectBalanceChangeForAllWallets = (period: BalanceChangePeriod) =>
753768
tokenRatesState,
754769
multichainRatesState,
755770
multichainBalancesState,
771+
multichainAssetsState,
756772
tokensState,
757773
currencyRateState,
758774
enabledNetworkMap,
@@ -765,6 +781,7 @@ export const selectBalanceChangeForAllWallets = (period: BalanceChangePeriod) =>
765781
tokenRatesState,
766782
multichainRatesState,
767783
multichainBalancesState,
784+
multichainAssetsState,
768785
tokensState,
769786
currencyRateState,
770787
enabledNetworkMap,
@@ -799,6 +816,7 @@ export const selectBalanceChangeByAccountGroup = (
799816
selectTokenRatesStateForBalances,
800817
selectMultichainRatesStateForBalances,
801818
selectMultichainBalancesStateForBalances,
819+
selectMultichainAssetsStateForBalances,
802820
selectTokensStateForBalances,
803821
selectCurrencyRateStateForBalances,
804822
selectEnabledNetworkMapForBalances,
@@ -810,6 +828,7 @@ export const selectBalanceChangeByAccountGroup = (
810828
tokenRatesState,
811829
multichainRatesState,
812830
multichainBalancesState,
831+
multichainAssetsState,
813832
tokensState,
814833
currencyRateState,
815834
enabledNetworkMap,
@@ -822,6 +841,7 @@ export const selectBalanceChangeByAccountGroup = (
822841
tokenRatesState,
823842
multichainRatesState,
824843
multichainBalancesState,
844+
multichainAssetsState,
825845
tokensState,
826846
currencyRateState,
827847
enabledNetworkMap,
@@ -856,6 +876,7 @@ export const selectBalanceChangeBySelectedAccountGroup = (
856876
selectTokenRatesStateForBalances,
857877
selectMultichainRatesStateForBalances,
858878
selectMultichainBalancesStateForBalances,
879+
selectMultichainAssetsStateForBalances,
859880
selectTokensStateForBalances,
860881
selectCurrencyRateStateForBalances,
861882
selectEnabledNetworkMapForBalances,
@@ -867,6 +888,7 @@ export const selectBalanceChangeBySelectedAccountGroup = (
867888
tokenRatesState,
868889
multichainRatesState,
869890
multichainBalancesState,
891+
multichainAssetsState,
870892
tokensState,
871893
currencyRateState,
872894
enabledNetworkMap,
@@ -883,6 +905,7 @@ export const selectBalanceChangeBySelectedAccountGroup = (
883905
tokenRatesState,
884906
multichainRatesState,
885907
multichainBalancesState,
908+
multichainAssetsState,
886909
tokensState,
887910
currencyRateState,
888911
enabledNetworkMap,
@@ -982,6 +1005,7 @@ export const getAssetsBySelectedAccountGroup = createDeepEqualSelector(
9821005
let multichainState = {
9831006
accountsAssets: {},
9841007
assetsMetadata: {},
1008+
allIgnoredAssets: {},
9851009
balances: {},
9861010
conversionRates: {},
9871011
};
@@ -990,6 +1014,7 @@ export const getAssetsBySelectedAccountGroup = createDeepEqualSelector(
9901014
multichainState = {
9911015
accountsAssets: metamask.accountsAssets,
9921016
assetsMetadata: metamask.assetsMetadata,
1017+
allIgnoredAssets: metamask.allIgnoredAssets,
9931018
balances: metamask.balances,
9941019
conversionRates: metamask.conversionRates,
9951020
};

ui/selectors/multichain.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,16 @@ export function getMultichainBalances(
466466
return state.metamask.balances;
467467
}
468468

469+
export function getMultichainAssetsControllerState(
470+
state: MultichainState,
471+
): MultichainAssetsControllerState {
472+
return {
473+
accountsAssets: state.metamask.accountsAssets,
474+
assetsMetadata: state.metamask.assetsMetadata,
475+
allIgnoredAssets: state.metamask.allIgnoredAssets,
476+
};
477+
}
478+
469479
export function getMultichainTransactions(
470480
state: MultichainState,
471481
): TransactionsState['metamask']['nonEvmTransactions'] {

0 commit comments

Comments
 (0)