Fix update previous ids for custom networks

src/modules/ethereum/chains/ChainConfigStore.ts

@@ -30,6 +30,16 @@ function updateChainOrigin(origin: string, prevOrigin: string | null) {
   return origin;
 }
 
+function updatePreviousIds(
+  id: string,
+  previousId: string,
+  previousIds: string[] | null
+) {
+  return previousId !== id && !previousIds?.includes(previousId)
+    ? [...(previousIds || []), previousId]
+    : previousIds;
+}
+
 class ChainConfigStore extends PersistentStore<ChainConfig> {
   static initialState: ChainConfig = {
     version: 2,
@@ -69,10 +79,7 @@ class ChainConfigStore extends PersistentStore<ChainConfig> {
     );
     const existingEntry = existingItems.get(prevId);
     const existingPreviousIds = existingEntry?.previousIds || null;
-    const previousIds =
-      prevId !== id && !existingPreviousIds?.includes(prevId)
-        ? [...(existingPreviousIds || []), prevId]
-        : existingPreviousIds;
+    const previousIds = updatePreviousIds(id, prevId, existingPreviousIds);
     const now = Date.now();
     const newEntry: EthereumChainConfig = {
       origin: updateChainOrigin(origin, existingEntry?.origin || null),
@@ -122,7 +129,15 @@ class ChainConfigStore extends PersistentStore<ChainConfig> {
               `Unable to fetch network info by chainId: ${config.value.chainId}`
             );
           }
-          updatedEthereumChainConfigs.push({ ...config, id: network.id });
+          updatedEthereumChainConfigs.push({
+            ...config,
+            id: network.id,
+            previousIds: updatePreviousIds(
+              network.id,
+              config.id,
+              config.previousIds
+            ),
+          });
         } catch {
           updatedEthereumChainConfigs.push(config);
         }

src/modules/networks/networks-store.ts

@@ -1,6 +1,7 @@
 import { Store } from 'store-unit';
 import type { ChainId } from '../ethereum/transactions/ChainId';
 import type { EthereumChainConfig } from '../ethereum/chains/types';
+import { isCustomNetworkId } from '../ethereum/chains/helpers';
 import { Networks } from './Networks';
 import { getNetworkByChainId, getNetworks } from './networks-api';
 import type { NetworkConfig } from './NetworkConfig';
@@ -77,7 +78,7 @@ export class NetworksStore extends Store<State> {
     const savedIds = savedChainConfigs?.map((config) => config.id);
     const chainsToFetch = Array.from(
       new Set([...(savedIds || []), ...(chains || [])])
-    );
+    ).filter((id) => !isCustomNetworkId(id));
 
     const [extraNetworkConfigs, commonNetworkConfigs] =
       await Promise.allSettled([getNetworks(chainsToFetch), getNetworks()]);