ark fixes

3 files changed, 38 insertions, 25 deletions

diff --git a/src/lib/ark.ts b/src/lib/ark.ts
index ff82393b..0a31a31c 100644
--- a/src/lib/ark.ts
+++ b/src/lib/ark.ts
@@ -110,6 +110,31 @@ export const sendArk = async (address: string, amount: number) => {
 	}
 };
 
+export const sendArkViaForward = async ({
+	serverArkAddress,
+	amount,
+	aid,
+	forward,
+	user,
+}: {
+	serverArkAddress: string;
+	amount: number;
+	aid: string;
+	forward: string;
+	user: any;
+}) => {
+	const txid = await sendArk(serverArkAddress, amount);
+
+	await post("/post/ark/vault-send", { hash: txid, amount, aid });
+
+	const inv = await post("/post/invoice", {
+		invoice: { type: "ark", amount, forward, aid },
+		user,
+	});
+
+	return post("/post/ark/receive", { amount, hash: txid, iid: inv.id });
+};
+
 export const settle = async () => {
 	const wallet = await getWallet();
 	if (!wallet) return;
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 ed225d00..70b0aa47 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
@@ -6,7 +6,7 @@
   import Spinner from "$comp/Spinner.svelte";
   import WalletPass from "$comp/WalletPass.svelte";
   import { page } from "$app/stores";
-  import { toFiat, f, focus, s, sat, closest, network, post } from "$lib/utils";
+  import { toFiat, f, focus, s, sat, closest, network } from "$lib/utils";
   import { pin } from "$lib/store";
   import { goto, invalidate } from "$app/navigation";
   import { rate } from "$lib/store";
@@ -21,7 +21,7 @@
     getRememberedWalletPassword,
     forgetWalletPassword,
   } from "$lib/passwordCache";
-  import { sendArk } from "$lib/ark";
+  import { sendArkViaForward } from "$lib/ark";
 
   import Amount from "$comp/Amount.svelte";
 
@@ -64,19 +64,13 @@
         loading = true;
         error = "";
         try {
-          const txid = await sendArk(data.serverArkAddress, parseInt(amount));
-
-          const inv = await post("/post/invoice", {
-            invoice: { type: "ark", amount: parseInt(amount), forward: address, aid: account.id },
-            user: data.user,
-          });
-
-          const p = await post("/post/ark/receive", {
+          const p = await sendArkViaForward({
+            serverArkAddress: data.serverArkAddress,
             amount: parseInt(amount),
-            hash: txid,
-            iid: inv.id,
+            aid: account.id,
+            forward: address,
+            user: data.user,
           });
-
           goto(`/sent/${p.id}`, { invalidateAll: true });
         } catch (e) {
           loading = false;
diff --git a/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte
index a98f6616..4e34c6d6 100644
--- a/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte
+++ b/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte
@@ -9,7 +9,7 @@
   import { page } from "$app/stores";
   import { loc, back, toFiat, f, s, post, focus } from "$lib/utils";
   import { fiat, rate, pin } from "$lib/store";
-  import { sendArk } from "$lib/ark";
+  import { sendArkViaForward } from "$lib/ark";
 
   let { data, form } = $props();
 
@@ -43,19 +43,13 @@
 
       (async () => {
         try {
-          const txid = await sendArk(data.serverArkAddress, parseInt(amount));
-
-          const inv = await post("/post/invoice", {
-            invoice: { type: "ark", amount: parseInt(amount), forward: payreq, aid: data.account.id },
-            user,
-          });
-
-          const p = await post("/post/ark/receive", {
+          const p = await sendArkViaForward({
+            serverArkAddress: data.serverArkAddress,
             amount: parseInt(amount),
-            hash: txid,
-            iid: inv.id,
+            aid: data.account.id,
+            forward: payreq,
+            user,
           });
-
           goto(`/sent/${p.id}`, { invalidateAll: true });
         } catch (e) {
           loading = false;