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 >
     )