diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 63ae8fca..a6e14c51 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -73,7 +73,7 @@ class BaseAppClient { } else { var parsed = json.decode(response.body.toString()); if (!parsed['IsAuthenticated']) { - Navigator.of(AppGlobal.CONTEX).pushNamed(LOGIN); + await helpers.logout(); helpers.showErrorToast('Your session expired Please login agian'); } else if (parsed['MessageStatus'] == 1) { onSuccess(parsed, statusCode); diff --git a/lib/widgets/shared/app_scaffold_widget.dart b/lib/widgets/shared/app_scaffold_widget.dart index a390e064..ef8a983b 100644 --- a/lib/widgets/shared/app_scaffold_widget.dart +++ b/lib/widgets/shared/app_scaffold_widget.dart @@ -40,7 +40,7 @@ class AppScaffold extends StatelessWidget { IconButton( icon: Icon(DoctorApp.home_icon_active), color: Colors.white, //Colors.black, - onPressed: () => Navigator.popAndPushNamed(context, HOME), + onPressed: () => Navigator.pushReplacementNamed(context, HOME), ), ], )