From d9a2b781a2af69df726a63a02382b237df194d08 Mon Sep 17 00:00:00 2001
From: Eric Windmill <eric@ericwindmill.com>
Date: Fri, 19 Jun 2026 14:54:02 -0700
Subject: [PATCH] Various simple fixes (#2866)

*Replace this paragraph with a description of what this PR is changing
or adding, and why. Consider including before/after screenshots.*

*List which issues are fixed by this PR. For larger changes, raising an
issue first helps
reduce redundant work.*

## Pre-launch Checklist

- [ ] I read the [Flutter Style Guide] _recently_, and have followed its
advice.
- [ ] I signed the [CLA].
- [ ] I read the [Contributors Guide].
- [ ] I have added sample code updates to the [changelog].
- [ ] I updated/added relevant documentation (doc comments with `///`).


If you need help, consider asking for advice on the #hackers-devrel
channel on [Discord].

<!-- Links -->
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md
[CLA]: https://cla.developers.google.com/
[Discord]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
[Contributors Guide]:
https://github.com/flutter/samples/blob/main/CONTRIBUTING.md
[changelog]: ../CHANGELOG.md
---
 compass_app/app/lib/routing/router.dart             | 10 ++--------
 .../lib/ui/home/widgets/home_screen_container.dart  | 13 +++++++++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/compass_app/app/lib/routing/router.dart b/compass_app/app/lib/routing/router.dart
index 284706850..2d3030085 100644
--- a/compass_app/app/lib/routing/router.dart
+++ b/compass_app/app/lib/routing/router.dart
@@ -14,8 +14,7 @@ import '../ui/auth/login/widgets/login_screen.dart';
 import '../ui/auth/logout/view_models/logout_viewmodel.dart';
 import '../ui/booking/view_models/booking_viewmodel.dart';
 import '../ui/booking/widgets/booking_screen.dart';
-import '../ui/home/view_models/home_viewmodel.dart';
-import '../ui/home/widgets/home_screen.dart';
+import '../ui/home/widgets/home_screen_container.dart';
 import '../ui/results/view_models/results_viewmodel.dart';
 import '../ui/results/widgets/results_screen.dart';
 import '../ui/search_form/view_models/search_form_viewmodel.dart';
@@ -43,16 +42,11 @@ GoRouter router(AuthRepository authRepository) => GoRouter(
     GoRoute(
       path: Routes.home,
       builder: (context, state) {
-        final viewModel = HomeViewModel(
-          bookingRepository: context.read(),
-          userRepository: context.read(),
-        );
         final logoutViewModel = LogoutViewModel(
           authRepository: context.read(),
           itineraryConfigRepository: context.read(),
         );
-        return HomeScreen(
-          viewModel: viewModel,
+        return HomeScreenContainer(
           logoutViewModel: logoutViewModel,
         );
       },
diff --git a/compass_app/app/lib/ui/home/widgets/home_screen_container.dart b/compass_app/app/lib/ui/home/widgets/home_screen_container.dart
index c62fbc3c1..31608b1a5 100644
--- a/compass_app/app/lib/ui/home/widgets/home_screen_container.dart
+++ b/compass_app/app/lib/ui/home/widgets/home_screen_container.dart
@@ -3,11 +3,17 @@ import 'package:provider/provider.dart';
 
 import '../../../data/repositories/booking/booking_repository.dart';
 import '../../../data/repositories/user/user_repository.dart';
+import '../../auth/logout/view_models/logout_viewmodel.dart';
 import '../view_models/home_viewmodel.dart';
 import 'home_screen.dart';
 
 class HomeScreenContainer extends StatefulWidget {
-  const HomeScreenContainer({super.key});
+  const HomeScreenContainer({
+    super.key,
+    required this.logoutViewModel,
+  });
+
+  final LogoutViewModel logoutViewModel;
 
   @override
   State<HomeScreenContainer> createState() => _HomeScreenContainerState();
@@ -28,7 +34,10 @@ class _HomeScreenContainerState extends State<HomeScreenContainer> {
 
   @override
   Widget build(BuildContext context) {
-    return HomeScreen(viewModel: _viewModel);
+    return HomeScreen(
+      viewModel: _viewModel,
+      logoutViewModel: widget.logoutViewModel,
+    );
   }
 
   @override