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

Author: Aleksandar Cakalic

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)
           }
         },

src/modal/Modal.d.ts

@@ -22,4 +22,5 @@ interface ModalProps {
 interface ModalInstance extends SvelteComponent {
   $set(props: Partial<ModalProps>): void
   $destroy(): void
+  getLayout: () => Layout
 }

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