fix(ag-solo): be more tolerant of missing wallet

Agoric · Feb 27, 2020 · 94c2a3e · 94c2a3e
1 parent ceb0f36
commit 94c2a3e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/packages/cosmic-swingset/lib/ag-solo/html/index.html b/packages/cosmic-swingset/lib/ag-solo/html/index.html
@@ -45,6 +45,7 @@
     }
 
     .frame {
+      display: none;
       min-height: 20px;
       min-width: 600px;
       margin: 0px;
@@ -158,7 +159,7 @@
 
   <div class="container">
     <div class="ui">
-      <iframe class="left frame" title="Agoric Wallet" src="wallet/" frameBorder="0">Loading...</iframe>
+      <iframe class="left frame" id="walletFrame" title="Agoric Wallet" frameBorder="0">Loading...</iframe>
       <div class="right">
         <div class="help">Use <code>home</code> to see useful objects, and <code>history[N]</code> to refer to result
           history</div>

diff --git a/packages/cosmic-swingset/lib/ag-solo/html/main.js b/packages/cosmic-swingset/lib/ag-solo/html/main.js
@@ -1,4 +1,4 @@
-/* global WebSocket fetch document window */
+/* global WebSocket fetch document window walletFrame */
 const RECONNECT_BACKOFF_SECONDS = 3;
 // Functions to run to reset the HTML state to what it was.
 const resetFns = [];
@@ -207,7 +207,12 @@ run();
 // Display version information, if possible.
 const fetches = [];
 const fgr = fetch('/git-revision.txt')
-  .then(resp => resp.text())
+  .then(resp => {
+    if (resp.status < 200 || resp.status >= 300) {
+      throw Error(`status ${resp.status}`);
+    }
+    return resp.text();
+  })
   .then(text => {
     return text.trimRight();
   })
@@ -224,6 +229,19 @@ const fpj = fetch('/package.json')
     return {};
   });
 fetches.push(fpj);
+
+fetch('wallet/')
+  .then(resp => {
+    if (resp.status < 200 || resp.status >= 300) {
+      throw Error(`status ${resp.status}`);
+    }
+    walletFrame.style.display = 'block';
+    walletFrame.src = 'wallet/';
+  })
+  .catch(e => {
+    console.log('Cannot fetch wallet/', e);
+  });
+
 Promise.all(fetches)
   .then(([rev, pjson]) => {
     const gr = document.getElementById('package_git');