diff --git a/lib/classes/utils.dart b/lib/classes/utils.dart
index fbdc6ce..57bb888 100644
--- a/lib/classes/utils.dart
+++ b/lib/classes/utils.dart
@@ -9,7 +9,6 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
-import 'package:mohem_flutter_app/classes/date_uitl.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/exceptions/api_exception.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
@@ -66,6 +65,7 @@ class Utils {
       showDialog(
         context: context,
         barrierColor: Colors.black.withOpacity(0.5),
+        useRootNavigator: false,
         builder: (BuildContext context) => LoadingDialog(),
       ).then((value) {
         _isLoadingVisible = false;
@@ -121,8 +121,11 @@ class Utils {
           ),
         );
       } else {
-        showToast(errorMessage);
-        // confirmDialog(cxt, errorMessage);
+        if (cxt != null) {
+          confirmDialog(cxt, errorMessage);
+        } else {
+          showToast(errorMessage);
+        }
       }
     }
   }
diff --git a/lib/ui/landing/dashboard_screen.dart b/lib/ui/landing/dashboard_screen.dart
index b1dac53..22768e6 100644
--- a/lib/ui/landing/dashboard_screen.dart
+++ b/lib/ui/landing/dashboard_screen.dart
@@ -200,7 +200,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        LocaleKeys.goodMorning.tr().toText14(color: MyColors.grey77Color),
+                        LocaleKeys.welcomeBack.tr().toText14(color: MyColors.grey77Color),
                         (AppState().memberInformationList!.eMPLOYEENAME ?? "").toText24(isBold: true),
                         16.height,
                         Row(