@@ -1723,18 +1732,18 @@ function Bucket({ label, rows, year, month, refresh, onEditBill, loading }) {
-
+
Bill
- Due
+ Due
Expected
- Last Month
+ Last Month
Paid
Paid Date
Status
-
-
+
+
Notes
@@ -1782,6 +1791,7 @@ function Bucket({ label, rows, year, month, refresh, onEditBill, loading }) {
refresh={refresh}
index={i}
onEditBill={onEditBill}
+ compact={compact}
/>
))
)}
@@ -1918,6 +1928,7 @@ export default function TrackerPage() {
}, [filters, rows, search]);
const first = filteredRows.filter(r => r.bucket === '1st');
const second = filteredRows.filter(r => r.bucket === '15th');
+ const hasBoth = first.length > 0 && second.length > 0;
return (
@@ -2038,12 +2049,6 @@ export default function TrackerPage() {
onEdit={() => setEditStartingOpen(true)}
/>
-
{summary.trend && }
@@ -2116,8 +2121,12 @@ export default function TrackerPage() {
)}
- {!isError && first.length > 0 && }
- {!isError && second.length > 0 && }
+ {!isError && (first.length > 0 || second.length > 0) && (
+
+ {first.length > 0 && }
+ {second.length > 0 && }
+
+ )}
{/* Edit Bill modal β opened by clicking a bill name in any tracker row */}
{editBillData && (
diff --git a/package.json b/package.json
index 12bcf9b..37ffacb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "bill-tracker",
- "version": "0.33.8.4",
+ "version": "0.33.8.5",
"description": "Monthly bill tracking system",
"main": "server.js",
"scripts": {