fix: fixed previously saved network loading

Nithishvb · Nov 21, 2023 · c8724b4 · c8724b4
1 parent be8b040
commit c8724b4
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/src/app/store/networks/networks.utils.ts b/src/app/store/networks/networks.utils.ts
@@ -1,7 +1,11 @@
 import { Dictionary } from '@reduxjs/toolkit';
 import { ChainID } from '@stacks/transactions';
 
-import { NetworkConfiguration } from '@shared/constants';
+import {
+  BITCOIN_API_BASE_URL_MAINNET,
+  BITCOIN_API_BASE_URL_TESTNET,
+  NetworkConfiguration,
+} from '@shared/constants';
 
 import { PersistedNetworkConfiguration } from './networks.slice';
 
@@ -37,14 +41,36 @@ export function findMatchingNetworkKey({
   return null;
 }
 
+function checkBitcoinNetworkProperties(
+  network: PersistedNetworkConfiguration
+): PersistedNetworkConfiguration {
+  if (!network.bitcoinNetwork || !network.bitcoinUrl) {
+    return {
+      id: network.id,
+      name: network.name,
+      chainId: network.chainId,
+      subnetChainId: network.subnetChainId,
+      url: network.url,
+      bitcoinNetwork: network.chainId === ChainID.Mainnet ? 'mainnet' : 'testnet',
+      bitcoinUrl:
+        network.chainId === ChainID.Mainnet
+          ? BITCOIN_API_BASE_URL_MAINNET
+          : BITCOIN_API_BASE_URL_TESTNET,
+    };
+  } else {
+    return network;
+  }
+}
+
 export function transformNetworkStateToMultichainStucture(
   state: Dictionary<PersistedNetworkConfiguration>
 ) {
   return Object.fromEntries(
     Object.entries(state)
       .map(([key, network]) => {
         if (!network) return ['', null];
-        const { id, name, chainId, subnetChainId, url, bitcoinNetwork, bitcoinUrl } = network;
+        const { id, name, chainId, subnetChainId, url, bitcoinNetwork, bitcoinUrl } =
+          checkBitcoinNetworkProperties(network);
 
         return [
           key,
@@ -60,8 +86,8 @@ export function transformNetworkStateToMultichainStucture(
               },
               bitcoin: {
                 blockchain: 'bitcoin',
-                bitcoinNetwork,
-                bitcoinUrl,
+                bitcoinNetwork: bitcoinNetwork ? bitcoinNetwork : 'testnet',
+                bitcoinUrl: bitcoinUrl ? bitcoinUrl : 'https://blockstream.info/testnet/api',
               },
             },
           },

diff --git a/src/shared/constants.ts b/src/shared/constants.ts
@@ -85,8 +85,8 @@ export const HIRO_API_BASE_URL_MAINNET = 'https://api.hiro.so';
 export const HIRO_API_BASE_URL_TESTNET = 'https://api.testnet.hiro.so';
 export const HIRO_INSCRIPTIONS_API_URL = 'https://api.hiro.so/ordinals/v1/inscriptions';
 
-const BITCOIN_API_BASE_URL_MAINNET = 'https://blockstream.info/api';
-const BITCOIN_API_BASE_URL_TESTNET = 'https://blockstream.info/testnet/api';
+export const BITCOIN_API_BASE_URL_MAINNET = 'https://blockstream.info/api';
+export const BITCOIN_API_BASE_URL_TESTNET = 'https://blockstream.info/testnet/api';
 const BITCOIN_API_BASE_URL_SIGNET = 'https://mempool.space/signet/api';
 
 const networkMainnet: NetworkConfiguration = {