chore: clean up

apps/desktop2/src/components/accounts.tsx

@@ -1,11 +1,14 @@
-import { useArk } from "@lume/ark";
 import { Account } from "@lume/types";
 import { User } from "@lume/ui";
-import { useNavigate, useParams } from "@tanstack/react-router";
+import {
+  useNavigate,
+  useParams,
+  useRouteContext,
+} from "@tanstack/react-router";
 import { useEffect, useState } from "react";
 
 export function Accounts() {
-  const ark = useArk();
+  const { ark } = useRouteContext({ strict: false });
   const params = useParams({ strict: false });
 
   const [accounts, setAccounts] = useState<Account[]>(null);
@@ -36,7 +39,7 @@ export function Accounts() {
 }
 
 function Inactive({ pubkey }: { pubkey: string }) {
-  const ark = useArk();
+  const { ark } = useRouteContext({ strict: false });
   const navigate = useNavigate();
 
   const changeAccount = async (npub: string) => {

apps/desktop2/src/components/avatarUploader.tsx

@@ -1,6 +1,6 @@
-import { useArk } from "@lume/ark";
 import { LoaderIcon } from "@lume/icons";
 import { cn } from "@lume/utils";
+import { useRouteContext } from "@tanstack/react-router";
 import { Dispatch, ReactNode, SetStateAction, useState } from "react";
 import { toast } from "sonner";
 
@@ -13,7 +13,7 @@ export function AvatarUploader({
   children: ReactNode;
   className?: string;
 }) {
-  const ark = useArk();
+  const { ark } = useRouteContext({ strict: false });
   const [loading, setLoading] = useState(false);
 
   const uploadAvatar = async () => {

apps/desktop2/src/components/backup.tsx

@@ -1,121 +0,0 @@
-import { ArrowRightIcon, CancelIcon } from "@lume/icons";
-import * as Dialog from "@radix-ui/react-dialog";
-import { Link, useParams } from "@tanstack/react-router";
-import { invoke } from "@tauri-apps/api/core";
-import { useState } from "react";
-import { toast } from "sonner";
-
-export function BackupDialog() {
-  // @ts-ignore, magic!!!
-  const { account } = useParams({ strict: false });
-
-  const [key, setKey] = useState(null);
-  const [passphase, setPassphase] = useState("");
-  const [loading, setLoading] = useState(false);
-
-  const encryptKey = async () => {
-    try {
-      setLoading(true);
-
-      const encrypted: string = await invoke("get_encrypted_key", {
-        npub: account,
-        password: passphase,
-      });
-
-      if (encrypted) {
-        setKey(encrypted);
-      }
-
-      setLoading(false);
-    } catch (e) {
-      setLoading(false);
-      toast.error(String(e));
-    }
-  };
-
-  return (
-    <Dialog.Root>
-      <Dialog.Trigger asChild>
-        <button
-          type="button"
-          className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-neutral-900 text-sm font-medium leading-tight text-neutral-100 hover:bg-neutral-800"
-        >
-          Claim & Backup
-        </button>
-      </Dialog.Trigger>
-      <Dialog.Portal>
-        <Dialog.Overlay className="fixed inset-0 z-50 bg-black/30 backdrop-blur dark:bg-white/30" />
-        <Dialog.Content className="fixed inset-0 z-50 flex min-h-full items-center justify-center">
-          <Dialog.Close className="absolute right-5 top-5 flex w-12 flex-col items-center justify-center gap-1 text-white">
-            <CancelIcon className="size-8" />
-            <span className="text-sm font-medium uppercase text-neutral-400 dark:text-neutral-600">
-              Esc
-            </span>
-          </Dialog.Close>
-          <div className="relative flex h-min w-full max-w-xl flex-col gap-8 rounded-xl bg-white p-5 dark:bg-black">
-            <div className="flex flex-col">
-              <h3 className="text-lg font-semibold">
-                This is your account key
-              </h3>
-              <p>
-                It's use for login to Lume or other Nostr clients. You will lost
-                access to your account if you lose this key.
-              </p>
-            </div>
-            <div className="flex flex-col gap-5">
-              <div className="flex flex-col gap-2">
-                <label htmlFor="nsec">Set a passphase to secure your key</label>
-                <div className="relative">
-                  <input
-                    name="passphase"
-                    type="password"
-                    value={passphase}
-                    onChange={(e) => setPassphase(e.target.value)}
-                    className="h-11 w-full resize-none rounded-lg border-transparent bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring focus:ring-blue-100 dark:bg-neutral-900 dark:focus:ring-blue-900"
-                  />
-                </div>
-              </div>
-              {key ? (
-                <div className="flex flex-col gap-2">
-                  <label htmlFor="nsec">
-                    Copy this key and keep it in safe place
-                  </label>
-                  <input
-                    name="nsec"
-                    type="text"
-                    value={key}
-                    readOnly
-                    className="h-11 w-full resize-none rounded-lg border-transparent bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring focus:ring-blue-100 dark:bg-neutral-900 dark:focus:ring-blue-900"
-                  />
-                </div>
-              ) : null}
-            </div>
-            <div className="flex flex-col gap-3">
-              {!key ? (
-                <button
-                  type="button"
-                  onClick={encryptKey}
-                  disabled={loading}
-                  className="inline-flex h-11 w-full items-center justify-between gap-1.5 rounded-lg bg-blue-500 px-5 font-medium text-white hover:bg-blue-600"
-                >
-                  <div className="size-5" />
-                  <div>Submit</div>
-                  <ArrowRightIcon className="size-5" />
-                </button>
-              ) : (
-                <Link
-                  to="/$account/home/local"
-                  params={{ account }}
-                  search={{ guest: false }}
-                  className="inline-flex h-11 w-full items-center justify-center gap-1.5 rounded-lg bg-blue-500 px-5 font-medium text-white hover:bg-blue-600"
-                >
-                  I've safely store my account key
-                </Link>
-              )}
-            </div>
-          </div>
-        </Dialog.Content>
-      </Dialog.Portal>
-    </Dialog.Root>
-  );
-}

apps/desktop2/src/components/balance.tsx

@@ -1,12 +1,11 @@
-import { useArk } from "@lume/ark";
 import { User } from "@lume/ui";
 import { getBitcoinDisplayValues } from "@lume/utils";
+import { useRouteContext } from "@tanstack/react-router";
 import { useEffect, useMemo, useState } from "react";
 
 export function Balance({ account }: { account: string }) {
+  const { ark } = useRouteContext({ strict: false });
   const [balance, setBalance] = useState(0);
-
-  const ark = useArk();
   const value = useMemo(() => getBitcoinDisplayValues(balance), [balance]);
 
   useEffect(() => {

apps/desktop2/src/components/login.tsx

@@ -1,125 +0,0 @@
-import { useArk } from "@lume/ark";
-import { ArrowRightIcon, CancelIcon } from "@lume/icons";
-import * as Dialog from "@radix-ui/react-dialog";
-import { useNavigate } from "@tanstack/react-router";
-import { useState } from "react";
-import { toast } from "sonner";
-
-export function LoginDialog() {
-  const ark = useArk();
-  const navigate = useNavigate();
-
-  const [nsec, setNsec] = useState("");
-  const [passphase, setPassphase] = useState("");
-
-  const login = async () => {
-    try {
-      if (!nsec.length) {
-        return toast.info("You must enter a valid nsec or ncrypto");
-      }
-
-      if (nsec.startsWith("ncrypto") && !passphase.length) {
-        return toast.warning("You must provide a passphase for ncrypto key");
-      }
-
-      const save = await ark.save_account(nsec, passphase);
-
-      if (save) {
-        navigate({ to: "/", search: { guest: false } });
-      }
-    } catch (e) {
-      toast.error(String(e));
-    }
-  };
-
-  return (
-    <Dialog.Root>
-      <Dialog.Trigger asChild>
-        <button
-          type="button"
-          className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-neutral-900 text-sm font-medium leading-tight text-neutral-100 hover:bg-neutral-800"
-        >
-          Add account
-        </button>
-      </Dialog.Trigger>
-      <Dialog.Portal>
-        <Dialog.Overlay className="fixed inset-0 z-50 bg-black/30 backdrop-blur dark:bg-white/30" />
-        <Dialog.Content className="fixed inset-0 z-50 flex min-h-full items-center justify-center">
-          <Dialog.Close className="absolute right-5 top-5 flex w-12 flex-col items-center justify-center gap-1 text-white">
-            <CancelIcon className="size-8" />
-            <span className="text-sm font-medium uppercase text-neutral-400 dark:text-neutral-600">
-              Esc
-            </span>
-          </Dialog.Close>
-          <div className="relative flex h-min w-full max-w-xl flex-col gap-8 rounded-xl bg-white p-5 dark:bg-black">
-            <div className="flex flex-col gap-1.5">
-              <h3 className="text-lg font-semibold">Add new account with</h3>
-              <div className="flex h-11 items-center overflow-hidden rounded-lg bg-neutral-100 p-1 dark:bg-neutral-900">
-                <button
-                  type="button"
-                  className="h-full flex-1 rounded-md bg-white text-sm font-medium dark:bg-black"
-                >
-                  nsec
-                </button>
-                <button
-                  type="button"
-                  className="flex h-full flex-1 flex-col items-center justify-center rounded-md text-sm font-medium"
-                >
-                  <span className="leading-tight">nsecBunker</span>
-                  <span className="text-xs font-normal leading-tight text-neutral-700 dark:text-neutral-300">
-                    coming soon
-                  </span>
-                </button>
-                <button
-                  type="button"
-                  className="flex h-full flex-1 flex-col items-center justify-center rounded-md text-sm font-medium"
-                >
-                  <span className="leading-tight">Address</span>
-                  <span className="text-xs font-normal leading-tight text-neutral-700 dark:text-neutral-300">
-                    coming soon
-                  </span>
-                </button>
-              </div>
-            </div>
-            <div className="flex flex-col gap-5">
-              <div className="flex flex-col gap-2">
-                <label htmlFor="nsec">
-                  Enter sign in key start with nsec or ncrypto
-                </label>
-                <input
-                  name="nsec"
-                  type="text"
-                  placeholder="nsec or ncrypto..."
-                  value={nsec}
-                  onChange={(e) => setNsec(e.target.value)}
-                  className="h-11 w-full resize-none rounded-lg border-transparent bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring focus:ring-blue-100 dark:bg-neutral-900 dark:focus:ring-blue-900"
-                />
-              </div>
-              <div className="flex flex-col gap-2">
-                <label htmlFor="nsec">Passphase (optional)</label>
-                <input
-                  name="passphase"
-                  type="password"
-                  value={passphase}
-                  onChange={(e) => setPassphase(e.target.value)}
-                  className="h-11 w-full resize-none rounded-lg border-transparent bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring focus:ring-blue-100 dark:bg-neutral-900 dark:focus:ring-blue-900"
-                />
-              </div>
-            </div>
-            <div className="flex flex-col gap-3">
-              <button
-                type="button"
-                onClick={login}
-                className="inline-flex h-11 w-full items-center justify-between gap-1.5 rounded-lg bg-blue-500 px-5 font-medium text-white hover:bg-blue-600"
-              >
-                <div className="size-5" />
-                <div>Add account</div>
-                <ArrowRightIcon className="size-5" />
-              </button>
-            </div>
-          </div>
-        </Dialog.Content>
-      </Dialog.Portal>
-    </Dialog.Root>
-  );
-}

apps/desktop2/src/components/repost.tsx

@@ -3,8 +3,8 @@ import { Event } from "@lume/types";
 import { cn } from "@lume/utils";
 import { useQuery } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
-import { useArk } from "@lume/ark";
 import { Note, User } from "@lume/ui";
+import { useRouteContext } from "@tanstack/react-router";
 
 export function RepostNote({
   event,
@@ -13,8 +13,7 @@ export function RepostNote({
   event: Event;
   className?: string;
 }) {
-  const ark = useArk();
-
+  const { ark } = useRouteContext({ strict: false });
   const { t } = useTranslation();
   const {
     isLoading,