fix: dont crash on missing apiAddrs

Agoric · Jan 19, 2024 · b2448db · b2448db
1 parent e0b82f7
commit b2448db
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/wallet/src/components/ConnectionSettingsDialog.tsx b/wallet/src/components/ConnectionSettingsDialog.tsx
@@ -65,8 +65,8 @@ const useNodeSuggestions = (networkConfigHref: string) => {
       const networkConfig = await res.json();
 
       if (didConfigChange) return;
-      setApiSuggestions(networkConfig.apiAddrs);
-      setRpcSuggestions(networkConfig.rpcAddrs);
+      setApiSuggestions(networkConfig.apiAddrs ?? []);
+      setRpcSuggestions(networkConfig.rpcAddrs ?? []);
     };
 
     updateSuggestions().catch(() =>
@@ -165,15 +165,10 @@ const ConnectionSettingsDialog = ({
               case 'main':
               case 'testnet':
               case 'devnet':
+              case 'local':
                 setConfig({
                   ...config,
-                  href: `https://${value}.agoric.net/network-config`,
-                });
-                break;
-              case 'localhost':
-                setConfig({
-                  ...config,
-                  href: `${window.location.origin}/wallet/network-config`,
+                  href: networkConfigUrl.fromSource(value),
                 });
                 break;
               case 'custom':
@@ -185,7 +180,7 @@ const ConnectionSettingsDialog = ({
           <MenuItem value="main">Mainnet</MenuItem>
           <MenuItem value="testnet">Testnet</MenuItem>
           <MenuItem value="devnet">Devnet</MenuItem>
-          <MenuItem value="localhost">Localhost</MenuItem>
+          <MenuItem value="local">Local Chain</MenuItem>
           <MenuItem value="custom">
             <i>Custom URL</i>
           </MenuItem>

diff --git a/wallet/src/components/tests/ConnectionSettingsDialog.test.tsx b/wallet/src/components/tests/ConnectionSettingsDialog.test.tsx
@@ -59,9 +59,7 @@ describe('Connection setting dialog', () => {
     );
 
     const networkSelect = component.find(Select).first();
-    act(() =>
-      networkSelect.props().onChange({ target: { value: 'localhost' } }),
-    );
+    act(() => networkSelect.props().onChange({ target: { value: 'local' } }));
     component.update();
 
     const textField = component.find(TextField).first();

diff --git a/wallet/src/util/SuggestChain.ts b/wallet/src/util/SuggestChain.ts
@@ -20,7 +20,7 @@ export const makeChainInfo = (
   if (config?.rpc) {
     rpc = config.rpc;
   } else {
-    const rpcAddr = rpcAddrs[rpcIndex];
+    const rpcAddr = rpcAddrs[rpcIndex] ?? '';
     rpc = rpcAddr.match(/:\/\//) ? rpcAddr : `http://${rpcAddr}`;
   }
 

diff --git a/wallet/src/util/connections.ts b/wallet/src/util/connections.ts
@@ -1,9 +1,8 @@
 export const KnownNetworkConfigUrls = {
   main: 'https://main.agoric.net/network-config',
   devnet: 'https://devnet.agoric.net/network-config',
-  testnet: 'https://testnet.agoric.net/network-config',
-  // for localhost skip https and assume it's subpathed to /wallet
-  localhost: 'http://localhost:3000/wallet/network-config',
+  testnet: 'https://emerynet.agoric.net/network-config',
+  local: `${window.location.origin}/wallet/network-config`,
 };
 
 export const DEFAULT_CONNECTION_CONFIGS = Object.values(