diff --git a/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart b/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart index 4d9155da..7c5dbe9b 100644 --- a/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart +++ b/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart @@ -105,6 +105,7 @@ class _PatientAccessRequestState extends State { Navigator.of(context).popAndPushNamed( '/', + arguments: true, ); }, ); diff --git a/Frontend/patient_manager/lib/mih_packages/appointment/appointments.dart b/Frontend/patient_manager/lib/mih_packages/appointment/appointments.dart index 73a49e0a..a25f580d 100644 --- a/Frontend/patient_manager/lib/mih_packages/appointment/appointments.dart +++ b/Frontend/patient_manager/lib/mih_packages/appointment/appointments.dart @@ -227,6 +227,7 @@ class _PatientAccessRequestState extends State { Navigator.of(context).popAndPushNamed( '/', + arguments: true, ); }, ); diff --git a/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart b/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart index eb6837e3..8222697b 100644 --- a/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart +++ b/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart @@ -294,6 +294,7 @@ class _ManageBusinessProfileState extends State { Navigator.of(context).popAndPushNamed( '/', + arguments: false, ); }, ); diff --git a/Frontend/patient_manager/lib/mih_packages/mih_home/mih_home.dart b/Frontend/patient_manager/lib/mih_packages/mih_home/mih_home.dart index 9b81d3bd..ed456ee4 100644 --- a/Frontend/patient_manager/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/patient_manager/lib/mih_packages/mih_home/mih_home.dart @@ -40,6 +40,7 @@ class MIHHome extends StatefulWidget { final bool isBusinessUser; final bool isBusinessUserNew; final bool isDevActive; + final bool personalSelected; const MIHHome({ super.key, required this.signedInUser, @@ -51,6 +52,7 @@ class MIHHome extends StatefulWidget { required this.isBusinessUser, required this.isBusinessUserNew, required this.isDevActive, + required this.personalSelected, }); @override @@ -849,6 +851,11 @@ class _MIHHomeState extends State { businessUserSwitch = false; notifiList = widget.notifications; }); + if (!widget.personalSelected) { + setState(() { + _selectedIndex = 1; + }); + } WidgetsBinding.instance.addPostFrameCallback((_) { notificationPopUp(); }); diff --git a/Frontend/patient_manager/lib/mih_packages/mih_home/mih_profile_getter.dart b/Frontend/patient_manager/lib/mih_packages/mih_home/mih_profile_getter.dart index b9fa9b77..cbec489e 100644 --- a/Frontend/patient_manager/lib/mih_packages/mih_home/mih_profile_getter.dart +++ b/Frontend/patient_manager/lib/mih_packages/mih_home/mih_profile_getter.dart @@ -12,8 +12,10 @@ import 'package:patient_manager/mih_objects/business_user.dart'; import 'package:patient_manager/mih_packages/mih_home/mih_home.dart'; class MIHProfileGetter extends StatefulWidget { + final bool personalSelected; const MIHProfileGetter({ super.key, + required this.personalSelected, }); @override @@ -102,6 +104,7 @@ class _MIHProfileGetterState extends State { isBusinessUser: isBusinessUser(snapshot.requireData.signedInUser), isBusinessUserNew: isBusinessUserNew(snapshot.data!.businessUser), isDevActive: isDevActive(), + personalSelected: widget.personalSelected, ); } else { return MIHLayoutBuilder( diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart index 1ac986b0..6cb9ce52 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart @@ -510,6 +510,7 @@ class _PatientManagerState extends State { Navigator.of(context).popAndPushNamed( '/', + arguments: false, ); }, ); diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart index dd4a3d19..4e938bf6 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart @@ -111,9 +111,9 @@ class _PatientViewState extends State { iconSize: 35, onTap: () { Navigator.of(context).pop(); - Navigator.of(context).popAndPushNamed( '/', + arguments: true, ); }, );