Show all pending txn (#43)

* Update BillInfoComponent.tsx * Show all pending txns * Fix typo
hyperbudget · Feb 10, 2020 · 402e409 · 402e409
1 parent b8b9cc1
commit 402e409
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/components/NextBill/BillInfoComponent.tsx b/src/components/NextBill/BillInfoComponent.tsx
@@ -10,11 +10,12 @@ interface BillInfoComponentProps {
 
 export const BillInfoComponent = (props: BillInfoComponentProps) => (
   <div>
-    <p>Next {props.type} around the <b>{moment(props.transactions[0].date).format('Do')}</b>:</p>
+    <p>Next {props.type}:</p>
     <ul>
     {
       props.transactions.map((transaction, idx) => (
-        <li key={idx}>{transaction.description}, about <b>&pound;{transaction.debitAmount}</b></li>
+        <li key={idx}>{transaction.description}, taken around
+          {moment(transaction.date).format('Do')}, for about <b>&pound;{transaction.debitAmount}</b></li>
       ))
     }
     </ul>

diff --git a/src/components/NextBill/NextBillComponent.tsx b/src/components/NextBill/NextBillComponent.tsx
@@ -38,12 +38,7 @@ const findNextBills = (group, currentTxn: Transaction[]) => {
     ))
   ));
 
-  // find only the first closest day that has pending txns
-  const sameDayTxn = filtered.filter((txn: Transaction, _idx: number, txnArr) => (
-    moment(txn.date).startOf('day').isSame(moment(txnArr[0].date).startOf('day'))
-  ));
-
-  return sameDayTxn;
+  return filtered;
 };
 
 const findCurrent = txns => (