numpad fixes

5 files changed, 29 insertions, 13 deletions

diff --git a/src/routes/(app)/[username]/receive/+page.svelte b/src/routes/(app)/[username]/receive/+page.svelte
index 9b7ffc00..cd692abf 100644
--- a/src/routes/(app)/[username]/receive/+page.svelte
+++ b/src/routes/(app)/[username]/receive/+page.svelte
@@ -99,7 +99,7 @@
     await update();
   };
 
-  let newAmount = $state();
+  let newAmount = $state(0);
   let settingAmount = $state();
   let fiat = $state(true);
   let toggleAmount = () => (settingAmount = !settingAmount);
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.svelte b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
index 78f9b16c..69a74a3f 100644
--- a/src/routes/(app)/fund/[id]/withdraw/+page.svelte
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
@@ -6,15 +6,17 @@
   import Numpad from "$comp/Numpad.svelte";
   import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
-  import { s } from "$lib/utils";
+  import { loc, s } from "$lib/utils";
   import { fiat, pin } from "$lib/store";
 
   let { data, form } = $props();
 
-  let { currency } = $derived(data.user);
+  let { user } = $derived(data);
+  let { currency } = $derived(user);
   let loading = $state();
   let { id, balance, rate } = $derived(data);
   let { amount } = $state(data);
+  let locale = loc(user);
 
   let submit = $state();
   let submitting = $state();
@@ -39,7 +41,7 @@
 {/if}
 
 <div class="container px-4 mt-20 max-w-xl mx-auto">
-  <Numpad bind:amount {currency} {fiat} {rate} {submit} />
+  <Numpad bind:amount {currency} {fiat} {rate} {submit} {locale} />
 
   <form use:enhance={handler(toggle)} method="POST" class="space-y-5">
     <input name="id" value={id} type="hidden" />
diff --git a/src/routes/(app)/send/bitcoin/[address]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/+page.svelte
index 671de954..529e2691 100644
--- a/src/routes/(app)/send/bitcoin/[address]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/+page.svelte
@@ -5,13 +5,14 @@
   import Numpad from "$comp/Numpad.svelte";
   import { page } from "$app/stores";
   import { rate } from "$lib/store";
-  import { fail, s } from "$lib/utils";
+  import { loc, fail, s } from "$lib/utils";
 
   let { data } = $props();
 
   let { balance, user } = data;
   let { address } = $page.params;
   let { currency, username } = user;
+  let locale = loc(user);
 
   let amount = $state(0);
   let a = $state(0);
@@ -34,7 +35,7 @@
 
   <div class="text-xl text-secondary break-all">{address}</div>
 
-  <Numpad bind:amount={a} bind:fiat {currency} {submit} bind:rate={$rate} />
+  <Numpad bind:amount={a} bind:fiat {currency} {submit} bind:rate={$rate} {locale} />
 
   <div class="flex justify-center gap-2">
     <button
diff --git a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
index b86082f3..200c93d5 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
@@ -1,6 +1,4 @@
 <script>
-  import { run } from "svelte/legacy";
-
   import { tick } from "svelte";
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
@@ -71,8 +69,18 @@
 
   let toggle = () => (submitting = !submitting);
 
-  let { account, amount, address, message, fee, fees, subtract, ourfee, hex, inputs } =
-    $derived(data);
+  let {
+    account,
+    amount,
+    address,
+    message,
+    fee,
+    fees,
+    subtract,
+    ourfee,
+    hex,
+    inputs,
+  } = $derived(data);
 
   let { feeRate } = $state(data);
 
@@ -116,7 +124,11 @@
   {:else}
     <div class="text-xl text-secondary break-all">{address}</div>
 
-    <Amount amount={subtract ? amount - fee - ourfee : amount} rate={$rate} {currency} />
+    <Amount
+      amount={subtract ? amount - fee - ourfee : amount}
+      rate={$rate}
+      {currency}
+    />
 
     <div class="text-center">
       <h2 class="text-secondary text-lg">{$t("payments.networkFee")}</h2>
diff --git a/src/routes/(app)/send/fund/[...name]/[...amount]/+page.svelte b/src/routes/(app)/send/fund/[...name]/[...amount]/+page.svelte
index 652e0885..d34ed073 100644
--- a/src/routes/(app)/send/fund/[...name]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/fund/[...name]/[...amount]/+page.svelte
@@ -6,7 +6,7 @@
   import { page } from "$app/stores";
   import { pin } from "$lib/store";
   import handler from "$lib/handler";
-  import { s } from "$lib/utils";
+  import { loc, s } from "$lib/utils";
   import { applyAction, deserialize } from "$app/forms";
 
   let { data, form } = $props();
@@ -15,6 +15,7 @@
   let { name, rate } = $derived(data);
   let loading = $state();
   let fiat = $state();
+  let locale = loc(user);
 
   let submit = $state();
   let submitting = $state();
@@ -49,7 +50,7 @@
 {/if}
 
 <div class="container px-4 mt-20 max-w-xl mx-auto">
-  <Numpad bind:amount {currency} {rate} {fiat} {submit} />
+  <Numpad bind:amount {currency} {rate} {fiat} {submit} {locale} />
 
   <form
     use:enhance={handler(toggle)}