diff --git a/packages/server/src/services/Banking/Exclude/ExcludeBankTransactions.ts b/packages/server/src/services/Banking/Exclude/ExcludeBankTransactions.ts index abf6bd434..65d65a7c1 100644 --- a/packages/server/src/services/Banking/Exclude/ExcludeBankTransactions.ts +++ b/packages/server/src/services/Banking/Exclude/ExcludeBankTransactions.ts @@ -1,7 +1,7 @@ import { Inject, Service } from 'typedi'; -import { ExcludeBankTransaction } from './ExcludeBankTransaction'; import PromisePool from '@supercharge/promise-pool'; import { castArray } from 'lodash'; +import { ExcludeBankTransaction } from './ExcludeBankTransaction'; @Service() export class ExcludeBankTransactions { @@ -12,6 +12,7 @@ export class ExcludeBankTransactions { * Exclude bank transactions in bulk. * @param {number} tenantId * @param {number} bankTransactionIds + * @returns {Promise} */ public async excludeBankTransactions( tenantId: number, @@ -21,7 +22,7 @@ export class ExcludeBankTransactions { await PromisePool.withConcurrency(1) .for(_bankTransactionIds) - .process(async (bankTransactionId: number) => { + .process((bankTransactionId: number) => { return this.excludeBankTransaction.excludeBankTransaction( tenantId, bankTransactionId diff --git a/packages/server/src/services/Banking/Exclude/UnexcludeBankTransactions.ts b/packages/server/src/services/Banking/Exclude/UnexcludeBankTransactions.ts index 840eb6259..846ea1fd8 100644 --- a/packages/server/src/services/Banking/Exclude/UnexcludeBankTransactions.ts +++ b/packages/server/src/services/Banking/Exclude/UnexcludeBankTransactions.ts @@ -21,7 +21,7 @@ export class UnexcludeBankTransactions { await PromisePool.withConcurrency(1) .for(_bankTransactionIds) - .process(async (bankTransactionId: number) => { + .process((bankTransactionId: number) => { return this.unexcludeBankTransaction.unexcludeBankTransaction( tenantId, bankTransactionId diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx index 7ca9abc37..53ef5a786 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx @@ -39,7 +39,6 @@ import { withBanking } from '../withBanking'; import { isEmpty } from 'lodash'; import { useExcludeUncategorizedTransactions, - useUnexcludeUncategorizedTransaction, useUnexcludeUncategorizedTransactions, } from '@/hooks/query/bank-rules'; @@ -136,7 +135,7 @@ function AccountTransactionsActionsBar({ }) .then(() => { AppToaster.show({ - message: 'The selected transactions have been unexcluded.', + message: 'The selected excluded transactions have been unexcluded.', intent: Intent.SUCCESS, }); }) @@ -198,10 +197,9 @@ function AccountTransactionsActionsBar({ onClick={handleExcludeUncategorizedBtnClick} className={Classes.MINIMAL} intent={Intent.DANGER} - disable={isExcludingLoading} + disabled={isExcludingLoading} /> )} - {!isEmpty(excludedTransactionsIdsSelected) && (