diff --git a/mih_ui/lib/mih_config/mih_go_router.dart b/mih_ui/lib/mih_config/mih_go_router.dart index 545d04d3..d7b0726a 100644 --- a/mih_ui/lib/mih_config/mih_go_router.dart +++ b/mih_ui/lib/mih_config/mih_go_router.dart @@ -42,29 +42,29 @@ class MihGoRouterPaths { static const String mihAuthentication = '/mih-authentication'; static const String mihHome = '/'; static const String notifications = '/notifications'; - static const String forgotPassword = '/mih-authentication/forgot-password'; - static const String aboutMih = '/about'; - static const String mzansiProfileManage = '/mzansi-profile'; - static const String mzansiProfileView = '/mzansi-profile/view'; - static const String businessProfileSetup = '/business-profile/set-up'; - static const String businessProfileManage = '/business-profile/manage'; - static const String businessProfileView = '/business-profile/view'; - static const String patientProfile = '/patient-profile'; - static const String patientProfileSetup = '/patient-profile/set-up'; - static const String mzansiWallet = '/mzansi-wallet'; - static const String mzansiDirectory = '/mzansi-directory'; - static const String mihAccess = '/mih-access'; - static const String calendar = '/calendar'; - static const String appointments = '/appointments'; - static const String patientManager = '/patient-manager'; - static const String patientManagerPatient = '/patient-manager/patient'; + static const String forgotPassword = 'forgot-password'; + static const String aboutMih = 'about'; + static const String mzansiProfileManage = 'mzansi-profile'; + static const String mzansiProfileView = 'mzansi-profile/view'; + static const String businessProfileSetup = 'business-profile/set-up'; + static const String businessProfileManage = 'business-profile/manage'; + static const String businessProfileView = 'business-profile/view'; + static const String patientProfile = 'patient-profile'; + static const String patientProfileSetup = 'patient-profile/set-up'; + static const String mzansiWallet = 'mzansi-wallet'; + static const String mzansiDirectory = 'mzansi-directory'; + static const String mihAccess = 'mih-access'; + static const String calendar = 'calendar'; + static const String appointments = 'appointments'; + static const String patientManager = 'patient-manager'; + static const String patientManagerPatient = 'patient-manager/patient'; static const String fileViewer = '/file-veiwer'; static const String printPreview = '/file-veiwer/print-preview'; static const String barcodeScanner = '/scanner'; - static const String calculator = '/calculator'; - static const String mzansiAi = '/mzansi-ai'; - static const String mihMineSweeper = '/mih-minesweeper'; - static const String packageDevTest = '/package-dev'; + static const String calculator = 'calculator'; + static const String mzansiAi = 'mzansi-ai'; + static const String mihMineSweeper = 'mih-minesweeper'; + static const String packageDevTest = 'package-dev'; } class MihGoRouter { @@ -74,9 +74,9 @@ class MihGoRouter { final bool isUserSignedIn = await SuperTokens.doesSessionExist(); final unauthenticatedPaths = [ MihGoRouterPaths.mihAuthentication, - MihGoRouterPaths.forgotPassword, + "${MihGoRouterPaths.mihAuthentication}/${MihGoRouterPaths.forgotPassword}", MihGoRouterPaths.resetPassword, - MihGoRouterPaths.aboutMih, + "/${MihGoRouterPaths.aboutMih}", MihGoRouterPaths.businessProfileView, ]; KenLogger.success( @@ -101,14 +101,16 @@ class MihGoRouter { KenLogger.success("MihGoRouter: mihAuthentication"); return MihAuthentication(); }, - ), - GoRoute( - name: "forgotPassword", - path: MihGoRouterPaths.forgotPassword, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: forgotPassword"); - return const MihAuthForgotPassword(); - }, + routes: [ + GoRoute( + name: "forgotPassword", + path: MihGoRouterPaths.forgotPassword, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: forgotPassword"); + return const MihAuthForgotPassword(); + }, + ), + ], ), GoRoute( name: "resetPassword", @@ -136,115 +138,187 @@ class MihGoRouter { key: UniqueKey(), ); }, - ), - // ========================== About MIH ================================== - GoRoute( - name: "aboutMih", - path: MihGoRouterPaths.aboutMih, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: aboutMih"); - return AboutMih(); - }, - ), - // ========================== Mzansi Profile Personal ================================== - GoRoute( - name: "mzansiProfileManage", - path: MihGoRouterPaths.mzansiProfileManage, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: mzansiProfileManage"); - return MzansiProfile(); - }, - ), - GoRoute( - name: "mzansiProfileView", - path: MihGoRouterPaths.mzansiProfileView, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: mzansiProfileView"); - MzansiDirectoryProvider directoryProvider = - context.read(); - if (directoryProvider.selectedUser == null) { - WidgetsBinding.instance.addPostFrameCallback((_) { - context.go(MihGoRouterPaths.mihHome); - }); - return const SizedBox.shrink(); - } - return MzansiProfileView(); - }, - ), - // ========================== Mzansi Profile Business ================================== - GoRoute( - name: "businessProfileManage", - path: MihGoRouterPaths.businessProfileManage, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: businessProfileManage"); - return BusinesProfile(); - }, - ), - GoRoute( - name: "businessProfileView", - path: MihGoRouterPaths.businessProfileView, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: businessProfileView"); - String? businessId = state.uri.queryParameters['business_id']; - KenLogger.success("businessId: $businessId"); - MzansiDirectoryProvider directoryProvider = - context.read(); - if (directoryProvider.selectedBusiness == null && - businessId == null) { - WidgetsBinding.instance.addPostFrameCallback((_) { - context.go(MihGoRouterPaths.mihHome); - }); - return const SizedBox.shrink(); - } - return MzansiBusinessProfileView( - businessId: businessId, - fromMzansiDirectory: businessId == null, - ); - }, - ), - GoRoute( - name: "businessProfileSetup", - path: MihGoRouterPaths.businessProfileSetup, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: businessProfileSetup"); - return MzansiSetUpBusinessProfile(); - }, - ), - // ========================== MIH Calculator ================================== - GoRoute( - name: "mihCalculator", - path: MihGoRouterPaths.calculator, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: mihCalculator"); - return MIHCalculator(); - }, - ), - // ========================== MIH Calculator ================================== - GoRoute( - name: "mihCalendar", - path: MihGoRouterPaths.calendar, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: mihCalendar"); - return MzansiCalendar(); - }, - ), - // ========================== Mzansi AI ================================== - GoRoute( - name: "mzansiAi", - path: MihGoRouterPaths.mzansiAi, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: mzansiAi"); - return MzansiAi(); - }, - ), - // ========================== Mzansi Wallet ================================== - GoRoute( - name: "mzansiWallet", - path: MihGoRouterPaths.mzansiWallet, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: mzansiWallet"); - return MihWallet(); - }, + routes: [ + // ========================== About MIH ================================== + GoRoute( + name: "aboutMih", + path: MihGoRouterPaths.aboutMih, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: aboutMih"); + return AboutMih(); + }, + ), + // ========================== Mzansi Profile Personal ================================== + GoRoute( + name: "mzansiProfileManage", + path: MihGoRouterPaths.mzansiProfileManage, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: mzansiProfileManage"); + return MzansiProfile(); + }, + ), + GoRoute( + name: "mzansiProfileView", + path: MihGoRouterPaths.mzansiProfileView, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: mzansiProfileView"); + MzansiDirectoryProvider directoryProvider = + context.read(); + if (directoryProvider.selectedUser == null) { + WidgetsBinding.instance.addPostFrameCallback((_) { + context.go(MihGoRouterPaths.mihHome); + }); + return const SizedBox.shrink(); + } + return MzansiProfileView(); + }, + ), + // ========================== Mzansi Profile Business ================================== + GoRoute( + name: "businessProfileManage", + path: MihGoRouterPaths.businessProfileManage, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: businessProfileManage"); + return BusinesProfile(); + }, + ), + GoRoute( + name: "businessProfileView", + path: MihGoRouterPaths.businessProfileView, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: businessProfileView"); + String? businessId = state.uri.queryParameters['business_id']; + KenLogger.success("businessId: $businessId"); + MzansiDirectoryProvider directoryProvider = + context.read(); + if (directoryProvider.selectedBusiness == null && + businessId == null) { + WidgetsBinding.instance.addPostFrameCallback((_) { + context.go(MihGoRouterPaths.mihHome); + }); + return const SizedBox.shrink(); + } + return MzansiBusinessProfileView( + businessId: businessId, + fromMzansiDirectory: businessId == null, + ); + }, + ), + GoRoute( + name: "businessProfileSetup", + path: MihGoRouterPaths.businessProfileSetup, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: businessProfileSetup"); + return MzansiSetUpBusinessProfile(); + }, + ), + // ========================== MIH Calculator ================================== + GoRoute( + name: "mihCalculator", + path: MihGoRouterPaths.calculator, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: mihCalculator"); + return MIHCalculator(); + }, + ), + // ========================== MIH Calculator ================================== + GoRoute( + name: "mihCalendar", + path: MihGoRouterPaths.calendar, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: mihCalendar"); + return MzansiCalendar(); + }, + ), + // ========================== Mzansi AI ================================== + GoRoute( + name: "mzansiAi", + path: MihGoRouterPaths.mzansiAi, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: mzansiAi"); + return MzansiAi(); + }, + ), + // ========================== Mzansi Wallet ================================== + GoRoute( + name: "mzansiWallet", + path: MihGoRouterPaths.mzansiWallet, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: mzansiWallet"); + return MihWallet(); + }, + ), + // ========================== MIH Access Controls ================================== + GoRoute( + name: "mihAccess", + path: MihGoRouterPaths.mihAccess, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: mihAccess"); + return MihAccess(); + }, + ), + // ========================== Test Package ================================== + GoRoute( + name: "testPackage", + path: MihGoRouterPaths.packageDevTest, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: testPackage"); + return PackageTest(); + }, + ), + // ========================== Mzansi Directory ================================== + GoRoute( + name: "mzansiDirectory", + path: MihGoRouterPaths.mzansiDirectory, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: mzansiDirectory"); + return MzansiDirectory(); + }, + ), + // ========================== MIH Minesweeper ================================== + GoRoute( + name: "mihMinesweeper", + path: MihGoRouterPaths.mihMineSweeper, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: mihMineSweeper"); + return MihMineSweeper(); + }, + ), + // ========================== Patient Profile ================================== + GoRoute( + name: "patientProfile", + path: MihGoRouterPaths.patientProfile, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: patientProfile"); + return PatientProfile(); + }, + ), + GoRoute( + name: "patientProfileSetup", + path: MihGoRouterPaths.patientProfileSetup, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: patientProfileSetup"); + return PatientSetUp(); + }, + ), + GoRoute( + name: "patientManager", + path: MihGoRouterPaths.patientManager, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: patientManager"); + return PatManager(); + }, + ), + GoRoute( + name: "patientManagerPatient", + path: MihGoRouterPaths.patientManagerPatient, + builder: (BuildContext context, GoRouterState state) { + KenLogger.success("MihGoRouter: patientManagerPatient"); + return PatientProfile(); + }, + ), + // ========================== End ================================== + ], ), GoRoute( name: "barcodeScanner", @@ -262,67 +336,6 @@ class MihGoRouter { return MihBarcodeScanner(cardNumberController: args); }, ), - // ========================== Test Package ================================== - GoRoute( - name: "testPackage", - path: MihGoRouterPaths.packageDevTest, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: testPackage"); - return PackageTest(); - }, - ), - // ========================== MIH Access Controls ================================== - GoRoute( - name: "mihAccess", - path: MihGoRouterPaths.mihAccess, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: mihAccess"); - return MihAccess(); - }, - ), - // ========================== Patient Profile ================================== - GoRoute( - name: "patientProfile", - path: MihGoRouterPaths.patientProfile, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: patientProfile"); - return PatientProfile(); - }, - ), - GoRoute( - name: "patientProfileSetup", - path: MihGoRouterPaths.patientProfileSetup, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: patientProfileSetup"); - return PatientSetUp(); - }, - ), - GoRoute( - name: "patientManager", - path: MihGoRouterPaths.patientManager, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: patientManager"); - return PatManager(); - }, - ), - GoRoute( - name: "patientManagerPatient", - path: MihGoRouterPaths.patientManagerPatient, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: patientManagerPatient"); - return PatientProfile(); - }, - ), - // ========================== Mzansi Directory ================================== - GoRoute( - name: "mzansiDirectory", - path: MihGoRouterPaths.mzansiDirectory, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: mzansiDirectory"); - return MzansiDirectory(); - }, - ), - // ========================== End ================================== GoRoute( name: "fileViewer", path: MihGoRouterPaths.fileViewer, @@ -347,15 +360,6 @@ class MihGoRouter { return MIHPrintPreview(arguments: args); }, ), - // ========================== MIH Minesweeper ================================== - GoRoute( - name: "mihMinesweeper", - path: MihGoRouterPaths.mihMineSweeper, - builder: (BuildContext context, GoRouterState state) { - KenLogger.success("MihGoRouter: mihMineSweeper"); - return MihMineSweeper(); - }, - ), // ========================== End ================================== // GoRoute( // name: "notifications", diff --git a/mih_ui/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart b/mih_ui/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart index 35421ee1..fc10a30b 100644 --- a/mih_ui/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart +++ b/mih_ui/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart @@ -18,7 +18,7 @@ class _AboutMihTileState extends State { Widget build(BuildContext context) { return MihPackageTile( onTap: () { - context.pushNamed( + context.goNamed( "aboutMih", ); // Navigator.of(context).pushNamed( diff --git a/mih_ui/lib/mih_packages/access_review/package_tile/mih_access_tile.dart b/mih_ui/lib/mih_packages/access_review/package_tile/mih_access_tile.dart index 061015f4..0bf7cc93 100644 --- a/mih_ui/lib/mih_packages/access_review/package_tile/mih_access_tile.dart +++ b/mih_ui/lib/mih_packages/access_review/package_tile/mih_access_tile.dart @@ -20,7 +20,7 @@ class _MihAccessTileState extends State { return MihPackageTile( authenticateUser: true, onTap: () { - context.pushNamed( + context.goNamed( "mihAccess", ); // Navigator.of(context).pushNamed( @@ -30,7 +30,7 @@ class _MihAccessTileState extends State { }, packageName: "Access Controls", packageIcon: Icon( - MihIcons.accessControl, + MihIcons.mihAccessControls, color: MihColors.secondary(), // size: widget.packageSize, ), diff --git a/mih_ui/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart b/mih_ui/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart index 07cfc5ab..40a475e5 100644 --- a/mih_ui/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart +++ b/mih_ui/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart @@ -19,13 +19,13 @@ class _MihCalculatorTileState extends State { Widget build(BuildContext context) { return MihPackageTile( onTap: () { - context.pushNamed( + context.goNamed( "mihCalculator", ); }, packageName: "Calculator", packageIcon: Icon( - MihIcons.calculator, + MihIcons.mihCalculator, color: MihColors.secondary(), // size: widget.packageSize, ), diff --git a/mih_ui/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart b/mih_ui/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart index 04a1d612..c53fd0d5 100644 --- a/mih_ui/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart +++ b/mih_ui/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart @@ -19,7 +19,7 @@ class _MzansiCalendarTileState extends State { Widget build(BuildContext context) { return MihPackageTile( onTap: () { - context.pushNamed( + context.goNamed( "mihCalendar", ); // Navigator.of(context).pushNamed( @@ -29,7 +29,7 @@ class _MzansiCalendarTileState extends State { }, packageName: "Calendar", packageIcon: Icon( - MihIcons.calendar, + MihIcons.mihCalendar, color: MihColors.secondary(), // size: widget.packageSize, ), diff --git a/mih_ui/lib/mih_packages/mih_authentication/mih_authentication.dart b/mih_ui/lib/mih_packages/mih_authentication/mih_authentication.dart index e39e0c04..8f9d105c 100644 --- a/mih_ui/lib/mih_packages/mih_authentication/mih_authentication.dart +++ b/mih_ui/lib/mih_packages/mih_authentication/mih_authentication.dart @@ -75,7 +75,7 @@ class _MihAuthenticationState extends State { iconColor: MihColors.secondary(), iconSize: 45, onTap: () { - context.goNamed("aboutMih", extra: true); + context.pushNamed("aboutMih", extra: true); }, ), ); diff --git a/mih_ui/lib/mih_packages/mine_sweeper/package_tiles/mih_mine_sweeper_tile.dart b/mih_ui/lib/mih_packages/mine_sweeper/package_tiles/mih_mine_sweeper_tile.dart index a3785dbb..c520b0c6 100644 --- a/mih_ui/lib/mih_packages/mine_sweeper/package_tiles/mih_mine_sweeper_tile.dart +++ b/mih_ui/lib/mih_packages/mine_sweeper/package_tiles/mih_mine_sweeper_tile.dart @@ -18,13 +18,13 @@ class _MihMineSweeperTileState extends State { Widget build(BuildContext context) { return MihPackageTile( onTap: () { - context.pushNamed( + context.goNamed( "mihMinesweeper", ); }, packageName: "Minesweeper", packageIcon: Icon( - MihIcons.mineSweeper, + MihIcons.mihMinesweeper, color: MihColors.secondary(), // size: widget.packageSize, ), diff --git a/mih_ui/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart b/mih_ui/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart index f99cc442..858a756c 100644 --- a/mih_ui/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart +++ b/mih_ui/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart @@ -19,7 +19,7 @@ class _MzansiAiTileState extends State { Widget build(BuildContext context) { return MihPackageTile( onTap: () { - context.pushNamed( + context.goNamed( 'mzansiAi', ); // Navigator.of(context).pushNamed( diff --git a/mih_ui/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart b/mih_ui/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart index 1e6834cd..ac2e0ad9 100644 --- a/mih_ui/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart +++ b/mih_ui/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart @@ -18,7 +18,7 @@ class _MzansiDirectoryTileState extends State { Widget build(BuildContext context) { return MihPackageTile( onTap: () { - context.pushNamed( + context.goNamed( "mzansiDirectory", ); // Navigator.of(context).pushNamed( diff --git a/mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart b/mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart index cf8b271c..6556b07a 100644 --- a/mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart +++ b/mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart @@ -19,7 +19,7 @@ class _MzansiBusinessProfileTileState extends State { Widget build(BuildContext context) { return MihPackageTile( onTap: () { - context.pushNamed( + context.goNamed( "businessProfileManage", ); // Navigator.of(context).pushNamed( diff --git a/mih_ui/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart b/mih_ui/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart index e1e7d961..9753de43 100644 --- a/mih_ui/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart +++ b/mih_ui/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart @@ -20,7 +20,7 @@ class _MzansiProfileTileState extends State { // ImageProvider logo = MzansiInnovationHub.of(context)!.theme.logoImage(); return MihPackageTile( onTap: () { - context.pushNamed( + context.goNamed( 'mzansiProfileManage', ); }, diff --git a/mih_ui/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart b/mih_ui/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart index e804c9db..47d915eb 100644 --- a/mih_ui/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart +++ b/mih_ui/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart @@ -20,7 +20,7 @@ class _MihWalletTileState extends State { return MihPackageTile( // authenticateUser: true, onTap: () { - context.pushNamed( + context.goNamed( 'mzansiWallet', ); // Navigator.of(context).pushNamed( diff --git a/mih_ui/lib/mih_packages/patient_manager/pat_manager/package_tiles/pat_manager_tile.dart b/mih_ui/lib/mih_packages/patient_manager/pat_manager/package_tiles/pat_manager_tile.dart index a31464fb..e037b3f8 100644 --- a/mih_ui/lib/mih_packages/patient_manager/pat_manager/package_tiles/pat_manager_tile.dart +++ b/mih_ui/lib/mih_packages/patient_manager/pat_manager/package_tiles/pat_manager_tile.dart @@ -22,7 +22,7 @@ class _PatManagerTileState extends State { return MihPackageTile( authenticateUser: true, onTap: () { - context.pushNamed( + context.goNamed( 'patientManager', ); // Navigator.of(context).pushNamed( diff --git a/mih_ui/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart b/mih_ui/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart index ba527e8d..64d02191 100644 --- a/mih_ui/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart +++ b/mih_ui/lib/mih_packages/patient_manager/pat_profile/package_tiles/patient_profile_tile.dart @@ -25,7 +25,7 @@ class _PatientProfileTileState extends State { PatientManagerProvider patManProvider = context.read(); patManProvider.setPersonalMode(true); - context.pushNamed("patientProfile"); + context.goNamed("patientProfile"); }, packageName: "Patient Profile", packageIcon: Icon(