Merge remote-tracking branch 'origin/expenses'

This commit is contained in:
Ahmed Bouhuolia
2020-06-13 18:18:09 +02:00
27 changed files with 2761 additions and 616 deletions

View File

@@ -340,7 +340,7 @@ function AccountsChart({
onEditAccount={handleEditAccount}
onFetchData={handleFetchData}
onSelectedRowsChange={handleSelectedRowsChange}
loading={tableLoading}
/>
</Route>
</Switch>

View File

@@ -9,7 +9,8 @@ import {
fetchAccount,
deleteBulkAccounts,
bulkActivateAccounts,
bulkInactiveAccounts
bulkInactiveAccounts,
editAccount
} from 'store/accounts/accounts.actions';
const mapActionsToProps = (dispatch) => ({
@@ -23,6 +24,7 @@ const mapActionsToProps = (dispatch) => ({
requestDeleteBulkAccounts: (ids) => dispatch(deleteBulkAccounts({ ids })),
requestBulkActivateAccounts:(ids)=>dispatch(bulkActivateAccounts({ids})),
requestBulkInactiveAccounts:(ids)=>dispatch(bulkInactiveAccounts({ids})),
requestEditAccount:({id,form}) => dispatch(editAccount({id,form}))
});
export default connect(null, mapActionsToProps);