Merge pull request #618 from bigcapitalhq/display-details-bank-account

fix: Some bank account details hidden

packages/server/src/lib/Transformer/Transformer.ts

@@ -164,6 +164,10 @@ export class Transformer {
     return date ? moment(date).format(this.dateFormat) : '';
   }
 
+  protected formatDateFromNow(date){
+    return date ? moment(date).fromNow(true) : '';
+  }
+
   /**
    *
    * @param number

packages/server/src/services/Cashflow/CashflowAccountTransformer.ts

@@ -8,7 +8,12 @@ export class CashflowAccountTransformer extends Transformer {
    * @returns {string[]}
    */
   public includeAttributes = (): string[] => {
-    return ['formattedAmount'];
+    return [
+      'formattedAmount',
+      'lastFeedsUpdatedAt',
+      'lastFeedsUpdatedAtFormatted',
+      'lastFeedsUpdatedFromNow',
+    ];
   };
 
   /**
@@ -29,7 +34,7 @@ export class CashflowAccountTransformer extends Transformer {
 
   /**
    * Retrieve formatted account amount.
-   * @param   {IAccount} invoice
+   * @param {IAccount} invoice
    * @returns {string}
    */
   protected formattedAmount = (account: IAccount): string => {
@@ -37,4 +42,22 @@ export class CashflowAccountTransformer extends Transformer {
       currencyCode: account.currencyCode,
     });
   };
+
+  /**
+   * Retrieves the last feeds update at formatted date.
+   * @param {IAccount} account
+   * @returns {string}
+   */
+  protected lastFeedsUpdatedAtFormatted(account: IAccount): string {
+    return this.formatDate(account.lastFeedsUpdatedAt);
+  }
+
+  /**
+   * Retrieves the last feeds updated from now.
+   * @param {IAccount} account
+   * @returns {string}
+   */
+  protected lastFeedsUpdatedFromNow(account: IAccount): string {
+    return this.formatDateFromNow(account.lastFeedsUpdatedAt);
+  }
 }

packages/webapp/src/components/BankAccounts/index.tsx

@@ -62,6 +62,7 @@ export function BankAccount({
   balance,
   loading = false,
   updatedBeforeText,
+  uncategorizedTransactionsCount,
   ...restProps
 }) {
   return (
@@ -77,17 +78,19 @@ export function BankAccount({
       </BankAccountHeader>
 
       <BankAccountMeta>
-        {false && (
+        {uncategorizedTransactionsCount > 0 && (
           <BankAccountMetaLine
             title={intl.get('cash_flow.transactions_for_review')}
-            value={'0'}
+            value={uncategorizedTransactionsCount}
+            className={clsx({ [Classes.SKELETON]: loading })}
+          />
+        )}
+        {updatedBeforeText && (
+          <BankAccountMetaLine
+            title={updatedBeforeText}
             className={clsx({ [Classes.SKELETON]: loading })}
           />
         )}
-        <BankAccountMetaLine
-          title={updatedBeforeText}
-          className={clsx({ [Classes.SKELETON]: loading })}
-        />
       </BankAccountMeta>
 
       <BankAccountBalance amount={balance} loading={loading} />

packages/webapp/src/containers/CashFlow/AccountTransactions/ExcludedTransactions/_utils.tsx

@@ -37,12 +37,13 @@ export function useExcludedTransactionsColumns() {
     () => [
       {
         Header: 'Date',
-        accessor: 'formatted_date',
+        accessor: 'formatted_date', 
         width: 110,
       },
       {
         Header: 'Description',
         accessor: descriptionAccessor,
+        textOverview: true,
       },
       {
         Header: 'Payee',

packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashflowAccountsGrid.tsx

@@ -123,7 +123,12 @@ function CashflowBankAccount({
           code={account.code}
           balance={!isNull(account.amount) ? account.formatted_amount : '-'}
           type={account.account_type}
-          updatedBeforeText={getUpdatedBeforeText(account.createdAt)}
+          updatedBeforeText={
+            account.last_feeds_updated_from_now
+              ? `Updated ${account.last_feeds_updated_from_now} ago`
+              : ''
+          }
+          uncategorizedTransactionsCount={account.uncategorized_transactions}
         />
       </CashflowAccountAnchor>
     </ContextMenu2>