-
-
-
+
+
+
-
- Here's an interesting fact:
+
+ Prefetching data...
-
- Bitcoin and Nostr can be used by anyone, and no one can stop you!
+
+ This may take a few seconds, please don't close app.
-
-
-
diff --git a/src/app/space/hooks/useNewsfeed.tsx b/src/app/space/hooks/useNewsfeed.tsx
index e95918b7..40209e73 100644
--- a/src/app/space/hooks/useNewsfeed.tsx
+++ b/src/app/space/hooks/useNewsfeed.tsx
@@ -19,7 +19,7 @@ export function useNewsfeed() {
useEffect(() => {
if (status === 'success' && account) {
- const follows = account ? JSON.parse(account.follows) : [];
+ const follows = account ? JSON.parse(account.follows as string) : [];
const filter: NDKFilter = {
kinds: [1, 6],
@@ -30,7 +30,6 @@ export function useNewsfeed() {
sub.current = ndk.subscribe(filter, { closeOnEose: false });
sub.current.addListener('event', (event: NDKEvent) => {
- console.log('new note: ', event);
// add to db
createNote(
event.id,
@@ -46,7 +45,9 @@ export function useNewsfeed() {
}
return () => {
- sub.current.stop();
+ if (sub.current) {
+ sub.current.stop();
+ }
};
}, [status]);
}
diff --git a/src/shared/protected.tsx b/src/shared/protected.tsx
index 9f9f7576..dec04391 100644
--- a/src/shared/protected.tsx
+++ b/src/shared/protected.tsx
@@ -6,7 +6,7 @@ import { useStronghold } from '@stores/stronghold';
import { useAccount } from '@utils/hooks/useAccount';
export function Protected({ children }: { children: ReactNode }) {
- const password = useStronghold((state) => state.password);
+ const privkey = useStronghold((state) => state.privkey);
const { status, account } = useAccount();
if (status === 'success' && !account) {
@@ -17,7 +17,7 @@ export function Protected({ children }: { children: ReactNode }) {
return
;
}
- if (status === 'success' && account && !password) {
+ if (status === 'success' && account && !privkey) {
return
;
}
diff --git a/src/stores/onboarding.tsx b/src/stores/onboarding.tsx
index 562336ad..cd8644cf 100644
--- a/src/stores/onboarding.tsx
+++ b/src/stores/onboarding.tsx
@@ -3,11 +3,8 @@ import { create } from 'zustand';
interface OnboardingState {
profile: { [x: string]: string };
pubkey: string;
- privkey: string;
createProfile: (data: { [x: string]: string }) => void;
setPubkey: (pubkey: string) => void;
- setPrivkey: (privkey: string) => void;
- clearPrivkey: (privkey: string) => void;
}
export const useOnboarding = create
((set) => ({
@@ -20,10 +17,4 @@ export const useOnboarding = create((set) => ({
setPubkey: (pubkey: string) => {
set({ pubkey: pubkey });
},
- setPrivkey: (privkey: string) => {
- set({ privkey: privkey });
- },
- clearPrivkey: () => {
- set({ privkey: '' });
- },
}));
diff --git a/src/stores/stronghold.tsx b/src/stores/stronghold.tsx
index 90823596..db8ddd55 100644
--- a/src/stores/stronghold.tsx
+++ b/src/stores/stronghold.tsx
@@ -1,19 +1,22 @@
import { create } from 'zustand';
+import { createJSONStorage, persist } from 'zustand/middleware';
interface StrongholdState {
- password: null | string;
privkey: null | string;
- setPassword: (password: string) => void;
setPrivkey: (privkey: string) => void;
}
-export const useStronghold = create((set) => ({
- password: null,
- privkey: null,
- setPassword: (password: string) => {
- set({ password: password });
- },
- setPrivkey: (privkey: string) => {
- set({ privkey: privkey });
- },
-}));
+export const useStronghold = create()(
+ persist(
+ (set) => ({
+ privkey: null,
+ setPrivkey: (privkey: string) => {
+ set({ privkey: privkey });
+ },
+ }),
+ {
+ name: 'stronghold',
+ storage: createJSONStorage(() => sessionStorage),
+ }
+ )
+);
diff --git a/src/utils/hooks/usePublish.tsx b/src/utils/hooks/usePublish.tsx
index c37d20e2..ebbe1cee 100644
--- a/src/utils/hooks/usePublish.tsx
+++ b/src/utils/hooks/usePublish.tsx
@@ -5,14 +5,12 @@ import { useNDK } from '@libs/ndk/provider';
import { useStronghold } from '@stores/stronghold';
import { useAccount } from '@utils/hooks/useAccount';
-import { useSecureStorage } from '@utils/hooks/useSecureStorage';
export function usePublish() {
const { ndk } = useNDK();
const { account } = useAccount();
- const { load } = useSecureStorage();
- const cachePrivkey = useStronghold((state) => state.privkey);
+ const privkey = useStronghold((state) => state.privkey);
const publish = async ({
content,
@@ -23,12 +21,7 @@ export function usePublish() {
kind: NDKKind | number;
tags: string[][];
}): Promise => {
- let privkey: string;
- if (cachePrivkey) {
- privkey = cachePrivkey;
- } else {
- privkey = await load(account.pubkey);
- }
+ if (!privkey) throw new Error('Private key not found');
const event = new NDKEvent(ndk);
const signer = new NDKPrivateKeySigner(privkey);
diff --git a/src/utils/hooks/useSecureStorage.tsx b/src/utils/hooks/useSecureStorage.tsx
index a5b13548..3b2b3282 100644
--- a/src/utils/hooks/useSecureStorage.tsx
+++ b/src/utils/hooks/useSecureStorage.tsx
@@ -1,13 +1,9 @@
import { appConfigDir } from '@tauri-apps/api/path';
import { Stronghold } from 'tauri-plugin-stronghold-api';
-import { useStronghold } from '@stores/stronghold';
-
const dir = await appConfigDir();
export function useSecureStorage() {
- const password = useStronghold((state) => state.password);
-
async function getClient(stronghold: Stronghold) {
try {
return await stronghold.loadClient('lume');
@@ -16,22 +12,16 @@ export function useSecureStorage() {
}
}
- const save = async (key: string, value: string, userpass?: string) => {
- const stronghold = await Stronghold.load(
- `${dir}lume.stronghold`,
- userpass ? userpass : password
- );
+ const save = async (key: string, value: string, password: string) => {
+ const stronghold = await Stronghold.load(`${dir}lume.stronghold`, password);
const client = await getClient(stronghold);
const store = client.getStore();
await store.insert(key, Array.from(new TextEncoder().encode(value)));
return await stronghold.save();
};
- const load = async (key: string, userpass?: string) => {
- const stronghold = await Stronghold.load(
- `${dir}lume.stronghold`,
- userpass ? userpass : password
- );
+ const load = async (key: string, password: string) => {
+ const stronghold = await Stronghold.load(`${dir}lume.stronghold`, password);
const client = await getClient(stronghold);
const store = client.getStore();
const value = await store.get(key);