timeout if load fails

src/logic/mutinyWalletSetup.ts

@@ -233,7 +233,7 @@ export async function setupMutinyWallet(
     password?: string,
     safeMode?: boolean,
     shouldZapHodl?: boolean
-): Promise<MutinyWallet> {
+): Promise<MutinyWallet | undefined> {
     console.log("Starting setup...");
 
     // https://developer.mozilla.org/en-US/docs/Web/API/Storage_API
@@ -350,5 +350,9 @@ export async function setupMutinyWallet(
 
     sessionStorage.setItem("MUTINY_WALLET_INITIALIZED", Date.now().toString());
 
-    return mutinyWallet;
+    if (mutinyWallet) {
+        return mutinyWallet;
+    } else {
+        return undefined;
+    }
 }

src/state/megaStore.tsx

@@ -204,13 +204,43 @@ export const Provider: ParentComponent = (props) => {
                     await setSettings(settings);
                 }
 
+                // 60 seconds to load or we bail
+                const start = Date.now();
+                const MAX_LOAD_TIME = 60000;
+                const interval = setInterval(() => {
+                    console.log("Running setup", Date.now() - start);
+                    if (Date.now() - start > MAX_LOAD_TIME) {
+                        clearInterval(interval);
+                        // Have to set state error here because throwing doesn't work if WASM panics
+                        setState({
+                            setup_error: new Error(
+                                "Load timed out, please try again"
+                            )
+                        });
+                        return;
+                    }
+                }, 1000);
+
                 const mutinyWallet = await setupMutinyWallet(
                     settings,
                     password,
                     state.safe_mode,
                     state.should_zap_hodl
                 );
 
+                // Done with the timeout shenanigans
+                clearInterval(interval);
+
+                // I've never managed to trigger this but it's just some extra safety I guess
+                if (!mutinyWallet) {
+                    setState({
+                        setup_error: new Error(
+                            "Failed to initialize Mutiny Wallet"
+                        )
+                    });
+                    return;
+                }
+
                 // Give other components access to settings via the store
                 setState({ settings: settings });