Remove use of useActions

actualbudget · Dec 5, 2024 · a66533f · a66533f
1 parent 5e7538f
commit a66533f
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 64 deletions.
diff --git a/packages/desktop-client/src/components/LoggedInUser.tsx b/packages/desktop-client/src/components/LoggedInUser.tsx
@@ -1,12 +1,11 @@
 // @ts-strict-ignore
 import React, { useState, useEffect, useRef, type CSSProperties } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 
+import { closeBudget, getUserData, signOut } from 'loot-core/client/actions';
 import { type State } from 'loot-core/src/client/state-types';
 
-import { useActions } from '../hooks/useActions';
-import { useNavigate } from '../hooks/useNavigate';
 import { theme, styles } from '../style';
 
 import { Button } from './common/Button2';
@@ -15,6 +14,7 @@ import { Popover } from './common/Popover';
 import { Text } from './common/Text';
 import { View } from './common/View';
 import { useServerURL } from './ServerContext';
+import { useNavigate } from '../hooks/useNavigate';
 
 type LoggedInUserProps = {
   hideIfNoServer?: boolean;
@@ -27,22 +27,28 @@ export function LoggedInUser({
   color,
 }: LoggedInUserProps) {
   const { t } = useTranslation();
-
+  const dispatch = useDispatch();
+  const navigate = useNavigate();
   const userData = useSelector((state: State) => state.user.data);
-  const { getUserData, signOut, closeBudget } = useActions();
   const [loading, setLoading] = useState(true);
   const [menuOpen, setMenuOpen] = useState(false);
   const serverUrl = useServerURL();
   const triggerRef = useRef(null);
 
   useEffect(() => {
-    getUserData().then(() => setLoading(false));
+    async function init() {
+      await dispatch(getUserData());
+    }
+
+    init().then(() => setLoading(false));
   }, []);
 
-  const navigate = useNavigate();
+  async function onCloseBudget() {
+    await dispatch(closeBudget());
+  }
 
   async function onChangePassword() {
-    await closeBudget();
+    await onCloseBudget();
     navigate('/change-password');
   }
 
@@ -54,14 +60,14 @@ export function LoggedInUser({
         onChangePassword();
         break;
       case 'sign-in':
-        await closeBudget();
+        await onCloseBudget();
         navigate('/login');
         break;
       case 'sign-out':
-        signOut();
+        dispatch(signOut());
         break;
       case 'config-server':
-        await closeBudget();
+        await onCloseBudget();
         navigate('/config-server');
         break;
       default:

diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx
@@ -1,10 +1,12 @@
 import React, { useState, useEffect, type CSSProperties } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
+import { useDispatch } from 'react-redux';
 import { Routes, Route, useLocation } from 'react-router-dom';
 
 import { css } from '@emotion/css';
 import { t } from 'i18next';
 
+import { sync } from 'loot-core/client/actions';
 import * as Platform from 'loot-core/src/client/platform';
 import * as queries from 'loot-core/src/client/queries';
 import { listen } from 'loot-core/src/platform/client/fetch';
@@ -13,7 +15,6 @@ import {
   isElectron,
 } from 'loot-core/src/shared/environment';
 
-import { useActions } from '../hooks/useActions';
 import { useGlobalPref } from '../hooks/useGlobalPref';
 import { useMetadataPref } from '../hooks/useMetadataPref';
 import { useNavigate } from '../hooks/useNavigate';
@@ -108,8 +109,7 @@ type SyncButtonProps = {
 };
 function SyncButton({ style, isMobile = false }: SyncButtonProps) {
   const [cloudFileId] = useMetadataPref('cloudFileId');
-  const { sync } = useActions();
-
+  const dispatch = useDispatch();
   const [syncing, setSyncing] = useState(false);
   const [syncState, setSyncState] = useState<
     null | 'offline' | 'local' | 'disabled' | 'error'
@@ -193,15 +193,17 @@ function SyncButton({ style, isMobile = false }: SyncButtonProps) {
     marginRight: 5,
   };
 
+  const onSync = () => dispatch(sync());
+
   useHotkeys(
     'ctrl+s, cmd+s, meta+s',
-    sync,
+    onSync,
     {
       enableOnFormTags: true,
       preventDefault: true,
       scopes: ['app'],
     },
-    [sync],
+    [onSync],
   );
 
   return (
@@ -223,7 +225,7 @@ function SyncButton({ style, isMobile = false }: SyncButtonProps) {
         '&[data-hovered]': hoveredStyle,
         '&[data-pressed]': activeStyle,
       })}
-      onPress={sync}
+      onPress={onSync}
     >
       {isMobile ? (
         syncState === 'error' ? (

diff --git a/packages/desktop-client/src/components/UpdateNotification.tsx b/packages/desktop-client/src/components/UpdateNotification.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
+import { useSelector, useDispatch } from 'react-redux';
 
+import { setAppState, updateApp } from 'loot-core/client/actions';
 import { type State } from 'loot-core/src/client/state-types';
 
-import { useActions } from '../hooks/useActions';
 import { SvgClose } from '../icons/v1';
 import { theme } from '../style';
 
@@ -20,7 +20,10 @@ export function UpdateNotification() {
     (state: State) => state.app.showUpdateNotification,
   );
 
-  const { updateApp, setAppState } = useActions();
+  const dispatch = useDispatch();
+  const onRestart = () => {
+    dispatch(updateApp());
+  };
 
   if (updateInfo && showUpdateNotification) {
     const notes = updateInfo.releaseNotes;
@@ -51,7 +54,7 @@ export function UpdateNotification() {
             <Text>
               <Link
                 variant="text"
-                onClick={updateApp}
+                onClick={onRestart}
                 style={{
                   color: theme.buttonPrimaryText,
                   textDecoration: 'underline',
@@ -81,10 +84,12 @@ export function UpdateNotification() {
                 style={{ display: 'inline', padding: '1px 7px 2px 7px' }}
                 onPress={() => {
                   // Set a flag to never show an update notification again for this session
-                  setAppState({
-                    updateInfo: null,
-                    showUpdateNotification: false,
-                  });
+                  dispatch(
+                    setAppState({
+                      updateInfo: null,
+                      showUpdateNotification: false,
+                    }),
+                  );
                 }}
               >
                 <SvgClose

diff --git a/packages/desktop-client/src/components/manager/ConfigServer.tsx b/packages/desktop-client/src/components/manager/ConfigServer.tsx
@@ -1,13 +1,14 @@
 // @ts-strict-ignore
 import React, { useState, useEffect, useCallback } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { useDispatch } from 'react-redux';
 
+import { createBudget, loggedIn, signOut } from 'loot-core/client/actions';
 import {
   isNonProductionEnvironment,
   isElectron,
 } from 'loot-core/src/shared/environment';
 
-import { useActions } from '../../hooks/useActions';
 import { useGlobalPref } from '../../hooks/useGlobalPref';
 import { useNavigate } from '../../hooks/useNavigate';
 import { theme } from '../../style';
@@ -22,7 +23,7 @@ import { Title } from './subscribe/common';
 
 export function ConfigServer() {
   const { t } = useTranslation();
-  const { createBudget, signOut, loggedIn } = useActions();
+  const dispatch = useDispatch();
   const navigate = useNavigate();
   const [url, setUrl] = useState('');
   const currentUrl = useServerURL();
@@ -77,7 +78,7 @@ export function ConfigServer() {
       setError(error);
     } else {
       setLoading(false);
-      await signOut();
+      await dispatch(signOut());
       navigate('/');
     }
   }
@@ -104,13 +105,14 @@ export function ConfigServer() {
 
   async function onSkip() {
     await setServerUrl(null);
-    await loggedIn();
+    await dispatch(loggedIn());
     navigate('/');
   }
 
   async function onCreateTestFile() {
     await setServerUrl(null);
-    await createBudget({ testMode: true });
+    await dispatch(createBudget({ testMode: true }));
+    navigate('/');
   }
 
   return (

diff --git a/packages/desktop-client/src/components/manager/WelcomeScreen.tsx b/packages/desktop-client/src/components/manager/WelcomeScreen.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { useDispatch } from 'react-redux';
+
+import { createBudget, pushModal } from 'loot-core/client/actions';
 
-import { useActions } from '../../hooks/useActions';
 import { styles, theme } from '../../style';
 import { Button } from '../common/Button2';
 import { Link } from '../common/Link';
@@ -11,7 +13,7 @@ import { View } from '../common/View';
 
 export function WelcomeScreen() {
   const { t } = useTranslation();
-  const { createBudget, pushModal } = useActions();
+  const dispatch = useDispatch();
 
   return (
     <View
@@ -77,7 +79,7 @@ export function WelcomeScreen() {
           flexShrink: 0,
         }}
       >
-        <Button onPress={() => pushModal('import')}>
+        <Button onPress={() => dispatch(pushModal('import'))}>
           {t('Import my budget')}
         </Button>
         <View
@@ -87,10 +89,14 @@ export function WelcomeScreen() {
             gap: 10,
           }}
         >
-          <Button onPress={() => createBudget({ testMode: true })}>
+          <Button onPress={() => dispatch(createBudget({ testMode: true }))}>
             {t('View demo')}
           </Button>
-          <Button variant="primary" autoFocus onPress={() => createBudget()}>
+          <Button
+            variant="primary"
+            autoFocus
+            onPress={() => dispatch(createBudget())}
+          >
             {t('Start fresh')}
           </Button>
         </View>

diff --git a/.../desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx b/.../desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.jsx
@@ -1,11 +1,17 @@
 import React, { useState, useEffect, useCallback } from 'react';
+import { useDispatch } from 'react-redux';
 
 import deepEqual from 'deep-equal';
 import { t } from 'i18next';
 
+import {
+  getPayees,
+  importPreviewTransactions,
+  importTransactions,
+  parseTransactions,
+} from 'loot-core/client/actions';
 import { amountToInteger } from 'loot-core/src/shared/util';
 
-import { useActions } from '../../../hooks/useActions';
 import { useDateFormat } from '../../../hooks/useDateFormat';
 import { useSyncedPrefs } from '../../../hooks/useSyncedPrefs';
 import { theme } from '../../../style';
@@ -137,12 +143,7 @@ function parseCategoryFields(trans, categories) {
 export function ImportTransactionsModal({ options }) {
   const dateFormat = useDateFormat() || 'MM/dd/yyyy';
   const [prefs, savePrefs] = useSyncedPrefs();
-  const {
-    parseTransactions,
-    importTransactions,
-    importPreviewTransactions,
-    getPayees,
-  } = useActions();
+  const dispatch = useDispatch();
 
   const [multiplierAmount, setMultiplierAmount] = useState('');
   const [loadingState, setLoadingState] = useState('parsing');
@@ -263,9 +264,8 @@ export function ImportTransactionsModal({ options }) {
       }
 
       // Retreive the transactions that would be updated (along with the existing trx)
-      const previewTrx = await importPreviewTransactions(
-        accountId,
-        previewTransactions,
+      const previewTrx = await dispatch(
+        importPreviewTransactions(accountId, previewTransactions),
       );
       const matchedUpdateMap = previewTrx.reduce((map, entry) => {
         map[entry.transaction.trx_id] = entry;
@@ -309,7 +309,7 @@ export function ImportTransactionsModal({ options }) {
           return next;
         }, []);
     },
-    [accountId, categories.list, clearOnImport, importPreviewTransactions],
+    [accountId, categories.list, clearOnImport, dispatch],
   );
 
   const parse = useCallback(
@@ -320,8 +320,9 @@ export function ImportTransactionsModal({ options }) {
       setFilename(filename);
       setFileType(filetype);
 
-      const { errors, transactions: parsedTransactions = [] } =
-        await parseTransactions(filename, options);
+      const { errors, transactions: parsedTransactions = [] } = await dispatch(
+        parseTransactions(filename, options),
+      );
 
       let index = 0;
       const transactions = parsedTransactions.map(trans => {
@@ -399,11 +400,11 @@ export function ImportTransactionsModal({ options }) {
     },
     [
       accountId,
+      dispatch,
       getImportPreview,
       inOutMode,
       multiplierAmount,
       outValue,
-      parseTransactions,
       prefs,
     ],
   );
@@ -427,7 +428,6 @@ export function ImportTransactionsModal({ options }) {
 
     parse(options.filename, parseOptions);
   }, [
-    parseTransactions,
     options.filename,
     delimiter,
     hasHeaderRow,
@@ -653,13 +653,11 @@ export function ImportTransactionsModal({ options }) {
       });
     }
 
-    const didChange = await importTransactions(
-      accountId,
-      finalTransactions,
-      reconcile,
+    const didChange = await dispatch(
+      importTransactions(accountId, finalTransactions, reconcile),
     );
     if (didChange) {
-      await getPayees();
+      await dispatch(getPayees());
     }
 
     if (onImported) {