Remove app state type

actualbudget · Dec 20, 2024 · 2d96d05 · 2d96d05
1 parent 4889226
commit 2d96d05
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 37 deletions.
diff --git a/packages/desktop-client/src/hooks/useSplitsExpanded.tsx b/packages/desktop-client/src/hooks/useSplitsExpanded.tsx
@@ -9,10 +9,12 @@ import React, {
   useRef,
 } from 'react';
 
-import {
-  type SplitMode,
-  type SplitState,
-} from 'loot-core/client/state-types/app';
+type SplitMode = 'collapse' | 'expand';
+type SplitState = {
+  ids: string[];
+  mode: SplitMode;
+  transitionId: string | null;
+};
 
 type ToggleSplitAction = {
   type: 'toggle-split';

diff --git a/packages/loot-core/src/client/reducers/modals.ts b/packages/loot-core/src/client/reducers/modals.ts
@@ -7,7 +7,18 @@ export const initialState: ModalsState = {
   isHidden: false,
 };
 
-export function update(state = initialState, action: Action): ModalsState {
+type ModalsAction =
+  | Action
+  // Temporary until we migrate to redux toolkit.
+  | {
+      type: 'app/setAppState';
+      payload: { loadingText: string | null };
+    };
+
+export function update(
+  state = initialState,
+  action: ModalsAction,
+): ModalsState {
   switch (action.type) {
     case constants.PUSH_MODAL:
       // special case: don't show the keyboard shortcuts modal if there's already a modal open
@@ -44,11 +55,12 @@ export function update(state = initialState, action: Action): ModalsState {
         ...state,
         modalStack: idx < 0 ? state.modalStack : state.modalStack.slice(0, idx),
       };
-    case constants.SET_APP_STATE:
-      if ('loadingText' in action.state) {
+    // Temporary until we migrate to redux toolkit.
+    case 'app/setAppState':
+      if (action.payload.loadingText) {
         return {
           ...state,
-          isHidden: action.state.loadingText != null,
+          isHidden: action.payload.loadingText != null,
         };
       }
       break;

diff --git a/packages/loot-core/src/client/state-types/app.d.ts b/packages/loot-core/src/client/state-types/app.d.ts
diff --git a/packages/loot-core/src/client/state-types/index.d.ts b/packages/loot-core/src/client/state-types/index.d.ts
@@ -1,6 +1,5 @@
 import type * as constants from '../constants';
 
-import type { AppActions, AppState } from './app';
 import type { BudgetsActions, BudgetsState } from './budgets';
 import type { ModalsActions, ModalsState } from './modals';
 import type { NotificationsActions, NotificationsState } from './notifications';
@@ -12,7 +11,6 @@ export type CloseBudgetAction = {
 };
 
 export type Action =
-  | AppActions
   | BudgetsActions
   | ModalsActions
   | NotificationsActions
@@ -21,7 +19,6 @@ export type Action =
   | CloseBudgetAction;
 
 export type State = {
-  app: AppState;
   budgets: BudgetsState;
   modals: ModalsState;
   notifications: NotificationsState;