fix signer when anon mode is off

This commit is contained in:
Tom (plebeius.eth)
2024-08-07 16:25:53 +02:00
parent 82ae926180
commit 6fe0157efc
2 changed files with 16 additions and 9 deletions
+9 -5
View File
@@ -28,7 +28,7 @@ import useAnonMode from '../../hooks/use-anon-mode';
type SubmitState = { type SubmitState = {
author: any | undefined; author: any | undefined;
signer: any | undefined; signer?: any | undefined;
subplebbitAddress: string | undefined; subplebbitAddress: string | undefined;
title: string | undefined; title: string | undefined;
content: string | undefined; content: string | undefined;
@@ -61,9 +61,8 @@ const useSubmitStore = create<SubmitState>((set) => ({
if (link !== undefined) nextState.link = link || undefined; if (link !== undefined) nextState.link = link || undefined;
if (spoiler !== undefined) nextState.spoiler = spoiler || undefined; if (spoiler !== undefined) nextState.spoiler = spoiler || undefined;
nextState.publishCommentOptions = { const publishCommentOptions: PublishCommentOptions = {
author: nextState.author, author: nextState.author,
signer: nextState.signer,
subplebbitAddress: nextState.subplebbitAddress, subplebbitAddress: nextState.subplebbitAddress,
title: nextState.title, title: nextState.title,
content: nextState.content, content: nextState.content,
@@ -73,10 +72,15 @@ const useSubmitStore = create<SubmitState>((set) => ({
onChallengeVerification: alertChallengeVerificationFailed, onChallengeVerification: alertChallengeVerificationFailed,
onError: (error: Error) => { onError: (error: Error) => {
console.error(error); console.error(error);
let errorMessage = error.message; alert(error.message);
alert(errorMessage);
}, },
}; };
if (nextState.signer) {
publishCommentOptions.signer = nextState.signer;
}
nextState.publishCommentOptions = publishCommentOptions;
return nextState; return nextState;
}), }),
resetSubmitStore: () => resetSubmitStore: () =>
+7 -4
View File
@@ -3,6 +3,7 @@ import { ChallengeVerification, Comment, PublishCommentOptions, usePublishCommen
import { create } from 'zustand'; import { create } from 'zustand';
import { alertChallengeVerificationFailed } from '../lib/utils/challenge-utils'; import { alertChallengeVerificationFailed } from '../lib/utils/challenge-utils';
import useChallengesStore from '../stores/use-challenges-store'; import useChallengesStore from '../stores/use-challenges-store';
import useAnonMode from './use-anon-mode';
type SetReplyStoreData = { type SetReplyStoreData = {
subplebbitAddress: string; subplebbitAddress: string;
@@ -10,7 +11,7 @@ type SetReplyStoreData = {
author: any | undefined; author: any | undefined;
content: string | undefined; content: string | undefined;
link: string | undefined; link: string | undefined;
signer: any | undefined; signer?: any | undefined;
spoiler: boolean | undefined; spoiler: boolean | undefined;
}; };
@@ -41,7 +42,7 @@ const useReplyStore = create<ReplyState>((set) => ({
subplebbitAddress, subplebbitAddress,
parentCid, parentCid,
author, author,
signer, ...(data.signer ? { signer: data.signer } : {}),
content, content,
link, link,
spoiler, spoiler,
@@ -86,6 +87,8 @@ const useReply = ({ cid, subplebbitAddress }: { cid: string; subplebbitAddress:
publishCommentOptions: state.publishCommentOptions[parentCid], publishCommentOptions: state.publishCommentOptions[parentCid],
})); }));
const { anonMode } = useAnonMode();
const setReplyStore = useReplyStore((state) => state.setReplyStore); const setReplyStore = useReplyStore((state) => state.setReplyStore);
const resetReplyStore = useReplyStore((state) => state.resetReplyStore); const resetReplyStore = useReplyStore((state) => state.resetReplyStore);
@@ -95,14 +98,14 @@ const useReply = ({ cid, subplebbitAddress }: { cid: string; subplebbitAddress:
subplebbitAddress, subplebbitAddress,
parentCid, parentCid,
author, author,
signer,
content, content,
link, link,
spoiler, spoiler,
...(anonMode ? { signer } : {}),
...options, ...options,
}); });
}, },
[subplebbitAddress, parentCid, author, signer, content, link, spoiler, setReplyStore], [subplebbitAddress, parentCid, author, signer, content, link, spoiler, setReplyStore, anonMode],
); );
const resetPublishReplyOptions = useCallback(() => resetReplyStore(parentCid), [parentCid, resetReplyStore]); const resetPublishReplyOptions = useCallback(() => resetReplyStore(parentCid), [parentCid, resetReplyStore]);