feat: tweaks in disconnecting bank account

packages/server/src/services/Banking/BankAccounts/DisconnectBankAccount.tsx

@@ -7,6 +7,7 @@ import HasTenancyService from '@/services/Tenancy/TenancyService';
 import UnitOfWork from '@/services/UnitOfWork';
 import events from '@/subscribers/events';
 import { ERRORS } from './types';
+import { ACCOUNT_TYPE } from '@/data/AccountTypes';
 
 @Service()
 export class DisconnectBankAccount {
@@ -31,7 +32,7 @@ export class DisconnectBankAccount {
     // Retrieve the bank account or throw not found error.
     const account = await Account.query()
       .findById(bankAccountId)
-      .whereIn('account_type', ['bank', 'cash'])
+      .whereIn('account_type', [ACCOUNT_TYPE.CASH, ACCOUNT_TYPE.BANK])
       .throwIfNotFound();
 
     const oldPlaidItem = await PlaidItem.query().findById(account.plaidItemId);

packages/server/src/services/Banking/BankAccounts/RefreshBankAccount.tsx

@@ -1,19 +1,19 @@
+import { Inject, Service } from 'typedi';
 import { ServiceError } from '@/exceptions';
 import { PlaidClientWrapper } from '@/lib/Plaid';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
-import UnitOfWork from '@/services/UnitOfWork';
-import { Inject } from 'typedi';
+import { ERRORS } from './types';
+
+@Service()
 export class RefreshBankAccountService {
   @Inject()
   private tenancy: HasTenancyService;
 
-  @Inject()
-  private uow: UnitOfWork;
-
   /**
-   *
+   * Asks Plaid to trigger syncing the given bank account.
    * @param {number} tenantId
    * @param {number} bankAccountId
+   * @returns {Promise<void>}
    */
   public async refreshBankAccount(tenantId: number, bankAccountId: number) {
     const { Account } = this.tenancy.models(tenantId);
@@ -23,17 +23,14 @@ export class RefreshBankAccountService {
       .withGraphFetched('plaidItem')
       .throwIfNotFound();
 
+    // Can't continue if the given account is not linked with Plaid item.
     if (!bankAccount.plaidItem) {
-      throw new ServiceError('');
+      throw new ServiceError(ERRORS.BANK_ACCOUNT_NOT_CONNECTED);
     }
     const plaidInstance = new PlaidClientWrapper();
 
-    const data = await plaidInstance.transactionsRefresh({
+    await plaidInstance.transactionsRefresh({
       access_token: bankAccount.plaidItem.plaidAccessToken,
     });
-    await Account.query().findById(bankAccountId).patch({
-      isFeedsActive: true,
-      lastFeedsUpdatedAt: new Date(),
-    });
   }
 }

packages/server/src/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted.ts

@@ -1,8 +1,8 @@
+import { Inject, Service } from 'typedi';
 import { IAccountEventDeletedPayload } from '@/interfaces';
 import { PlaidClientWrapper } from '@/lib/Plaid';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import events from '@/subscribers/events';
-import { Inject, Service } from 'typedi';
 
 @Service()
 export class DisconnectPlaidItemOnAccountDeleted {

packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx

@@ -53,7 +53,7 @@ function AccountTransactionsActionsBar({
   addSetting,
 }) {
   const history = useHistory();
-  const { accountId } = useAccountTransactionsContext();
+  const { accountId, currentAccount } = useAccountTransactionsContext();
 
   // Refresh cashflow infinity transactions hook.
   const { refresh } = useRefreshCashflowTransactionsInfinity();
@@ -65,6 +65,8 @@ function AccountTransactionsActionsBar({
   const addMoneyInOptions = useMemo(() => getAddMoneyInOptions(), []);
   const addMoneyOutOptions = useMemo(() => getAddMoneyOutOptions(), []);
 
+  const isFeedsActive = !!currentAccount.is_feeds_active;
+
   // Handle table row size change.
   const handleTableRowSizeChange = (size) => {
     addSetting('cashflowTransactions', 'tableSize', size);
@@ -94,8 +96,6 @@ function AccountTransactionsActionsBar({
     history.push(`/bank-rules?accountId=${accountId}`);
   };
 
-  const isConnected = true;
-
   // Handles the bank account disconnect click.
   const handleDisconnectClick = () => {
     disconnectBankAccount({ bankAccountId: accountId })
@@ -177,14 +177,18 @@ function AccountTransactionsActionsBar({
         <NavbarDivider />
 
         <Tooltip
-          content={'The bank syncing is active'}
+          content={
+            isFeedsActive
+              ? 'The bank syncing is active'
+              : 'The bank syncing is disconnected'
+          }
           minimal={true}
           position={Position.BOTTOM}
         >
           <Button
             className={Classes.MINIMAL}
-            icon={<Icon icon="feed" iconSize={16} color="#238C2C" />}
-            intent={Intent.SUCCESS}
+            icon={<Icon icon="feed" iconSize={16} />}
+            intent={isFeedsActive ? Intent.SUCCESS : Intent.DANGER}
           />
         </Tooltip>
       </NavbarGroup>
@@ -199,13 +203,15 @@ function AccountTransactionsActionsBar({
           }}
           content={
             <Menu>
-              {isConnected && (
-                <MenuItem onClick={handleBankUpdateClick} text={'Update'} />
+              {isFeedsActive && (
+                <>
+                  <MenuItem onClick={handleBankUpdateClick} text={'Update'} />
+                  <MenuDivider />
+                </>
               )}
-              <MenuDivider />
               <MenuItem onClick={handleBankRulesClick} text={'Bank rules'} />
 
-              {isConnected && (
+              {isFeedsActive && (
                 <MenuItem onClick={handleDisconnectClick} text={'Disconnect'} />
               )}
             </Menu>