revamp payment totals

3 files changed, 10 insertions, 7 deletions

diff --git a/src/routes/(app)/send/ecash/+page.server.js b/src/routes/(app)/send/ecash/+page.server.js
index 422e5a30..ed002ace 100644
--- a/src/routes/(app)/send/ecash/+page.server.js
+++ b/src/routes/(app)/send/ecash/+page.server.js
@@ -1,15 +1,17 @@
-import { fail, redirect } from "@sveltejs/kit";
+import { error, redirect } from "@sveltejs/kit";
 import { auth, post, fd } from "$lib/utils";
+import { v4 } from "uuid";
 
 export const actions = {
   default: async ({ cookies, request }) => {
     let id;
-    try {
       let body = await fd(request);
+
+    try {
       ({ id } = await post("/mint", body, auth(cookies)));
     } catch (e) {
       console.log("problem creating ecash", e);
-      return fail(400, { message: e.message });
+      error(400, { message: e.message });
     }
 
     redirect(307, `/ecash/${id}`);
diff --git a/src/routes/(app)/send/ecash/+page.svelte b/src/routes/(app)/send/ecash/+page.svelte
index 869e9732..983e9a44 100644
--- a/src/routes/(app)/send/ecash/+page.svelte
+++ b/src/routes/(app)/send/ecash/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { enhance } from "$app/forms";
+  import { enhance, applyAction } from "$app/forms";
   import { t } from "$lib/translations";
   import Icon from "$comp/Icon.svelte";
   import Numpad from "$comp/Numpad.svelte";
@@ -7,6 +7,7 @@
   import { page } from "$app/stores";
   import { rate } from "$lib/store";
   import { fail, s } from "$lib/utils";
+  import handler from "$lib/handler";
 
   export let data;
 
@@ -37,7 +38,7 @@
     {$t("payments.createEcash")}
   </h1>
 
-  <form use:enhance method="POST" on:submit={() => (submitting = true)}>
+  <form use:enhance={handler(submitting)} method="POST">
     <Numpad bind:amount bind:fiat {currency} {submit} bind:rate={$rate} />
     <input type="hidden" name="amount" bind:value={amount} />
 
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index de08ac54..bc62b5f5 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -1,4 +1,5 @@
 <script>
+  import handler from "$lib/handler";
   import { onDestroy, onMount } from "svelte";
   import { t } from "$lib/translations";
   import { goto, invalidateAll } from "$app/navigation";
@@ -48,7 +49,6 @@
   };
 
   let submitting;
-  let submit = () => (submitting = true);
 
   let external = async () => {
     let { id } = await post(`/${recipient.username}/invoice`, {
@@ -168,7 +168,7 @@
     />
   {/if}
 
-  <form method="POST" use:enhance on:submit={submit}>
+  <form method="POST" use:enhance={handler(submitting)}>
     <input name="address" value={address} type="hidden" />
     <input name="amount" value={amount} type="hidden" />
     <input name="payreq" value={payreq} type="hidden" />