Merge branch 'refs/heads/feat/argent-one-button-connector' into beta

argentlabs · Nov 8, 2024 · d93a9f5 · d93a9f5
2 parents 1f59f8d + 093f637
commit d93a9f5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/main.ts b/src/main.ts
@@ -212,7 +212,11 @@ export const connect = async ({
               modal.$destroy()
             }
           } catch (error) {
-            modal.$set({ layout: Layout.failure })
+            if (
+              [Layout.connecting, Layout.qrCode].includes(modal.getLayout())
+            ) {
+              modal.$set({ layout: Layout.failure })
+            }
             reject(error)
           }
         },

diff --git a/src/modal/Modal.d.ts b/src/modal/Modal.d.ts
@@ -22,4 +22,5 @@ interface ModalProps {
 interface ModalInstance extends SvelteComponent {
   $set(props: Partial<ModalProps>): void
   $destroy(): void
+  getLayout: () => Layout
 }
diff --git a/src/modal/Modal.svelte b/src/modal/Modal.svelte
@@ -27,6 +27,9 @@
   function setLayout(newLayout: Layout): void {
     layout = newLayout
   }
+  export function getLayout() {
+    return layout
+  }
 
   export let modalWallets: ModalWallet[] = []
   export let selectedWallet: ModalWallet | null = null