diff --git a/apps/desktop2/src/routes/auth/$account.backup.tsx b/apps/desktop2/src/routes/auth/$account.backup.tsx index bbed1c9d9..f1768d8f5 100644 --- a/apps/desktop2/src/routes/auth/$account.backup.tsx +++ b/apps/desktop2/src/routes/auth/$account.backup.tsx @@ -32,10 +32,7 @@ function Screen() { return toast.warning("You need to confirm before continue"); } - return navigate({ - to: "/auth/$account/settings", - params: { account }, - }); + navigate({ to: "/", replace: true }); } // start loading @@ -65,7 +62,7 @@ function Screen() { }; return ( -
+

Backup your sign in keys

@@ -73,7 +70,7 @@ function Screen() { access to your account if you lose this key.

-
+
@@ -100,12 +97,12 @@ function Screen() { type="text" value={displayNsec(key, 36)} readOnly - className="w-full h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400" + className="w-full px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400" /> @@ -120,7 +117,7 @@ function Screen() { onCheckedChange={() => setConfirm((state) => ({ ...state, c1: !state.c1 })) } - className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-white/10 dark:hover:bg-white/20" + className="flex items-center justify-center rounded-md outline-none appearance-none size-6 bg-neutral-100 dark:bg-white/10 dark:hover:bg-white/20" id="confirm1" > @@ -140,7 +137,7 @@ function Screen() { onCheckedChange={() => setConfirm((state) => ({ ...state, c2: !state.c2 })) } - className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-white/10 dark:hover:bg-white/20" + className="flex items-center justify-center rounded-md outline-none appearance-none size-6 bg-neutral-100 dark:bg-white/10 dark:hover:bg-white/20" id="confirm2" > @@ -160,7 +157,7 @@ function Screen() { onCheckedChange={() => setConfirm((state) => ({ ...state, c3: !state.c3 })) } - className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-white/10 dark:hover:bg-white/20" + className="flex items-center justify-center rounded-md outline-none appearance-none size-6 bg-neutral-100 dark:bg-white/10 dark:hover:bg-white/20" id="confirm3" > @@ -183,7 +180,7 @@ function Screen() { type="button" onClick={() => submit()} disabled={loading} - className="inline-flex h-11 w-full shrink-0 items-center justify-center rounded-lg bg-blue-500 font-semibold text-white hover:bg-blue-600 disabled:opacity-50" + className="inline-flex items-center justify-center w-full font-semibold text-white bg-blue-500 rounded-lg h-11 shrink-0 hover:bg-blue-600 disabled:opacity-50" > {loading ? : t("global.continue")} diff --git a/apps/desktop2/src/routes/auth/privkey.lazy.tsx b/apps/desktop2/src/routes/auth/import.lazy.tsx similarity index 93% rename from apps/desktop2/src/routes/auth/privkey.lazy.tsx rename to apps/desktop2/src/routes/auth/import.lazy.tsx index edccf2169..860155ddf 100644 --- a/apps/desktop2/src/routes/auth/privkey.lazy.tsx +++ b/apps/desktop2/src/routes/auth/import.lazy.tsx @@ -4,7 +4,7 @@ import { createLazyFileRoute } from "@tanstack/react-router"; import { useState } from "react"; import { toast } from "sonner"; -export const Route = createLazyFileRoute("/auth/privkey")({ +export const Route = createLazyFileRoute("/auth/import")({ component: Screen, }); @@ -27,11 +27,7 @@ function Screen() { const npub = await NostrAccount.saveAccount(key, password); if (npub) { - navigate({ - to: "/$account/home", - params: { account: npub }, - replace: true, - }); + navigate({ to: "/", replace: true }); } } catch (e) { setLoading(false); diff --git a/apps/desktop2/src/routes/auth/remote.lazy.tsx b/apps/desktop2/src/routes/auth/remote.lazy.tsx index 0ae2c0d04..e65c9fbd6 100644 --- a/apps/desktop2/src/routes/auth/remote.lazy.tsx +++ b/apps/desktop2/src/routes/auth/remote.lazy.tsx @@ -26,11 +26,7 @@ function Screen() { const remoteAccount = await NostrAccount.connectRemoteAccount(uri); if (remoteAccount?.length) { - return navigate({ - to: "/$account/home", - params: { account: remoteAccount }, - replace: true, - }); + navigate({ to: "/", replace: true }); } } catch (e) { setLoading(false); diff --git a/apps/desktop2/src/routes/landing.lazy.tsx b/apps/desktop2/src/routes/landing.lazy.tsx index c2fef4226..f038adc6a 100644 --- a/apps/desktop2/src/routes/landing.lazy.tsx +++ b/apps/desktop2/src/routes/landing.lazy.tsx @@ -37,7 +37,7 @@ function Screen() {