account import

4 files changed, 10 insertions, 66 deletions

diff --git a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts
index 2b8fe37c..e46a9f56 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts
@@ -35,14 +35,15 @@ export const actions = {
     params: { address, amount, feeRate },
     request,
   }) => {
+    let p;
     try {
       let body = await fd(request);
-      await post("/bitcoin/send", body, auth(cookies));
+      p = await post("/bitcoin/send", body, auth(cookies));
     } catch (e: any) {
       console.log("problem sending bitcoin", e);
       return fail(400, { address, amount, feeRate, message: e.message });
     }
 
-    redirect(307, "/sent");
+    redirect(307, `/sent/${p.id}`);
   },
 };
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 f6c6980d..4da2e04c 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
@@ -30,7 +30,6 @@
   export let form;
 
   let { encode, decode } = hexUtil;
-  let revealPassword = false;
   let passwordPrompt;
   let password;
   let cancel = () => (passwordPrompt = false);
@@ -206,65 +205,7 @@
 </div>
 
 {#if passwordPrompt}
-  <div
-    class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-20"
-  >
-    <div
-      class="relative top-1/3 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white space-y-5"
-    >
-      <h1 class="text-center text-2xl font-semibold">
-        {$t("payments.enterWalletPass")}
-      </h1>
-      <form on:submit|preventDefault={signTx}>
-        <div class="relative mb-5">
-          {#if revealPassword}
-            <input
-              name="password"
-              type="text"
-              required
-              class="bg-primary"
-              bind:value={password}
-              autocapitalize="none"
-              use:focus
-            />
-          {:else}
-            <input
-              name="password"
-              type="password"
-              required
-              class="bg-primary"
-              bind:value={password}
-              autocapitalize="none"
-              use:focus
-            />
-          {/if}
-          <button
-            type="button"
-            on:click={() => (revealPassword = !revealPassword)}
-            class="absolute right-5 top-6"
-          >
-            <Icon icon={revealPassword ? "eye" : "eye-off"} />
-          </button>
-        </div>
-        <div class="w-full flex">
-          <button
-            type="button"
-            class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
-            on:click={cancel}
-            on:keydown={cancel}
-          >
-            <div class="my-auto">Cancel</div>
-          </button>
-          <button
-            type="submit"
-            class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
-          >
-            <div class="my-auto">Submit</div>
-          </button>
-        </div>
-      </form>
-    </div>
-  </div>
+  <WalletPass bind:password bind:cancel />
 {/if}
 
 <style>
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.ts b/src/routes/(app)/send/invoice/[id]/+page.server.ts
index c31bcd7b..6c89912d 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.ts
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.ts
@@ -22,16 +22,17 @@ export async function load({ params: { id }, parent }) {
 
 export const actions = {
   default: async ({ cookies, params: { id }, request }) => {
+    let p;
     try {
       let body = await fd(request);
       body.hash = id;
 
-      await post("/payments", body, auth(cookies));
+      p = await post("/payments", body, auth(cookies));
     } catch (e: any) {
       console.log("payment failed", id, e);
       error(500, e.message);
     }
 
-    redirect(307, "/sent");
+    redirect(307, `/sent/${p.id}`);
   },
 };
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
index ddec2968..3e87fa53 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
@@ -9,16 +9,17 @@ export const actions = {
   setAmount: async ({ request }) => fd(request),
 
   send: async ({ cookies, request }) => {
+    let p;
     try {
       let body = await fd(request);
 
-      await post("/payments", body, auth(cookies));
+      p = await post("/payments", body, auth(cookies));
     } catch (e: any) {
       if (e.message.includes("unusable"))
         e.message = "Failed to route payment, try sending a lower amount";
       return fail(400, { message: e.message });
     }
 
-    redirect(307, "/sent");
+    redirect(307, `/sent/${p.id}`);
   },
 };