- feat: Highlight inactive accounts in data-table.

- feat: Separate accounts list and table order.

client/src/containers/Expenses/ExpenseFormHeader.js

@@ -26,7 +26,7 @@ import withAccounts from 'containers/Accounts/withAccounts';
 function ExpenseFormHeader({
   formik: { errors, touched, setFieldValue, getFieldProps, values },
   currenciesList,
-  accounts,
+  accountsList,
   accountsTypes,
 }) {
   const [selectedItems, setSelectedItems] = useState({});
@@ -165,7 +165,7 @@ function ExpenseFormHeader({
             }
           >
             <AccountsSelectList
-              accounts={accounts}
+              accounts={accountsList}
               onAccountSelected={onChangeAccount}
               defaultSelectText={<T id={'select_payment_account'} />}
               selectedAccountId={values.payment_account_id}
@@ -252,8 +252,8 @@ function ExpenseFormHeader({
 }
 
 export default compose(
-  withAccounts(({ accounts, accountsTypes }) => ({
-    accounts,
+  withAccounts(({ accountsList, accountsTypes }) => ({
+    accountsList,
     accountsTypes,
   })),
   withCurrencies(({ currenciesList }) => ({

client/src/containers/Expenses/ExpenseTable.js

@@ -87,7 +87,7 @@ const TotalAmountCellRenderer = (chainedComponent, type) => (props) => {
 
 function ExpenseTable({
   // #withAccounts
-  accounts,
+  accountsList,
 
   // #ownPorps
   onClickRemoveRow,
@@ -228,7 +228,7 @@ function ExpenseTable({
         rowClassNames={rowClassNames}
         sticky={true}
         payload={{
-          accounts,
+          accounts: accountsList,
           errors: errors.categories || [],
           updateData: handleUpdateData,
           removeRow: handleRemoveRow,
@@ -256,7 +256,7 @@ function ExpenseTable({
 }
 
 export default compose(
-  withAccounts(({ accounts }) => ({
-    accounts,
+  withAccounts(({ accountsList }) => ({
+    accountsList,
   })),
 )(ExpenseTable);