From dce12a5ccff91bd2b985c9664ca29a4c1a083cf2 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 21 Mar 2023 09:58:45 -0700 Subject: pin code refactor --- src/components/Balance.svelte | 35 ++++++++++++++++-------- src/components/Pin.svelte | 62 +++++++++++++++++++++++++++++++------------ src/components/Pinpad.svelte | 3 +-- 3 files changed, 70 insertions(+), 30 deletions(-) (limited to 'src/components') diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte index cc923b7d..fddaae3e 100644 --- a/src/components/Balance.svelte +++ b/src/components/Balance.svelte @@ -1,21 +1,34 @@ +{#if show && user.haspin && $pin?.length !== 6} + +{/if} +
-
- {#if isNaN($animatedRate)} -
—
- {:else} - {f((user.balance * $animatedRate) / sats, user.currency)} - {/if} -
+ {#if user.haspin && !$pin} + + {:else} +
+ {#if isNaN($animatedRate)} +
—
+ {:else} + {f((user.balance * $animatedRate) / sats, user.currency)} + {/if} +
-
- ⚡️{s(user.balance)} -
+
+ ⚡️{s(user.balance)} +
+ {/if}
diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte index 1d7ed65b..40a53b8b 100644 --- a/src/components/Pin.svelte +++ b/src/components/Pin.svelte @@ -1,31 +1,59 @@ -
-
-

{title}

- -
- +{#if loaded} +
+
+

{title}

+ +
+ +
-
+{/if} diff --git a/src/components/Pinpad.svelte b/src/components/Pinpad.svelte index bf3778f7..f55dc40d 100644 --- a/src/components/Pinpad.svelte +++ b/src/components/Pinpad.svelte @@ -1,7 +1,6 @@