From 63a097d82680dc09014718b371045d698ff2697f Mon Sep 17 00:00:00 2001
From: Paul Miller <paul@paul.lol>
Date: Mon, 26 Jun 2023 15:33:57 -0500
Subject: [PATCH] fix setup error precendence

---
 src/components/SetupErrorDisplay.tsx | 21 ++++++++++++---------
 src/routes/index.tsx                 |  2 +-
 src/state/megaStore.tsx              |  4 ++++
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/components/SetupErrorDisplay.tsx b/src/components/SetupErrorDisplay.tsx
index bd5e722..e2eb1e8 100644
--- a/src/components/SetupErrorDisplay.tsx
+++ b/src/components/SetupErrorDisplay.tsx
@@ -28,17 +28,20 @@ function ErrorFooter() {
     );
 }
 
-export default function SetupErrorDisplay(props: { error: Error }) {
+export default function SetupErrorDisplay(props: { initialError: Error }) {
+    // Error shouldn't be reactive, so we assign to it so it just gets rendered with the first value
+    const error = props.initialError;
+
     return (
         <SafeArea>
             <Switch>
-                <Match when={props.error.message.startsWith("Existing tab")}>
+                <Match when={error.message.startsWith("Existing tab")}>
                     <Title>Multiple tabs detected</Title>
                     <DefaultMain>
                         <LargeHeader>Multiple tabs detected</LargeHeader>
                         <p class="bg-white/10 rounded-xl p-4 font-mono">
-                            <span class="font-bold">{props.error.name}</span>:{" "}
-                            {props.error.message}
+                            <span class="font-bold">{error.name}</span>:{" "}
+                            {error.message}
                         </p>
                         <NiceP>
                             Mutiny currently only supports use in one tab at a
@@ -50,13 +53,13 @@ export default function SetupErrorDisplay(props: { error: Error }) {
                         <ErrorFooter />
                     </DefaultMain>
                 </Match>
-                <Match when={props.error.message.startsWith("Browser error")}>
+                <Match when={error.message.startsWith("Browser error")}>
                     <Title>Incompatible browser</Title>
                     <DefaultMain>
                         <LargeHeader>Incompatible browser detected</LargeHeader>
                         <p class="bg-white/10 rounded-xl p-4 font-mono">
-                            <span class="font-bold">{props.error.name}</span>:{" "}
-                            {props.error.message}
+                            <span class="font-bold">{error.name}</span>:{" "}
+                            {error.message}
                         </p>
                         <NiceP>
                             Mutiny requires a modern browser that supports
@@ -86,8 +89,8 @@ export default function SetupErrorDisplay(props: { error: Error }) {
                     <DefaultMain>
                         <LargeHeader>Failed to load Mutiny</LargeHeader>
                         <p class="bg-white/10 rounded-xl p-4 font-mono">
-                            <span class="font-bold">{props.error.name}</span>:{" "}
-                            {props.error.message}
+                            <span class="font-bold">{error.name}</span>:{" "}
+                            {error.message}
                         </p>
                         <NiceP>
                             Something went wrong while booting up Mutiny Wallet.
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index b34dd05..5e03898 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -12,7 +12,7 @@ export default function Home() {
     return (
         <Switch fallback={<FullscreenLoader />}>
             <Match when={state.setup_error}>
-                <SetupErrorDisplay error={state.setup_error!} />
+                <SetupErrorDisplay initialError={state.setup_error!} />
             </Match>
             <Match when={state.user_status === "approved"}>
                 <App />
diff --git a/src/state/megaStore.tsx b/src/state/megaStore.tsx
index a20ccae..a0264a8 100644
--- a/src/state/megaStore.tsx
+++ b/src/state/megaStore.tsx
@@ -134,6 +134,10 @@ export const Provider: ParentComponent = (props) => {
             settings?: MutinyWalletSettingStrings
         ): Promise<void> {
             try {
+                // If we're already in an error state there should be no reason to continue
+                if (state.setup_error) {
+                    throw state.setup_error;
+                }
                 setState({ wallet_loading: true });
                 const mutinyWallet = await setupMutinyWallet(settings);
                 // Get balance optimistically