-
- - This is your new Nostr account -
-- Your private key is your password. If you lose this key, you will lose access to - your account! Copy it and keep it in a safe place. There is no way to reset your - private key. -
-- Public key is used for sharing with other people so that they can find you using - the public key. -
-
+
+
+ ('');
+ const [nsec, setNsec] = useState('');
+ const [pubkey, setPubkey] = useState(undefined);
+ const [created, setCreated] = useState(false);
+ const [savedPrivkey, setSavedPrivkey] = useState(false);
+
+ const submitNpub = async () => {
+ if (npub.length < 6) return toast('You must enter valid npub');
+ if (!npub.startsWith('npub1')) return toast('npub must be starts with npub1');
+
+ try {
+ const pubkey = nip19.decode(npub).data as string;
+ setPubkey(pubkey);
+ } catch (e) {
+ return toast(`npub invalid: ${e}`);
+ }
+ };
+
+ const changeAccount = async () => {
+ setNpub('');
+ setPubkey('');
+ };
+
+ const createAccount = async () => {
+ try {
+ await db.createAccount(npub, pubkey);
+ setCreated(true);
+ } catch (e) {
+ return toast(`Create account failed: ${e}`);
+ }
+ };
+
+ const submitNsec = async () => {
+ if (savedPrivkey) return;
+ if (nsec.length > 50 && nsec.startsWith('nsec1')) {
+ try {
+ const privkey = nip19.decode(nsec).data as string;
+ await db.secureSave(pubkey, privkey);
+ setSavedPrivkey(true);
+ } catch (e) {
+ return toast(`nsec invalid: ${e}`);
+ }
+ }
+ };
+
+ const finish = async () => {
+ navigate('/auth/onboarding');
+ };
+
+ return (
+ = async (values) => {
- return {
- values: values.privkey ? values : {},
- errors: !values.privkey
- ? {
- privkey: {
- type: 'required',
- message: 'This is required.',
- },
- }
- : {},
- };
-};
-
-export function ImportStep1Screen() {
- const navigate = useNavigate();
-
- const [loading, setLoading] = useState(false);
- const [passwordInput, setPasswordInput] = useState('password');
- const [setStep, setPubkey, setTempPrivkey] = useOnboarding((state) => [
- state.setStep,
- state.setPubkey,
- state.setTempPrivkey,
- ]);
-
- const { db } = useStorage();
- const {
- register,
- setError,
- handleSubmit,
- formState: { errors, isDirty, isValid },
- } = useForm({ resolver });
-
- const onSubmit = async (data: { [x: string]: string }) => {
- try {
- setLoading(true);
-
- let privkey = data['privkey'];
- if (privkey.substring(0, 4) === 'nsec') {
- privkey = nip19.decode(privkey).data as string;
- }
-
- if (typeof getPublicKey(privkey) === 'string') {
- const pubkey = getPublicKey(privkey);
- const npub = nip19.npubEncode(pubkey);
-
- setTempPrivkey(privkey);
- setPubkey(pubkey);
-
- // add account to local database
- await db.createAccount(npub, pubkey);
-
- // redirect to step 2 with delay 1.2s
- setTimeout(() => navigate('/auth/import/step-2', { replace: true }), 1200);
- }
- } catch (error) {
- setLoading(false);
- setError('privkey', {
- type: 'custom',
- message: 'Private key is invalid, please check again',
- });
- }
- };
-
- // toggle private key
- const showPassword = () => {
- if (passwordInput === 'password') {
- setPasswordInput('text');
- } else {
- setPasswordInput('password');
- }
- };
-
- useEffect(() => {
- // save current step, if user close app and reopen it
- setStep('/auth/import');
- }, []);
-
- return (
-
+
diff --git a/src/shared/user.tsx b/src/shared/user.tsx
index 3d71680c..17c32f63 100644
--- a/src/shared/user.tsx
+++ b/src/shared/user.tsx
@@ -162,18 +162,18 @@ export const User = memo(function User({
loading="lazy"
decoding="async"
style={{ contentVisibility: 'auto' }}
- className="h-10 w-10 rounded-lg"
+ className="h-11 w-11 rounded-lg"
/>
+
+ This is your new Nostr account +
++ Your private key is your password. If you lose this key, you will lose access + to your account! Copy it and keep it in a safe place.{' '} + + There is no way to reset your private key. + +
++ Public key is used for sharing with other people so that they can find you + using the public key. +
+
-
);
diff --git a/src/app/auth/import.tsx b/src/app/auth/import.tsx
new file mode 100644
index 00000000..25a7ecf6
--- /dev/null
+++ b/src/app/auth/import.tsx
@@ -0,0 +1,225 @@
+import { motion } from 'framer-motion';
+import { nip19 } from 'nostr-tools';
+import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { toast } from 'sonner';
+import { twMerge } from 'tailwind-merge';
+
+import { useStorage } from '@libs/storage/provider';
+
+import { User } from '@shared/user';
+
+export function ImportAccountScreen() {
+ const { db } = useStorage();
+ const navigate = useNavigate();
+
+ const [npub, setNpub] = useState
- Private Key
-
+
-
+
+
+
+
+
+
+
+
+
-
- Public Key
-
+
+
+
+ By clicking 'Continue', you are ensuring that your keys are saved
+ in a safe place. You cannot recover these keys if they are lost.
+
-
-
-
- By clicking 'Continue', you are ensuring that your keys are saved in
- a safe place. You cannot recover these keys if they are lost.
-
-
+
+ );
+}
diff --git a/src/app/auth/import/index.tsx b/src/app/auth/import/index.tsx
deleted file mode 100644
index bf8983ff..00000000
--- a/src/app/auth/import/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Outlet } from 'react-router-dom';
-
-export function AuthImportScreen() {
- return (
-
+
+ + Import your Nostr account +
+
+
+
+ ) : null}
+ {created ? (
+ <>
+
+
+
+ Finish
+
+
+ ) : null}
+
+
+
+ {pubkey ? (
+
+
+
+
+ setNpub(e.target.value)}
+ spellCheck={false}
+ autoComplete="off"
+ autoCorrect="off"
+ autoCapitalize="off"
+ placeholder="npub1"
+ className="h-11 flex-1 rounded-lg bg-neutral-200 px-3 placeholder:text-neutral-500 dark:bg-neutral-800 dark:placeholder:text-neutral-400"
+ />
+ {!pubkey ? (
+
+ ) : null}
+
+ Account found
+
+
+
+
+ {!created ? (
+
+
+
+
+ ) : null}
+
+
+
+
+ setNsec(e.target.value)}
+ spellCheck={false}
+ autoComplete="off"
+ autoCorrect="off"
+ autoCapitalize="off"
+ placeholder="nsec1"
+ className="h-11 flex-1 rounded-lg bg-neutral-200 px-3 placeholder:text-neutral-500 dark:bg-neutral-800 dark:placeholder:text-neutral-400"
+ />
+
+
+
+
+ + nsec is used to sign your event. For example, if you want to + make a new post or send a message to your contact, you need to use + nsec to sign this event. +
++ 1. In case you store nsec in Lume +
++ Lume will put your nsec to{' '} + {db.platform === 'macos' + ? 'Apple Keychain (macOS)' + : db.platform === 'windows' + ? 'Credential Manager (Windows)' + : 'Secret Service (Linux)'} + , it will be secured by your OS +
++ 2. In case you do not store nsec in Lume +
++ When you make an event that requires a sign by your nsec, Lume will + show a prompt popup for you to enter nsec. It will be cleared after + signing and not stored anywhere. +
+
-
- );
-}
diff --git a/src/app/auth/import/step-1.tsx b/src/app/auth/import/step-1.tsx
deleted file mode 100644
index 5d642878..00000000
--- a/src/app/auth/import/step-1.tsx
+++ /dev/null
@@ -1,156 +0,0 @@
-import { getPublicKey, nip19 } from 'nostr-tools';
-import { useEffect, useState } from 'react';
-import { Resolver, useForm } from 'react-hook-form';
-import { useNavigate } from 'react-router-dom';
-
-import { useStorage } from '@libs/storage/provider';
-
-import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
-import { ArrowRightCircleIcon } from '@shared/icons/arrowRightCircle';
-
-import { useOnboarding } from '@stores/onboarding';
-
-type FormValues = {
- privkey: string;
-};
-
-const resolver: Resolver
-
- );
-}
diff --git a/src/app/auth/import/step-2.tsx b/src/app/auth/import/step-2.tsx
deleted file mode 100644
index 38df3069..00000000
--- a/src/app/auth/import/step-2.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
-
-import { useStorage } from '@libs/storage/provider';
-
-import { ArrowRightCircleIcon, LoaderIcon } from '@shared/icons';
-import { User } from '@shared/user';
-
-import { useOnboarding } from '@stores/onboarding';
-import { WidgetKinds } from '@stores/widgets';
-
-import { useNostr } from '@utils/hooks/useNostr';
-
-export function ImportStep2Screen() {
- const navigate = useNavigate();
- const setStep = useOnboarding((state) => state.setStep);
-
- const { db } = useStorage();
- const { fetchUserData } = useNostr();
-
- const [loading, setLoading] = useState(false);
-
- const submit = async () => {
- try {
- // show loading indicator
- setLoading(true);
-
- // prefetch data
- const user = await fetchUserData();
-
- // create default widget
- await db.createWidget(WidgetKinds.other.learnNostr, 'Learn Nostr', '');
-
- // redirect to next step
- if (user.status === 'ok') {
- navigate('/auth/onboarding/step-2', { replace: true });
- } else {
- setLoading(false);
- }
- } catch (e) {
- console.log('error: ', e);
- setLoading(false);
- }
- };
-
- useEffect(() => {
- // save current step, if user close app and reopen it
- setStep('/auth/import/step-3');
- }, []);
-
- return (
-
-
- - Import your Nostr key -
-
-
-
-
-
- );
-}
diff --git a/src/libs/storage/instance.ts b/src/libs/storage/instance.ts
index b3ca6acf..37cbb0d3 100644
--- a/src/libs/storage/instance.ts
+++ b/src/libs/storage/instance.ts
@@ -19,13 +19,11 @@ export class LumeStorage {
}
public async secureSave(value: string, key?: string) {
- return await invoke('secure_save', { key: this.account.pubkey ?? key, value });
+ return await invoke('secure_save', { key, value });
}
public async secureLoad(key?: string) {
- const value: string = await invoke('secure_load', {
- key: this.account.pubkey ?? key,
- });
+ const value: string = await invoke('secure_load', { key });
return value;
}
diff --git a/src/main.jsx b/src/main.jsx
index c82bc34f..e5eb2f24 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -1,5 +1,6 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { createRoot } from 'react-dom/client';
+import { Toaster } from 'sonner';
import { NDKProvider } from '@libs/ndk/provider';
import { StorageProvider } from '@libs/storage/provider';
@@ -15,6 +16,7 @@ root.render(
-
- - {loading ? 'Downloading...' : 'Your Nostr profile'} -
-
-
-
-
-
-
-
- By clicking 'Continue', Lume will download your old relay list and
- metadata. It may take a bit
-
-
-
-
+
+
{user?.name || user?.display_name || user?.displayName}