lib/pages/home.dart

@@ -9,6 +9,7 @@ import '/pages/tracked_item.dart';
 import '/pages/report.dart';
 import '/pages/settings.dart';
 import '/pages/help.dart';
+import '/db.dart';
 
 class HomePage extends StatefulWidget {
   const HomePage({

lib/pages/report.dart

@@ -11,6 +11,8 @@ import '/models/tracked_item.dart';
 /// TODO:
 /// - Projected Assets:
 ///   - Allow customization?
+///   - Fix bug where editing an item does not reflect immediately when returning to Reports page.
+///     - Currently reflects after going back to Reports the 2nd time.
 
 double _assetTotal = -1,
     _expenseMonthly = -1,
@@ -65,14 +67,18 @@ class _ProjectionPageState extends State<ProjectionPage> {
         _expenseYearly < 0) {
       _showProjections = false;
 
+      projections = Center(
+        child: SizedBox(
+          child: CircularProgressIndicator(),
+        ),
+      );
+
       Future.delayed(Duration(seconds: 1), () {
         setState(() {
           _showProjections = true;
         });
       });
-    }
-
-    if (_showProjections) {
+    } else {
       double oneMonth = _assetTotal + _incomeMonthly - _expenseMonthly,
           threeMonths = _assetTotal + (3 * (_incomeMonthly - _expenseMonthly)),
           sixMonths = _assetTotal + (6 * (_incomeMonthly - _expenseMonthly)),
@@ -128,12 +134,6 @@ class _ProjectionPageState extends State<ProjectionPage> {
           proj6,
         ],
       );
-    } else {
-      projections = Center(
-        child: SizedBox(
-          child: CircularProgressIndicator(),
-        ),
-      );
     }
 
     // Return all of the UI elements.

lib/pages/tracked_item.dart

@@ -395,6 +395,7 @@ class _TrackedItemInputDialogState extends State<TrackedItemInputDialog> {
                 : Text("Edit ${_type!.title}"),
           ),
           content: FutureBuilder<List<TrackedItem>>(
+              // TODO / TBD -- This should no longer only be Expenses.
               future: items,
               builder: (BuildContext context,
                   AsyncSnapshot<List<TrackedItem>> snapshot) {