diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx
index 252bbaff..a24d00c0 100644
--- a/src/components/views/Catalog.jsx
+++ b/src/components/views/Catalog.jsx
@@ -497,8 +497,7 @@ const Catalog = () => {
setIsSettingsOpen(true)}>Settings
]
[
-
handleStyleChange({target: {value: "Yotsuba"}}
- )}>Home
+
diff --git a/src/components/views/Home.jsx b/src/components/views/Home.jsx
index 3e6d7374..e7e6a80a 100644
--- a/src/components/views/Home.jsx
+++ b/src/components/views/Home.jsx
@@ -15,25 +15,36 @@ const commitRef = process?.env?.REACT_APP_COMMIT_REF ? ` ${process.env.REACT_APP
const Home = () => {
const {
- setBodyStyle,
+ bodyStyle, setBodyStyle,
defaultSubplebbits,
setSelectedAddress,
- setSelectedStyle,
+ selectedStyle, setSelectedStyle,
setSelectedTitle
} = useGeneralStore(state => state);
const account = useAccount();
- const inputRef = useRef(null);
const navigate = useNavigate();
+
+ const inputRef = useRef(null);
+ const prevStyle = useRef(selectedStyle);
+ const prevBodyStyle = useRef(bodyStyle);
// prevent dark mode
useEffect(() => {
+ const currentPrevStyle = prevStyle.current;
+ const currentPrevBodyStyle = prevBodyStyle.current;
+
setBodyStyle({
background: "#ffe url(assets/fade.png) top repeat-x",
color: "maroon",
fontFamily: "Helvetica, Arial, sans-serif"
});
setSelectedStyle("Yotsuba");
+
+ return () => {
+ setSelectedStyle(currentPrevStyle);
+ setBodyStyle(currentPrevBodyStyle);
+ };
}, [setBodyStyle, setSelectedStyle]);
diff --git a/src/components/views/NotFound.jsx b/src/components/views/NotFound.jsx
index d14e648b..8cad9317 100644
--- a/src/components/views/NotFound.jsx
+++ b/src/components/views/NotFound.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
import { Helmet } from 'react-helmet-async';
import useGeneralStore from '../../hooks/stores/useGeneralStore';
import { Link } from "react-router-dom";
@@ -7,16 +7,31 @@ import packageJson from '../../../package.json'
const {version} = packageJson
-const NotFound = ({ setBodyStyle }) => {
- const { setSelectedStyle } = useGeneralStore(state => state);
+const NotFound = () => {
+ const {
+ bodyStyle, setBodyStyle,
+ selectedStyle, setSelectedStyle,
+ } = useGeneralStore(state => state);
+ const prevStyle = useRef(selectedStyle);
+ const prevBodyStyle = useRef(bodyStyle);
+
+ // prevent dark mode
useEffect(() => {
+ const currentPrevStyle = prevStyle.current;
+ const currentPrevBodyStyle = prevBodyStyle.current;
+
setBodyStyle({
background: "#ffe url(assets/fade.png) top repeat-x",
color: "maroon",
fontFamily: "Helvetica, Arial, sans-serif"
});
setSelectedStyle("Yotsuba");
+
+ return () => {
+ setSelectedStyle(currentPrevStyle);
+ setBodyStyle(currentPrevBodyStyle);
+ };
}, [setBodyStyle, setSelectedStyle]);
return (
diff --git a/src/components/views/Pending.jsx b/src/components/views/Pending.jsx
index bf446217..8b45c364 100644
--- a/src/components/views/Pending.jsx
+++ b/src/components/views/Pending.jsx
@@ -136,8 +136,7 @@ const Pending = () => {
setIsSettingsOpen(true)}>Settings
]
[
-
handleStyleChange({target: {value: "Yotsuba"}}
- )}>Home
+
Home
]
diff --git a/src/components/views/Subscriptions.jsx b/src/components/views/Subscriptions.jsx
index eb7bbceb..06eb51ef 100644
--- a/src/components/views/Subscriptions.jsx
+++ b/src/components/views/Subscriptions.jsx
@@ -230,8 +230,7 @@ const Subscriptions = () => {
setIsSettingsOpen(true)}>Settings
]
[
-
handleStyleChange({target: {value: "Yotsuba"}}
- )}>Home
+
Home
]
diff --git a/src/components/views/SubscriptionsCatalog.jsx b/src/components/views/SubscriptionsCatalog.jsx
index e1cbead6..b1d65d45 100644
--- a/src/components/views/SubscriptionsCatalog.jsx
+++ b/src/components/views/SubscriptionsCatalog.jsx
@@ -133,8 +133,7 @@ const SubscriptionsCatalog = () => {
setIsSettingsOpen(true)}>Settings
]
[
-
handleStyleChange({target: {value: "Yotsuba"}}
- )}>Home
+
Home
]
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index faf63a9d..efaa7dd0 100644
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -532,8 +532,7 @@ const Thread = () => {
setIsSettingsOpen(true)}>Settings
]
[
-
handleStyleChange({target: {value: "Yotsuba"}}
- )}>Home
+
Home
]