no more slow fee rate

2 files changed, 43 insertions, 44 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 77fd8a4d..1122e689 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
@@ -1,49 +1,49 @@
+import { auth, fd, get, post } from "$lib/utils";
 import { fail, redirect } from "@sveltejs/kit";
-import { auth, get, post, fd } from "$lib/utils";
 
 export async function load({ params: { address, amount, feeRate }, cookies }) {
-  let aid = cookies.get("aid");
+	const aid = cookies.get("aid");
 
-  try {
-    let { fee, fees, inputs, ourfee, hex } = await post(
-      "/bitcoin/fee",
-      { address, amount, feeRate, aid },
-      auth(cookies),
-    );
+	try {
+		const { fee, fees, inputs, ourfee, hex } = await post(
+			"/bitcoin/fee",
+			{ address, amount, feeRate, aid },
+			auth(cookies),
+		);
 
-    let account = await get(`/account/${aid}`, auth(cookies));
+		const account = await get(`/account/${aid}`, auth(cookies));
 
-    return {
-      account,
-      amount,
-      address,
-      fee,
-      fees,
-      feeRate,
-      ourfee,
-      hex,
-      inputs,
-    };
-  } catch (e: any) {
-    return { amount, address, feeRate, message: e.message };
-  }
+		return {
+			account,
+			amount,
+			address,
+			fee,
+			fees,
+			feeRate,
+			ourfee,
+			hex,
+			inputs,
+		};
+	} catch (e: any) {
+		return { amount, address, feeRate, message: e.message };
+	}
 }
 
 export const actions = {
-  default: async ({
-    cookies,
-    params: { address, amount, feeRate },
-    request,
-  }) => {
-    let p;
-    try {
-      let body = await fd(request);
-      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 });
-    }
+	default: async ({
+		cookies,
+		params: { address, amount, feeRate },
+		request,
+	}) => {
+		let p;
+		try {
+			const body = await fd(request);
+			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/${p.id}`);
-  },
+		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 ba87436f..903bd372 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
@@ -98,7 +98,7 @@
       data);
     if (!fees) return;
     delete fees.minimumFee;
-    feeRate = closest(Object.values(fees), feeRate);
+    feeRate = feeRate ? closest(Object.values(fees), feeRate) : fees.halfHourFee;
     if (!$rate) $rate = rates[currency];
   };
 
@@ -106,10 +106,9 @@
   let submitting, submit, showSettings;
 
   let feeNames = {
-    fastestFee: "Fastest",
-    halfHourFee: "Fast",
-    hourFee: "Medium",
-    economyFee: "Slow",
+    fastestFee: $t("payments.fastest"),
+    halfHourFee: $t("payments.fast"),
+    hourFee: $t("payments.medium"),
   };
 
   let toggleSettings = () => (showSettings = !showSettings);
@@ -152,7 +151,7 @@
           on:change={setFee}
           class="border text-lg bg-white p-4 rounded-2xl text-center my-auto"
         >
-          {#each Object.keys(fees) as feeName}
+          {#each Object.keys(feeNames) as feeName}
             <option value={fees[feeName]}
               >{feeNames[feeName]} &mdash; ⚡️{fees[feeName]}/vb</option
             >