add back swaps and do some cleanup

MutinyWallet · May 2, 2024 · 60c9da8 · 60c9da8
1 parent 95cad9a
commit 60c9da8
Show file tree

Hide file tree

Showing 9 changed files with 870 additions and 91 deletions.
diff --git a/public/i18n/en.json b/public/i18n/en.json
@@ -400,7 +400,8 @@
         "import_state": "Import State From File",
         "confirm_replace": "Do you want to replace your state with",
         "password": "Enter your password to decrypt",
-        "decrypt_wallet": "Decrypt Wallet"
+        "decrypt_wallet": "Decrypt Wallet",
+        "decrypt_export": "Enter your password to save"
       },
       "logs": {
         "title": "Download debug logs",

diff --git a/src/components/BalanceBox.tsx b/src/components/BalanceBox.tsx
@@ -1,6 +1,6 @@
 import { A, useNavigate } from "@solidjs/router";
 import { Shuffle, Users } from "lucide-solid";
-import { Match, Show, Suspense, Switch } from "solid-js";
+import { createMemo, Match, Show, Suspense, Switch } from "solid-js";
 
 import {
     AmountFiat,
@@ -51,13 +51,18 @@ export function BalanceBox(props: { loading?: boolean; small?: boolean }) {
     const navigate = useNavigate();
     const i18n = useI18n();
 
-    const totalOnchain = () =>
-        (state.balance?.confirmed || 0n) +
-        (state.balance?.unconfirmed || 0n) +
-        (state.balance?.force_close || 0n);
+    const totalOnchain = createMemo(
+        () =>
+            (state.balance?.confirmed || 0n) +
+            (state.balance?.unconfirmed || 0n) +
+            (state.balance?.force_close || 0n)
+    );
 
-    const usableOnchain = () =>
-        (state.balance?.confirmed || 0n) + (state.balance?.unconfirmed || 0n);
+    const usableOnchain = createMemo(
+        () =>
+            (state.balance?.confirmed || 0n) +
+            (state.balance?.unconfirmed || 0n)
+    );
 
     return (
         <VStack>

diff --git a/src/components/ImportExport.tsx b/src/components/ImportExport.tsx
@@ -188,9 +188,10 @@ export function ImportExport(props: { emergency?: boolean }) {
             {/* TODO: this is pretty redundant with the DecryptDialog, could make a shared component */}
             <SimpleDialog
                 title={i18n.t(
-                    "settings.emergency_kit.import_export.confirm_replace"
+                    "settings.emergency_kit.import_export.decrypt_export"
                 )}
                 open={exportDecrypt()}
+                setOpen={() => setExportDecrypt(false)}
             >
                 <form onSubmit={savePassword}>
                     <div class="flex flex-col gap-4">

diff --git a/src/router.tsx b/src/router.tsx
@@ -31,7 +31,9 @@ import {
     RequestRoute,
     Scanner,
     Search,
-    Send
+    Send,
+    Swap,
+    SwapLightning
 } from "~/routes";
 import {
     Admin,
@@ -175,6 +177,8 @@ export function Router() {
             <Route path="/request/:id" component={RequestRoute} />
             <Route path="/scanner" component={Scanner} />
             <Route path="/send" component={Send} />
+            <Route path="/swap" component={Swap} />
+            <Route path="/swaplightning" component={SwapLightning} />
             <Route path="/search" component={Search} />
             <Route path="/settings">
                 <Route path="/" component={Settings} />