diff --git a/lib/helpers/widgets/expense/expense_main_components.dart b/lib/helpers/widgets/expense/expense_main_components.dart index d13afca..d843759 100644 --- a/lib/helpers/widgets/expense/expense_main_components.dart +++ b/lib/helpers/widgets/expense/expense_main_components.dart @@ -32,7 +32,7 @@ class ExpenseAppBar extends StatelessWidget implements PreferredSizeWidget { IconButton( icon: const Icon(Icons.arrow_back_ios_new, color: Colors.black, size: 20), - onPressed: () => Get.offNamed('/dashboard/finance'), + onPressed: () => Get.toNamed('/dashboard/finance'), ), MySpacing.width(8), Expanded( diff --git a/lib/routes.dart b/lib/routes.dart index 74e840a..076d455 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -126,12 +126,6 @@ getPageRoute() { page: () => Error404Screen(), middlewares: [AuthMiddleware()]), - // Finance - GetPage( - name: '/dashboard/finance', - page: () => FinanceScreen(), - middlewares: [AuthMiddleware()], - ), // Advance Payment GetPage( name: '/dashboard/advance-payment', diff --git a/lib/view/expense/expense_detail_screen.dart b/lib/view/expense/expense_detail_screen.dart index 8906244..0e54853 100644 --- a/lib/view/expense/expense_detail_screen.dart +++ b/lib/view/expense/expense_detail_screen.dart @@ -403,7 +403,7 @@ class _AppBar extends StatelessWidget implements PreferredSizeWidget { IconButton( icon: const Icon(Icons.arrow_back_ios_new, color: Colors.black, size: 20), - onPressed: () => Get.offAllNamed('/dashboard/expense-main-page'), + onPressed: () => Get.toNamed('/dashboard/expense-main-page'), ), const SizedBox(width: 8), Expanded( diff --git a/lib/view/expense/expense_screen.dart b/lib/view/expense/expense_screen.dart index e32b08a..d826b1c 100644 --- a/lib/view/expense/expense_screen.dart +++ b/lib/view/expense/expense_screen.dart @@ -32,7 +32,11 @@ class _ExpenseMainScreenState extends State void initState() { super.initState(); _tabController = TabController(length: 2, vsync: this); - expenseController.fetchExpenses(); + + // Defer expense fetch to after first build + WidgetsBinding.instance.addPostFrameCallback((_) { + expenseController.fetchExpenses(); + }); } @override