From 3cd44210434371eec4e56b95feae6240275321ca Mon Sep 17 00:00:00 2001 From: Aleksandar Cakalic Date: Fri, 8 Nov 2024 11:59:43 +0100 Subject: [PATCH 1/2] chore: implement `getLayout` function on modal --- src/modal/Modal.d.ts | 1 + src/modal/Modal.svelte | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/modal/Modal.d.ts b/src/modal/Modal.d.ts index 691379d..0252472 100644 --- 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): void $destroy(): void + getLayout: () => Layout } diff --git a/src/modal/Modal.svelte b/src/modal/Modal.svelte index a40dfcd..dbeb81f 100644 --- 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 From 093f63773be937b39c35f4dc0e1c85817f0a7d51 Mon Sep 17 00:00:00 2001 From: Aleksandar Cakalic Date: Fri, 8 Nov 2024 12:01:00 +0100 Subject: [PATCH 2/2] chore: show `failure` layout only on `connecting`/`qrCode` layouts --- src/main.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main.ts b/src/main.ts index 7b12edf..f151f39 100644 --- 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) } },