QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-20 06:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: reset the state once closing categorization aside

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-08-01 14:02:02 +02:00
parent 71e865e9b7
commit 5ce11f192f
2 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx
View File

@@ -62,6 +62,7 @@ function AccountTransactionsActionsBar({
// #withBanking // #withBanking
uncategorizedTransationsIdsSelected, uncategorizedTransationsIdsSelected,
excludedTransactionsIdsSelected, excludedTransactionsIdsSelected,
openMatchingTransactionAside,
// #withBankingActions // #withBankingActions
enableMultipleCategorization, enableMultipleCategorization,
@@ -284,19 +285,21 @@ function AccountTransactionsActionsBar({
</NavbarGroup> </NavbarGroup>
<NavbarGroup align={Alignment.RIGHT}> <NavbarGroup align={Alignment.RIGHT}>
<Tooltip {openMatchingTransactionAside && (
content={ <Tooltip
'Enables to categorize or matching multiple bank transactions into one transaction.' content={
} 'Enables to categorize or matching multiple bank transactions into one transaction.'
position={Position.BOTTOM} }
minimal position={Position.BOTTOM}
> minimal
<Switch >
label={'Multi Select'} <Switch
inline label={'Multi Select'}
onChange={handleMultipleCategorizingSwitch} inline
/> onChange={handleMultipleCategorizingSwitch}
</Tooltip> />
</Tooltip>
)}
<NavbarDivider /> <NavbarDivider />
<Popover <Popover
minimal={true} minimal={true}
@@ -342,9 +345,11 @@ export default compose(
({ ({
uncategorizedTransationsIdsSelected, uncategorizedTransationsIdsSelected,
excludedTransactionsIdsSelected, excludedTransactionsIdsSelected,
openMatchingTransactionAside,
}) => ({ }) => ({
uncategorizedTransationsIdsSelected, uncategorizedTransationsIdsSelected,
excludedTransactionsIdsSelected, excludedTransactionsIdsSelected,
openMatchingTransactionAside,
}), }),
), ),
withBankingActions, withBankingActions,

17
packages/webapp/src/containers/CashFlow/CategorizeTransactionAside/CategorizeTransactionAside.tsx
View File

@@ -19,13 +19,26 @@ function CategorizeTransactionAsideRoot({
// #withBanking // #withBanking
selectedUncategorizedTransactionId, selectedUncategorizedTransactionId,
resetTransactionsToCategorizeSelected,
enableMultipleCategorization,
}: CategorizeTransactionAsideProps) { }: CategorizeTransactionAsideProps) {
// //
useEffect( useEffect(
() => () => { () => () => {
// Close the reconcile matching form.
closeReconcileMatchingTransaction(); closeReconcileMatchingTransaction();
// Reset the selected transactions to categorize.
resetTransactionsToCategorizeSelected();
// Disable multi matching.
enableMultipleCategorization(false);
}, },
[closeReconcileMatchingTransaction], [
closeReconcileMatchingTransaction,
resetTransactionsToCategorizeSelected,
enableMultipleCategorization,
],
); );
const handleClose = () => { const handleClose = () => {