rebase fixes

src/components/ImportExport.tsx

@@ -6,13 +6,13 @@ import { showToast } from "./Toaster";
 import { downloadTextFile } from "~/utils/download";
 import { createFileUploader } from "@solid-primitives/upload"
 import { ConfirmDialog } from "./Dialog";
-import { NodeManager } from "@mutinywallet/mutiny-wasm";
+import { MutinyWallet } from "@mutinywallet/mutiny-wasm";
 
 export function ImportExport() {
     const [state, _] = useMegaStore()
 
     async function handleSave() {
-        const json = await state.node_manager?.export_json()
+        const json = await state.mutiny_wallet?.export_json()
         downloadTextFile(json || "", "mutiny-state.json")
     }
 
@@ -32,7 +32,7 @@ export function ImportExport() {
                     // This should throw if there's a parse error, so we won't end up clearing
                     JSON.parse(text);
 
-                    NodeManager.import_json(text);
+                    MutinyWallet.import_json(text);
 
                     window.location.href = "/"
 

src/components/KitchenSink.tsx

@@ -303,7 +303,7 @@ function LnUrlAuth() {
         e.preventDefault();
 
         const lnurl = value().trim();
-        await state.node_manager?.lnurl_auth(0, lnurl)
+        await state.mutiny_wallet?.lnurl_auth(0, lnurl)
 
         setValue("");
     };

src/components/NavBar.tsx

@@ -35,16 +35,16 @@ export default function NavBar(props: { activeTab: ActiveTab }) {
                         <img src={userClock} alt="activity" />
                     </A>
                 </li>
-                <li class={props.activeTab === "settings" ? activeStyle : inactiveStyle}>
-                    <A href="/settings">
-                        <img src={settings} alt="settings" />
-                    </A>
-                </li>
                 <li class={props.activeTab === "redshift" ? activeStyle : inactiveStyle}>
                     <A href="/redshift">
                         <img src={redshift} alt="redshift" width={36} />
                     </A>
                 </li>
+                <li class={props.activeTab === "settings" ? activeStyle : inactiveStyle}>
+                    <A href="/settings">
+                        <img src={settings} alt="settings" />
+                    </A>
+                </li>
             </ul>
         </nav >
     )

src/routes/Activity.tsx

@@ -1,6 +1,6 @@
 import { For, Show, createResource } from "solid-js";
 import NavBar from "~/components/NavBar";
-import { Button, Card, DefaultMain, LargeHeader, NiceP, NodeManagerGuard, SafeArea, VStack } from "~/components/layout";
+import { Button, Card, DefaultMain, LargeHeader, NiceP, MutinyWalletGuard, SafeArea, VStack } from "~/components/layout";
 import { BackLink } from "~/components/layout/BackLink";
 import { CombinedActivity } from "~/components/Activity";
 import { A } from "solid-start";
@@ -43,7 +43,7 @@ const TAB = "flex-1 inline-block px-8 py-4 text-lg font-semibold rounded-lg ui-s
 
 export default function Activity() {
     return (
-        <NodeManagerGuard>
+        <MutinyWalletGuard>
             <SafeArea>
                 <DefaultMain>
                     <BackLink />
@@ -73,6 +73,6 @@ export default function Activity() {
                 </DefaultMain>
                 <NavBar activeTab="activity" />
             </SafeArea>
-        </NodeManagerGuard>
+        </MutinyWalletGuard>
     )
 }

src/routes/Backup.tsx

@@ -1,4 +1,4 @@
-import { Button, DefaultMain, LargeHeader, NiceP, NodeManagerGuard, SafeArea, VStack } from "~/components/layout";
+import { Button, DefaultMain, LargeHeader, NiceP, MutinyWalletGuard, SafeArea, VStack } from "~/components/layout";
 import NavBar from "~/components/NavBar";
 import { useNavigate } from 'solid-start';
 import { SeedWords } from '~/components/SeedWords';
@@ -18,7 +18,7 @@ export default function App() {
     }
 
     return (
-        <NodeManagerGuard>
+        <MutinyWalletGuard>
             <SafeArea>
                 <DefaultMain>
                     <BackLink />
@@ -30,7 +30,7 @@ export default function App() {
                             If you clear your browser history, or lose your device, these 12 words are the only way you can restore your wallet.
                         </NiceP>
                         <NiceP>Mutiny is self-custodial. It's all up to you...</NiceP>
-                        <SeedWords words={store.node_manager?.show_seed() || ""} setHasSeen={setHasSeenBackup} />
+                        <SeedWords words={store.mutiny_wallet?.show_seed() || ""} setHasSeen={setHasSeenBackup} />
                         <Show when={hasSeenBackup()}>
                             <NiceP>You are responsible for your funds!</NiceP>
                         </Show>
@@ -39,6 +39,6 @@ export default function App() {
                 </DefaultMain>
                 <NavBar activeTab="none" />
             </SafeArea>
-        </NodeManagerGuard>
+        </MutinyWalletGuard>
     );
 }