pin code refactor

5 files changed, 18 insertions, 32 deletions

diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index 997d8b4a..1b212abe 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -112,13 +112,10 @@
 
 		loading = false;
 	}
-
-	let loaded;
-	onMount(() => setTimeout(() => (loaded = true), 50));
 </script>
 
-{#if loaded && user.haspin && $pin?.length !== 6}
-	<Pin bind:value={$pin} />
+{#if user.haspin && $pin?.length !== 6}
+	<Pin />
 {/if}
 
 <form
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index eb3b405e..01047344 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -148,9 +148,9 @@
 		{$t('user.settings.securityPINDescription')}
 	</p>
 	{#if verifying}
-		<Pin bind:value={verify} {cancel} />
+		<Pin bind:value={verify} {cancel} notify={false} />
 	{:else if settingPin}
-		<Pin bind:value={pin} title={$t('user.settings.setPIN')} {cancel} />
+		<Pin bind:value={pin} title={$t('user.settings.setPIN')} {cancel} notify={false} />
 	{:else}
 		<button type="button" class="primary" on:click={togglePin}
 			><Icon icon="lock" style="mr-1" />
@@ -192,7 +192,7 @@
 	{/if}
 
 	{#if confirming2fa || disabling2fa}
-		<Pin bind:value={token} title="Enter 2FA Code" {cancel} />
+		<Pin bind:value={token} title="Enter 2FA Code" {cancel} persist={false} />
 	{/if}
 </div>
 
diff --git a/src/routes/(app)/login/+page.svelte b/src/routes/(app)/login/+page.svelte
index 75998cd0..eb3ae26b 100644
--- a/src/routes/(app)/login/+page.svelte
+++ b/src/routes/(app)/login/+page.svelte
@@ -1,5 +1,13 @@
 <script>
 	import { RegisterOrLogin } from '$comp';
+	import { onMount } from 'svelte';
+	import { pin } from '$lib/store';
+
+	onMount(() => {
+		$pin = undefined;
+		localStorage.clear();
+		sessionStorage.clear();
+	});
 
 	export let form;
 </script>
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 020efdbb..d3cc0b1b 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -113,9 +113,9 @@
 	{/if}
 
 	{#if user.username.toLowerCase() === 'laughingbean'}
-	<button
-		class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px] bg-black text-white"
-		on:click={print}>Print Receipt</button
-	>
+		<button
+			class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px] bg-black text-white"
+			on:click={print}>Print Receipt</button
+		>
 	{/if}
 </div>
diff --git a/src/routes/(app)/send/+layout.svelte b/src/routes/(app)/send/+layout.svelte
index e5c9c051..6192cd40 100644
--- a/src/routes/(app)/send/+layout.svelte
+++ b/src/routes/(app)/send/+layout.svelte
@@ -8,30 +8,11 @@
 
 	export let data;
 
-	let loaded;
 	let { user } = data;
-
-	onMount(() => setTimeout(() => (loaded = true), 500));
 	let cancel = () => goto(`/${user.username}`);
-
-	$: browser && loaded && checkPin($pin);
-	let checkPin = async (p) => {
-		if (p?.length !== 6 || p === JSON.parse(sessionStorage.getItem('pin'))) return;
-		let result;
-		try {
-			result = await post('/pin', { pin: p });
-		} catch (e) {}
-
-		if (result) {
-			success('Pin confirmed');
-		} else {
-			fail('Invalid pin');
-			$pin = '';
-		}
-	};
 </script>
 
-{#if loaded && user.haspin && (!$pin || $pin?.length !== 6)}
+{#if user.haspin && (!$pin || $pin?.length !== 6)}
 	<Pin bind:value={$pin} {cancel} />
 {/if}