fix: conflict merge.

This commit is contained in:
Ahmed Bouhuolia
2020-10-25 18:34:07 +02:00
parent 426f9fcf55
commit fb7686bfdd
18 changed files with 283 additions and 66 deletions

View File

@@ -20,9 +20,9 @@ export default (mapState) => {
billsItems: state.bills.items,
billsTableQuery: tableQuery,
// @todo un-unncessery shit.
billsPageination: getBillsPaginationMeta(state, props, tableQuery),
billsLoading: state.bills.loading,
nextBillNumberChanged: state.bills.nextBillNumberChanged,
};
return mapState ? mapState(mapped, state, props) : mapped;
};