diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json index 6252c91e73a2..e8ca8579a7a4 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json @@ -238,10 +238,6 @@ "redesignedTransactionsEnabled": "boolean", "tokenSortConfig": "object", "tokenNetworkFilter": { - "0x1": "boolean", - "0xaa36a7": "boolean", - "0xe705": "boolean", - "0xe708": "boolean", "0x539": "boolean" }, "shouldShowAggregatedBalancePopover": "boolean" diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json index 3bc7057435c8..cbc9ff5b74c4 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json @@ -39,10 +39,6 @@ "redesignedTransactionsEnabled": "boolean", "tokenSortConfig": "object", "tokenNetworkFilter": { - "0x1": "boolean", - "0xaa36a7": "boolean", - "0xe705": "boolean", - "0xe708": "boolean", "0x539": "boolean" }, "shouldShowAggregatedBalancePopover": "boolean" diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json index 5d6be06b692e..07b292d33b3b 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json @@ -120,8 +120,7 @@ "tokenSortConfig": "object", "tokenNetworkFilter": {}, "showMultiRpcModal": "boolean", - "shouldShowAggregatedBalancePopover": "boolean", - "tokenNetworkFilter": {} + "shouldShowAggregatedBalancePopover": "boolean" }, "selectedAddress": "string", "theme": "light", diff --git a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx index e5c43aad281d..a09b5128396a 100644 --- a/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx +++ b/ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx @@ -87,8 +87,13 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => { // We need to set the default filter for all users to be all included networks, rather than defaulting to empty object // This effect is to unblock and derisk in the short-term useEffect(() => { - if (Object.keys(tokenNetworkFilter || {}).length === 0) { + if ( + process.env.PORTFOLIO_VIEW && + Object.keys(tokenNetworkFilter || {}).length === 0 + ) { dispatch(setTokenNetworkFilter(allOpts)); + } else { + dispatch(setTokenNetworkFilter({ [currentNetwork.chainId]: true })); } }, []); diff --git a/ui/components/app/assets/token-list/token-list.tsx b/ui/components/app/assets/token-list/token-list.tsx index 3f094634743e..5e25c7ff5f41 100644 --- a/ui/components/app/assets/token-list/token-list.tsx +++ b/ui/components/app/assets/token-list/token-list.tsx @@ -112,12 +112,14 @@ export default function TokenList({ // Ensure newly added networks are included in the tokenNetworkFilter useEffect(() => { - const allNetworkFilters = Object.fromEntries( - Object.keys(allNetworks).map((chainId) => [chainId, true]), - ); - - if (Object.keys(tokenNetworkFilter).length > 1) { - dispatch(setTokenNetworkFilter(allNetworkFilters)); + if (process.env.PORTFOLIO_VIEW) { + const allNetworkFilters = Object.fromEntries( + Object.keys(allNetworks).map((chainId) => [chainId, true]), + ); + + if (Object.keys(tokenNetworkFilter).length > 1) { + dispatch(setTokenNetworkFilter(allNetworkFilters)); + } } }, [Object.keys(allNetworks).length]); diff --git a/ui/components/multichain/network-list-menu/network-list-menu.tsx b/ui/components/multichain/network-list-menu/network-list-menu.tsx index 4dcecbf696e7..9c99b3048a95 100644 --- a/ui/components/multichain/network-list-menu/network-list-menu.tsx +++ b/ui/components/multichain/network-list-menu/network-list-menu.tsx @@ -292,7 +292,7 @@ export const NetworkListMenu = ({ onClose }: { onClose: () => void }) => { // however, if I am already filtered on "Current Network", we'll want to filter by the selected network when the network changes if (Object.keys(tokenNetworkFilter).length <= 1) { dispatch(setTokenNetworkFilter({ [network.chainId]: true })); - } else { + } else if (process.env.PORTFOLIO_VIEW) { dispatch(setTokenNetworkFilter(allOpts)); }