Merge pull request #113 from Chia-Network/disconnect-button-fixes

TheLastCicada · web-flow · commit 0e812d47c7aa · 2025-08-12T14:32:44.000-07:00
fix: make disconnect button more reliable
diff --git a/src/renderer/api/cadt/v1/system/system.api.ts b/src/renderer/api/cadt/v1/system/system.api.ts
@@ -52,10 +52,21 @@ const systemApi = cadtApi.injectEndpoints({
         method: 'GET',
       }),
       transformResponse(baseQueryReturnValue: BaseQueryResult<Config>): Config | undefined {
+        // Check if response is empty, null, or HTML content (which would indicate a 404 served as index.html)
         if (_.isEmpty(baseQueryReturnValue) || _.isNil(baseQueryReturnValue)) {
           return undefined;
         }
-        return baseQueryReturnValue;
+
+        if (typeof baseQueryReturnValue === 'string' && baseQueryReturnValue.includes('<!doctype html>')) {
+          return undefined;
+        }
+
+        // Ensure it's a valid config object with expected structure
+        if (typeof baseQueryReturnValue === 'object' && baseQueryReturnValue !== null) {
+          return baseQueryReturnValue as Config;
+        }
+
+        return undefined;
       },
     }),
     getThemeColors: builder.query<any, void>({
@@ -64,10 +75,19 @@ const systemApi = cadtApi.injectEndpoints({
         method: 'GET',
       }),
       transformResponse(baseQueryReturnValue: BaseQueryResult<any>): any {
-        if (_.isEmpty(baseQueryReturnValue) || _.isNil(baseQueryReturnValue)) {
+        // Check if response is empty, null, or HTML content (which would indicate a 404 served as index.html)
+        if (
+          _.isEmpty(baseQueryReturnValue) ||
+          _.isNil(baseQueryReturnValue) ||
+          (typeof baseQueryReturnValue === 'string' && baseQueryReturnValue.includes('<!doctype html>'))
+        ) {
           return undefined;
         }
-        return baseQueryReturnValue;
+        // Ensure it's a valid object
+        if (typeof baseQueryReturnValue === 'object' && baseQueryReturnValue !== null) {
+          return baseQueryReturnValue;
+        }
+        return undefined;
       },
     }),
   }),
diff --git a/src/renderer/components/blocks/buttons/ConnectButton.tsx b/src/renderer/components/blocks/buttons/ConnectButton.tsx
@@ -8,6 +8,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { RootState } from '@/store';
 import { resetApiHost } from '@/store/slices/app';
 import { reloadApplication } from '@/utils/unified-ui-utils';
+import { cadtApi } from '@/api/cadt/v1';
 
 const ConnectButton: React.FC = () => {
   const location = useLocation();
@@ -33,6 +34,13 @@ const ConnectButton: React.FC = () => {
 
   const handleDisconnect = () => {
     dispatch(resetApiHost());
+    // Clear persisted storage to prevent auto-reconnection
+    localStorage.removeItem('persist:app');
+    sessionStorage.removeItem('persist:app');
+
+    // Clear RTK Query cache to force fresh health check
+    dispatch(cadtApi.util.resetApiState());
+
     setTimeout(() => reloadApplication(), 0);
   };
 
diff --git a/src/renderer/store/slices/app/app.initialstate.ts b/src/renderer/store/slices/app/app.initialstate.ts
@@ -9,7 +9,7 @@ export interface AppState {
 
 const initialState: AppState = {
   locale: null,
-  apiHost: 'http://localhost:31310',
+  apiHost: '', // Empty string means no default API host
   apiKey: null,
   configFileLoaded: false,
   isDarkTheme: false,
