fix toasts

This commit is contained in:
plebbitor
2023-04-20 16:50:15 +02:00
parent aeed535c33
commit e6ff25fcd0
6 changed files with 26 additions and 24 deletions
+4 -6
View File
@@ -33,19 +33,17 @@ const ReplyModal = ({ isOpen, closeModal }) => {
const onChallengeVerificationRef = useRef(); const onChallengeVerificationRef = useRef();
const [errorMessage, setErrorMessage] = useState(null); const [errorMessage, setErrorMessage] = useState(null);
const [successMessage, setSuccessMessage] = useState(null); const [successMessage] = useState(null);
useError(errorMessage, [errorMessage]); useError(errorMessage, [errorMessage]);
useSuccess(successMessage, [successMessage]); useSuccess(successMessage, [successMessage]);
const onChallengeVerification = (challengeVerification) => { const onChallengeVerification = (challengeVerification) => {
if (challengeVerification.challengeSuccess === true) { if (challengeVerification.challengeSuccess === true) {
setSuccessMessage('challenge success', {publishedCid: challengeVerification.publication?.cid}); localStorage.setItem("toastMessage", "Challenge Success");
navigate(`/p/${selectedAddress}/c/${selectedThread}`);
} }
else if (challengeVerification.challengeSuccess === false) { else if (challengeVerification.challengeSuccess === false) {
setErrorMessage('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors}); setErrorMessage('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
setErrorMessage("Error: You seem to have mistyped the CAPTCHA. Please try again.");
} }
}; };
@@ -81,8 +79,8 @@ const ReplyModal = ({ isOpen, closeModal }) => {
useEffect(() => { useEffect(() => {
if (index !== undefined) { if (index !== undefined) {
navigate(`/profile/c/${index}`); navigate(`/p/${selectedAddress}/c/${selectedThread}`)
setSuccessMessage('Comment pending with index ' + index + '.'); localStorage.setItem("toastMessage", `Comment pending with index ${index}.`);
} }
}, [index]); }, [index]);
+3 -3
View File
@@ -145,9 +145,9 @@ const SettingsModal = ({ isOpen, closeModal }) => {
}, []); }, []);
useEffect(() => { useEffect(() => {
const successMessageFromStorage = localStorage.getItem("toastMessage"); const toastFromStorage = localStorage.getItem("toastMessage");
if (successMessageFromStorage) { if (toastFromStorage) {
setSuccessMessage(successMessageFromStorage); setSuccessMessage(toastFromStorage);
localStorage.removeItem("toastMessage"); localStorage.removeItem("toastMessage");
} }
}, []); }, []);
+4 -6
View File
@@ -54,7 +54,7 @@ const Board = () => {
const { subplebbitAddress } = useParams(); const { subplebbitAddress } = useParams();
const [errorMessage, setErrorMessage] = useState(null); const [errorMessage, setErrorMessage] = useState(null);
const [successMessage, setSuccessMessage] = useState(null); const [successMessage] = useState(null);
useError(errorMessage, [errorMessage]); useError(errorMessage, [errorMessage]);
useSuccess(successMessage, [successMessage]); useSuccess(successMessage, [successMessage]);
@@ -97,13 +97,11 @@ const Board = () => {
const onChallengeVerification = (challengeVerification) => { const onChallengeVerification = (challengeVerification) => {
if (challengeVerification.challengeSuccess === true) { if (challengeVerification.challengeSuccess === true) {
setSuccessMessage('Challenge success.', {publishedCid: challengeVerification.publication?.cid}); localStorage.setItem("toastMessage", "Challenge Success");
navigate(`/p/${selectedAddress}/c/${challengeVerification.publication?.cid}`); navigate(`/p/${selectedAddress}/c/${challengeVerification.publication?.cid}`);
} }
else if (challengeVerification.challengeSuccess === false) { else if (challengeVerification.challengeSuccess === false) {
setErrorMessage('Challenge failed.', {reason: challengeVerification.reason, errors: challengeVerification.errors}); setErrorMessage('Challenge Failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
console.log("challenge failed", challengeVerification.reason, challengeVerification.errors)
setErrorMessage("Error: You seem to have mistyped the CAPTCHA. Please try again.");
} }
}; };
@@ -139,7 +137,7 @@ const Board = () => {
useEffect(() => { useEffect(() => {
if (index !== undefined) { if (index !== undefined) {
navigate(`/profile/c/${index}`); navigate(`/profile/c/${index}`);
setSuccessMessage('Comment pending with index ' + index + '.'); localStorage.setItem("toastMessage", `Comment pending with index ${index}.`);
} }
}, [index]); }, [index]);
+4 -7
View File
@@ -45,7 +45,7 @@ const Catalog = () => {
const { subplebbitAddress } = useParams(); const { subplebbitAddress } = useParams();
const [errorMessage, setErrorMessage] = useState(null); const [errorMessage, setErrorMessage] = useState(null);
const [successMessage, setSuccessMessage] = useState(null); const [successMessage] = useState(null);
useError(errorMessage, [errorMessage]); useError(errorMessage, [errorMessage]);
useSuccess(successMessage, [successMessage]); useSuccess(successMessage, [successMessage]);
@@ -81,14 +81,11 @@ const Catalog = () => {
const onChallengeVerification = (challengeVerification) => { const onChallengeVerification = (challengeVerification) => {
if (challengeVerification.challengeSuccess === true) { if (challengeVerification.challengeSuccess === true) {
setSuccessMessage('Challenge success.', {publishedCid: challengeVerification.publication?.cid}); localStorage.setItem("toastMessage", "Challenge Success");
console.log("challenge success", challengeVerification.publication?.cid, challengeVerification)
navigate(`/p/${selectedAddress}/c/${challengeVerification.publication?.cid}`); navigate(`/p/${selectedAddress}/c/${challengeVerification.publication?.cid}`);
} }
else if (challengeVerification.challengeSuccess === false) { else if (challengeVerification.challengeSuccess === false) {
setErrorMessage('Challenge failed.', {reason: challengeVerification.reason, errors: challengeVerification.errors}); setErrorMessage('Challenge Failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
console.log("challenge failed", challengeVerification.reason, challengeVerification.errors)
setErrorMessage("Error: You seem to have mistyped the CAPTCHA. Please try again.");
} }
}; };
@@ -124,7 +121,7 @@ const Catalog = () => {
useEffect(() => { useEffect(() => {
if (index !== undefined) { if (index !== undefined) {
navigate(`/profile/c/${index}`); navigate(`/profile/c/${index}`);
setSuccessMessage('Comment pending with index ' + index + '.'); localStorage.setItem("toastMessage", `Comment pending with index ${index}.`);
} }
}, [index]); }, [index]);
+11 -1
View File
@@ -34,7 +34,7 @@ const Pending = () => {
const [visible] = useState(true); const [visible] = useState(true);
const [errorMessage] = useState(null); const [errorMessage] = useState(null);
const [successMessage] = useState(null); const [successMessage, setSuccessMessage] = useState(null);
useError(errorMessage, [errorMessage]); useError(errorMessage, [errorMessage]);
useSuccess(successMessage, [successMessage]); useSuccess(successMessage, [successMessage]);
const navigate = useNavigate(); const navigate = useNavigate();
@@ -58,6 +58,16 @@ const Pending = () => {
} }
}, [comment]); }, [comment]);
useEffect(() => {
const toastFromStorage = localStorage.getItem("toastMessage");
if (toastFromStorage) {
setSuccessMessage(toastFromStorage);
localStorage.removeItem("toastMessage");
} else {
return;
}
}, []);
return ( return (
<Container> <Container>
-1
View File
@@ -94,7 +94,6 @@ const Thread = () => {
} }
else if (challengeVerification.challengeSuccess === false) { else if (challengeVerification.challengeSuccess === false) {
setErrorMessage('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors}); setErrorMessage('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
setErrorMessage("Error: You seem to have mistyped the CAPTCHA. Please try again.");
} }
}; };