diff --git a/lib/core/viewModels/project_view_model.dart b/lib/core/viewModels/project_view_model.dart
index ed752b50..c231d455 100644
--- a/lib/core/viewModels/project_view_model.dart
+++ b/lib/core/viewModels/project_view_model.dart
@@ -8,7 +8,7 @@ import 'package:flutter/cupertino.dart';
 class ProjectViewModel with ChangeNotifier {
   AppSharedPreferences sharedPref = AppSharedPreferences();
   Locale _appLocale;
-  String currentLanguage = 'ar';
+  String currentLanguage = 'en';
   bool _isArabic = false;
   bool isInternetConnection = true;
   bool isLoading = false;
diff --git a/lib/main.dart b/lib/main.dart
index ca2e7a82..a1944fd0 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,7 +1,4 @@
-import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
-import 'package:diplomaticquarterapp/pages/login/login.dart';
 import 'package:diplomaticquarterapp/routes.dart';
-import 'package:diplomaticquarterapp/uitl/navigation_service.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart
index 03370d82..9dc97373 100644
--- a/lib/pages/BookAppointment/components/SearchByClinic.dart
+++ b/lib/pages/BookAppointment/components/SearchByClinic.dart
@@ -148,7 +148,8 @@ class _SearchByClinicState extends State<SearchByClinic> {
       context,
       MaterialPageRoute(
         builder: (context) =>
-            BranchView(doctorsList: docList, result: result, num: numAll),
+//            BranchView(doctorsList: docList, result: result, num: numAll),
+        SearchResults(doctorsList: docList),
       ),
     );
     //builder: (context) => SearchResults(doctorsList: docList)));
diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart
index f223f91f..7510987c 100644
--- a/lib/pages/login/login.dart
+++ b/lib/pages/login/login.dart
@@ -2,22 +2,17 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/config/size_config.dart';
 import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
 import 'package:diplomaticquarterapp/locator.dart';
-import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_request.dart';
 import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart';
 import 'package:diplomaticquarterapp/models/Authentication/check_paitent_authentication_req.dart';
-import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart';
-import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart';
 import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
 import 'package:diplomaticquarterapp/pages/login/login-type.dart';
 import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doctor.dart';
-import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/routes.dart';
+import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/uitl/utils.dart';
-import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
-import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart';
 import 'package:diplomaticquarterapp/widgets/input/text_field.dart';
 import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -26,7 +21,6 @@ import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 
 class Login extends StatefulWidget {
   @override
@@ -48,9 +42,16 @@ class _Login extends State<Login> {
 
   @override
   void initState() {
+//    getDeviceToken();
     super.initState();
   }
 
+  getDeviceToken() async {
+    setState(() async {
+      nationalIDorFile.text = await sharedPref.getString(PUSH_TOKEN);
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
@@ -196,7 +197,10 @@ class _Login extends State<Login> {
           this.sharedPref.setObject(USER_PROFILE, result.list),
           this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID),
           this.sharedPref.setString(TOKEN, result.authenticationTokenID),
-
+          //this.checkIfUserAgreedBefore(result),
+          Navigator.of(context).pushNamed(
+            HOME,
+          ),
           appointmentRateViewModel
               .getIsLastAppointmentRatedList()
               .then((value) => {
@@ -219,7 +223,6 @@ class _Login extends State<Login> {
                         )
                       }
                   })
-
           // SMSOTP.showLoadingDialog(context, false),
         });
   }