Fix setSettings host override

RoboSats · Nov 26, 2022 · dccb155 · dccb155
1 parent b4072b9
commit dccb155
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/frontend/src/basic/Main.tsx b/frontend/src/basic/Main.tsx
@@ -181,7 +181,7 @@ const Main = ({ settings, setSettings }: MainProps): JSX.Element => {
     return await data;
   };
 
-  const fetchInfo = function (setNetwork?: boolean) {
+  const fetchInfo = function () {
     setInfo({ ...info, loading: true });
     apiClient.get(baseUrl, '/api/info/').then((data: Info) => {
       const versionInfo: any = checkVer(data.version.major, data.version.minor, data.version.patch);
@@ -192,19 +192,22 @@ const Main = ({ settings, setSettings }: MainProps): JSX.Element => {
         clientVersion: versionInfo.clientVersion,
         loading: false,
       });
-      // Sets Setting network from coordinator API param if accessing via web
-      if (setNetwork) {
-        setSettings({ ...settings, network: data.network });
-      }
     });
   };
 
   useEffect(() => {
     if (open.stats || open.coordinator || info.coordinatorVersion == 'v?.?.?') {
-      fetchInfo(info.coordinatorVersion == 'v?.?.?');
+      fetchInfo();
     }
   }, [open.stats, open.coordinator]);
 
+  useEffect(() => {
+    // Sets Setting network from coordinator API param if accessing via web
+    if (settings.network == undefined) {
+      setSettings({ ...settings, network: data.network });
+    }
+  }, [info]);
+
   const fetchRobot = function ({ keys = false }) {
     const requestBody = {
       token_sha256: sha256(robot.token),

diff --git a/frontend/src/components/UnsafeAlert.js b/frontend/src/components/UnsafeAlert.js
@@ -50,6 +50,7 @@ class UnsafeAlert extends Component {
 
   render() {
     const { t } = this.props;
+    console.log(this.state);
 
     // If alert is hidden return null
     if (!this.state.show) {