WIP / Feature & Fix Expense /Customer

client/src/components/DataTableCells/AccountsListFieldCell.js

@@ -1,11 +1,7 @@
-import React, {useCallback, useMemo} from 'react';
+import React, { useCallback, useMemo } from 'react';
 import AccountsSelectList from 'components/AccountsSelectList';
 import classNames from 'classnames';
-import {
-  FormGroup,
-  Classes,
-  Intent,
-} from '@blueprintjs/core';
+import { FormGroup, Classes, Intent } from '@blueprintjs/core';
 
 // Account cell renderer.
 const AccountCellRenderer = ({
@@ -14,31 +10,38 @@ const AccountCellRenderer = ({
   cell: { value: initialValue },
   payload: { accounts, updateData, errors },
 }) => {
-  const handleAccountSelected = useCallback((account) => {
-    updateData(index, id, account.id);
-  }, [updateData, index, id]);
+  const handleAccountSelected = useCallback(
+    (account) => {
+      updateData(index, id, account.id);
+    },
+    [updateData, index, id],
+  );
 
-  const { account_id = false } = (errors[index] || {});
+  const { account_id = false, expense_account_id = false } =
+    errors[index] || {};
 
-  const initialAccount = useMemo(() => 
-    accounts.find(a => a.id === initialValue),
-    [accounts, initialValue]);
+  const initialAccount = useMemo(
+    () => accounts.find((a) => a.id === initialValue),
+    [accounts, initialValue],
+  );
 
   return (
     <FormGroup
-      intent={account_id ? Intent.DANGER : ''}
+      intent={account_id || expense_account_id ? Intent.DANGER : ''}
       className={classNames(
         'form-group--select-list',
         'form-group--account',
-        Classes.FILL)}
-      >
+        Classes.FILL,
+      )}
+    >
       <AccountsSelectList
         accounts={accounts}
         onAccountSelected={handleAccountSelected}
-        error={account_id}
-        initialAccount={initialAccount} />
+        error={[account_id, expense_account_id]}
+        initialAccount={initialAccount}
+      />
     </FormGroup>
   );
 };
 
-export default AccountCellRenderer;
+export default AccountCellRenderer;