diff --git a/lib/constant/const_texts.dart b/lib/constant/const_texts.dart
index b44803e..84d9357 100644
--- a/lib/constant/const_texts.dart
+++ b/lib/constant/const_texts.dart
@@ -158,6 +158,6 @@ class ConstTexts {
   // static String ok = "ok";
   // static String freeDelivery = "freeDelivery";
   // static String upto = "upto";
-  // static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption";
+  static String doYouWantChangeTheDeliverOption = "doYouWantChangeTheDeliverOption";
   // static String cash = "cash";
 }
diff --git a/lib/controllers/0n_demand_payment_controller.dart b/lib/controllers/0n_demand_payment_controller.dart
index fd66a94..d6d0355 100644
--- a/lib/controllers/0n_demand_payment_controller.dart
+++ b/lib/controllers/0n_demand_payment_controller.dart
@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:customer/constant/const_texts.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
diff --git a/lib/controllers/Intercity_home_controller.dart b/lib/controllers/Intercity_home_controller.dart
index 5528c5e..a4ebf2e 100644
--- a/lib/controllers/Intercity_home_controller.dart
+++ b/lib/controllers/Intercity_home_controller.dart
@@ -833,8 +833,9 @@ class IntercityHomeController extends GetxController {
 
   Future<void> fetchGoogleRouteWithWaypoints() async {
     if (departureLatLong.value.latitude == 0.0 ||
-        destinationLatLong.value.latitude == 0.0)
+        destinationLatLong.value.latitude == 0.0) {
       return;
+    }
 
     final origin =
         '${departureLatLong.value.latitude},${departureLatLong.value.longitude}';
diff --git a/lib/controllers/cab_booking_controller.dart b/lib/controllers/cab_booking_controller.dart
index f894af3..445b980 100644
--- a/lib/controllers/cab_booking_controller.dart
+++ b/lib/controllers/cab_booking_controller.dart
@@ -824,8 +824,9 @@ class CabBookingController extends GetxController {
 
   Future<void> fetchGoogleRouteWithWaypoints() async {
     if (departureLatLong.value.latitude == 0.0 ||
-        destinationLatLong.value.latitude == 0.0)
+        destinationLatLong.value.latitude == 0.0) {
       return;
+    }
 
     final origin =
         '${departureLatLong.value.latitude},${departureLatLong.value.longitude}';
diff --git a/lib/controllers/login_controller.dart b/lib/controllers/login_controller.dart
index 52dbfad..0f53c7b 100644
--- a/lib/controllers/login_controller.dart
+++ b/lib/controllers/login_controller.dart
@@ -1,6 +1,5 @@
 import 'dart:convert';
 import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/controllers/on_demand_booking_controller.dart b/lib/controllers/on_demand_booking_controller.dart
index 91978f1..31c0f2d 100644
--- a/lib/controllers/on_demand_booking_controller.dart
+++ b/lib/controllers/on_demand_booking_controller.dart
@@ -3,7 +3,6 @@ import 'package:customer/constant/const_texts.dart';
 import 'package:customer/constant/constant.dart';
 import 'package:customer/models/coupon_model.dart';
 import 'package:customer/models/user_model.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
diff --git a/lib/controllers/otp_verification_controller.dart b/lib/controllers/otp_verification_controller.dart
index 7c6712a..d024101 100644
--- a/lib/controllers/otp_verification_controller.dart
+++ b/lib/controllers/otp_verification_controller.dart
@@ -1,6 +1,5 @@
 import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
 import 'package:customer/themes/show_toast_dialog.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/controllers/rental_conformation_controller.dart b/lib/controllers/rental_conformation_controller.dart
index 0c4c3e1..d1f2d65 100644
--- a/lib/controllers/rental_conformation_controller.dart
+++ b/lib/controllers/rental_conformation_controller.dart
@@ -5,7 +5,6 @@ import 'package:customer/models/coupon_model.dart';
 import 'package:customer/models/rental_order_model.dart';
 import 'package:customer/service/fire_store_utils.dart';
 import 'package:customer/themes/show_toast_dialog.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
diff --git a/lib/controllers/service_list_controller.dart b/lib/controllers/service_list_controller.dart
index 19d08ed..55723e0 100644
--- a/lib/controllers/service_list_controller.dart
+++ b/lib/controllers/service_list_controller.dart
@@ -13,7 +13,6 @@ import 'package:customer/models/currency_model.dart';
 import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/round_button_fill.dart';
 import 'package:customer/themes/show_toast_dialog.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:firebase_auth/firebase_auth.dart' as auth;
 import 'package:flutter/material.dart';
diff --git a/lib/controllers/sign_up_controller.dart b/lib/controllers/sign_up_controller.dart
index 8760fcd..fda5d6a 100644
--- a/lib/controllers/sign_up_controller.dart
+++ b/lib/controllers/sign_up_controller.dart
@@ -1,7 +1,6 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:customer/models/user_model.dart';
 import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
diff --git a/lib/controllers/splash_controller.dart b/lib/controllers/splash_controller.dart
index 2052507..d1efa12 100644
--- a/lib/controllers/splash_controller.dart
+++ b/lib/controllers/splash_controller.dart
@@ -4,7 +4,6 @@ import 'package:customer/constant/constant.dart';
 import 'package:customer/models/user_model.dart';
 import 'package:customer/screen_ui/maintenance_mode_screen/maintenance_mode_screen.dart';
 import 'package:customer/screen_ui/service_home_screen/service_list_screen.dart';
-import 'package:customer/utils/app_router.dart';
 import 'package:customer/utils/notification_service.dart';
 import 'package:customer/utils/preferences.dart';
 import 'package:firebase_auth/firebase_auth.dart';
diff --git a/lib/screen_ui/auth_screens/forgot_password_screen.dart b/lib/screen_ui/auth_screens/forgot_password_screen.dart
index 24c08a0..22a935a 100644
--- a/lib/screen_ui/auth_screens/forgot_password_screen.dart
+++ b/lib/screen_ui/auth_screens/forgot_password_screen.dart
@@ -1,5 +1,4 @@
 import 'package:customer/constant/const_texts.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/screen_ui/auth_screens/login_screen.dart b/lib/screen_ui/auth_screens/login_screen.dart
index c20f8b9..96a21a4 100644
--- a/lib/screen_ui/auth_screens/login_screen.dart
+++ b/lib/screen_ui/auth_screens/login_screen.dart
@@ -3,7 +3,6 @@ import 'dart:io';
 import 'package:customer/constant/const_texts.dart';
 import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart';
 import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/screen_ui/auth_screens/mobile_login_screen.dart b/lib/screen_ui/auth_screens/mobile_login_screen.dart
index bb60041..83b111d 100644
--- a/lib/screen_ui/auth_screens/mobile_login_screen.dart
+++ b/lib/screen_ui/auth_screens/mobile_login_screen.dart
@@ -2,7 +2,6 @@ import 'package:country_code_picker/country_code_picker.dart';
 import 'package:customer/constant/const_texts.dart';
 import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart';
 import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/screen_ui/auth_screens/otp_verification_screen.dart b/lib/screen_ui/auth_screens/otp_verification_screen.dart
index 54d4231..be6ca52 100644
--- a/lib/screen_ui/auth_screens/otp_verification_screen.dart
+++ b/lib/screen_ui/auth_screens/otp_verification_screen.dart
@@ -1,6 +1,5 @@
 import 'package:customer/constant/const_texts.dart';
 import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/screen_ui/auth_screens/sign_up_screen.dart b/lib/screen_ui/auth_screens/sign_up_screen.dart
index a46a796..94aae9d 100644
--- a/lib/screen_ui/auth_screens/sign_up_screen.dart
+++ b/lib/screen_ui/auth_screens/sign_up_screen.dart
@@ -1,7 +1,6 @@
 import 'package:country_code_picker/country_code_picker.dart';
 import 'package:customer/constant/const_texts.dart';
 import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/screen_ui/cab_service_screens/cab_home_screen.dart b/lib/screen_ui/cab_service_screens/cab_home_screen.dart
index a498ceb..c7f98c5 100644
--- a/lib/screen_ui/cab_service_screens/cab_home_screen.dart
+++ b/lib/screen_ui/cab_service_screens/cab_home_screen.dart
@@ -5,7 +5,6 @@ import 'package:customer/controllers/theme_controller.dart';
 import 'package:customer/models/banner_model.dart';
 import 'package:customer/screen_ui/auth_screens/login_screen.dart';
 import 'package:customer/themes/app_them_data.dart';
-import 'package:customer/utils/app_router.dart';
 import 'package:customer/utils/network_image_widget.dart';
 
 import 'package:flutter/material.dart';
diff --git a/lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart b/lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart
index 5f427aa..e736473 100644
--- a/lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart
+++ b/lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart
@@ -6,7 +6,6 @@ import 'package:customer/screen_ui/auth_screens/login_screen.dart';
 import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
 import 'package:customer/themes/round_button_fill.dart';
 import 'package:customer/themes/show_toast_dialog.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
diff --git a/lib/screen_ui/location_enable_screens/location_permission_screen.dart b/lib/screen_ui/location_enable_screens/location_permission_screen.dart
index 1a7726c..abfbe1e 100644
--- a/lib/screen_ui/location_enable_screens/location_permission_screen.dart
+++ b/lib/screen_ui/location_enable_screens/location_permission_screen.dart
@@ -7,7 +7,6 @@ import 'package:customer/screen_ui/service_home_screen/service_list_screen.dart'
 import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/round_button_fill.dart';
 import 'package:customer/themes/show_toast_dialog.dart';
-import 'package:customer/utils/app_router.dart';
 import 'package:customer/widget/osm_map/map_picker_page.dart';
 import 'package:customer/widget/place_picker/location_picker_screen.dart';
 import 'package:customer/widget/place_picker/selected_location_model.dart';
diff --git a/lib/screen_ui/multi_vendor_service/cart_screen/oder_placing_screens.dart b/lib/screen_ui/multi_vendor_service/cart_screen/oder_placing_screens.dart
index 3b711ac..da23019 100644
--- a/lib/screen_ui/multi_vendor_service/cart_screen/oder_placing_screens.dart
+++ b/lib/screen_ui/multi_vendor_service/cart_screen/oder_placing_screens.dart
@@ -6,7 +6,6 @@ import 'package:customer/models/cart_product_model.dart';
 import 'package:customer/screen_ui/ecommarce/dash_board_e_commerce_screen.dart';
 import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/round_button_fill.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
diff --git a/lib/screen_ui/multi_vendor_service/change langauge/change_language_screen.dart b/lib/screen_ui/multi_vendor_service/change langauge/change_language_screen.dart
index 068d870..0fa45f0 100644
--- a/lib/screen_ui/multi_vendor_service/change langauge/change_language_screen.dart	
+++ b/lib/screen_ui/multi_vendor_service/change langauge/change_language_screen.dart	
@@ -1,7 +1,6 @@
 import 'package:customer/constant/const_texts.dart';
 import 'package:customer/constant/constant.dart';
 import 'package:customer/controllers/change_language_controller.dart';
-import 'package:customer/screen_ui/splash_screen/splash_screen.dart';
 import 'package:customer/service/localization_service.dart';
 import 'package:customer/themes/app_them_data.dart';
 
diff --git a/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_screen.dart b/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_screen.dart
index 5000f82..fda2471 100644
--- a/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_screen.dart
+++ b/lib/screen_ui/multi_vendor_service/dine_in_screeen/dine_in_screen.dart
@@ -10,7 +10,6 @@ import 'package:customer/screen_ui/multi_vendor_service/dine_in_screeen/view_all
 import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/responsive.dart';
 import 'package:customer/themes/round_button_fill.dart';
-import 'package:customer/utils/app_router.dart';
 import 'package:customer/utils/network_image_widget.dart';
 
 import 'package:flutter/material.dart';
diff --git a/lib/screen_ui/multi_vendor_service/favourite_screens/favourite_screen.dart b/lib/screen_ui/multi_vendor_service/favourite_screens/favourite_screen.dart
index 97cf5ba..e51045a 100644
--- a/lib/screen_ui/multi_vendor_service/favourite_screens/favourite_screen.dart
+++ b/lib/screen_ui/multi_vendor_service/favourite_screens/favourite_screen.dart
@@ -7,7 +7,6 @@ import 'package:customer/models/vendor_model.dart';
 import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/responsive.dart';
 import 'package:customer/themes/round_button_fill.dart';
-import 'package:customer/utils/app_router.dart';
 
 import '../../../controllers/theme_controller.dart';
 import 'package:customer/utils/network_image_widget.dart';
diff --git a/lib/screen_ui/multi_vendor_service/gift_card/redeem_gift_card_screen.dart b/lib/screen_ui/multi_vendor_service/gift_card/redeem_gift_card_screen.dart
index 1998431..9460d82 100644
--- a/lib/screen_ui/multi_vendor_service/gift_card/redeem_gift_card_screen.dart
+++ b/lib/screen_ui/multi_vendor_service/gift_card/redeem_gift_card_screen.dart
@@ -8,7 +8,6 @@ import 'package:customer/models/wallet_transaction_model.dart';
 import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/round_button_fill.dart';
 import 'package:customer/themes/text_field_widget.dart';
-import 'package:customer/utils/app_router.dart';
 
 import '../../../controllers/theme_controller.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart b/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart
index 9764e2f..250dfa2 100644
--- a/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart
+++ b/lib/screen_ui/multi_vendor_service/home_screen/home_screen.dart
@@ -19,7 +19,6 @@ import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/custom_dialog_box.dart';
 import 'package:customer/themes/responsive.dart';
 import 'package:customer/themes/round_button_fill.dart';
-import 'package:customer/utils/app_router.dart';
 import 'package:customer/utils/network_image_widget.dart';
 import 'package:customer/utils/preferences.dart';
 import 'package:customer/widget/osm_map/map_picker_page.dart';
@@ -654,7 +653,9 @@ class HomeScreen extends StatelessWidget {
                                                   children: [
                                                     titleView(
                                                       isDark,
-                                                     ConstTexts.largestDiscounts.tr,
+                                                      ConstTexts
+                                                          .largestDiscounts
+                                                          .tr,
                                                       () {
                                                         Get.to(
                                                           const DiscountRestaurantListScreen(),
@@ -709,7 +710,9 @@ class HomeScreen extends StatelessWidget {
                                                         children: [
                                                           Expanded(
                                                             child: Text(
-                                                             ConstTexts.newArrival.tr,
+                                                              ConstTexts
+                                                                  .newArrival
+                                                                  .tr,
                                                               textAlign:
                                                                   TextAlign
                                                                       .start,
@@ -744,7 +747,9 @@ class HomeScreen extends StatelessWidget {
                                                               });
                                                             },
                                                             child: Text(
-                                                             ConstTexts.viewAll.tr,
+                                                              ConstTexts
+                                                                  .viewAll
+                                                                  .tr,
                                                               textAlign:
                                                                   TextAlign
                                                                       .center,
@@ -825,7 +830,8 @@ class HomeScreen extends StatelessWidget {
                                                               children: [
                                                                 Expanded(
                                                                   child: Text(
-                                                                    ConstTexts.highlightsForU
+                                                                    ConstTexts
+                                                                        .highlightsForU
                                                                         .tr,
                                                                     textAlign:
                                                                         TextAlign
@@ -855,7 +861,8 @@ class HomeScreen extends StatelessWidget {
                                                                     });
                                                                   },
                                                                   child: Text(
-                                                                   ConstTexts.viewAll
+                                                                    ConstTexts
+                                                                        .viewAll
                                                                         .tr,
                                                                     textAlign:
                                                                         TextAlign
@@ -971,7 +978,8 @@ class HomeScreen extends StatelessWidget {
                                                                   vertical: 10,
                                                                 ),
                                                             child: Text(
-                                                              ConstTexts.popularStores
+                                                              ConstTexts
+                                                                  .popularStores
                                                                   .tr,
                                                               textAlign:
                                                                   TextAlign
@@ -1025,7 +1033,9 @@ class HomeScreen extends StatelessWidget {
                                                                   vertical: 10,
                                                                 ),
                                                             child: Text(
-                                                             ConstTexts.allStores.tr,
+                                                              ConstTexts
+                                                                  .allStores
+                                                                  .tr,
                                                               textAlign:
                                                                   TextAlign
                                                                       .center,
@@ -1216,9 +1226,10 @@ class HomeScreen extends StatelessWidget {
                       value: controller.selectedOrderTypeValue.value.tr,
                       icon: const Icon(Icons.keyboard_arrow_down),
                       items:
-                          <String>[ConstTexts.delivery.tr, ConstTexts.takeAway.tr].map((
-                            String value,
-                          ) {
+                          <String>[
+                            ConstTexts.delivery,
+                            ConstTexts.takeAway,
+                          ].map((String value) {
                             return DropdownMenuItem<String>(
                               value: value,
                               child: Text(
@@ -1248,9 +1259,10 @@ class HomeScreen extends StatelessWidget {
                             builder: (BuildContext context) {
                               return CustomDialogBox(
                                 title: ConstTexts.alert.tr,
-                                descriptions:"",
-                                    // ConstTexts.doYouWantChangeTheDeliverOption
-                                    //     .tr,
+                                descriptions:
+                                    ConstTexts
+                                        .doYouWantChangeTheDeliverOption
+                                        .tr,
                                 positiveString: ConstTexts.ok.tr,
                                 negativeString: ConstTexts.cancel.tr,
                                 positiveClick: () async {
@@ -2081,7 +2093,7 @@ class NewArrival extends StatelessWidget {
                                 ),
                                 const SizedBox(width: 4),
                                 Text(
-                                 ConstTexts.freeDelivery.tr,
+                                  ConstTexts.freeDelivery.tr,
                                   textAlign: TextAlign.start,
                                   maxLines: 1,
                                   style: TextStyle(
@@ -3268,7 +3280,9 @@ class MapView extends StatelessWidget {
                                                           ),
                                                           colors: [
                                                             Colors.black
-                                                                .withValues(alpha: 0),
+                                                                .withValues(
+                                                                  alpha: 0,
+                                                                ),
                                                             const Color(
                                                               0xFF111827,
                                                             ),
@@ -3403,7 +3417,8 @@ class MapView extends StatelessWidget {
                                                                   width: 5,
                                                                 ),
                                                                 Text(
-                                                                 ConstTexts.freeDelivery
+                                                                  ConstTexts
+                                                                      .freeDelivery
                                                                       .tr,
                                                                   style: TextStyle(
                                                                     fontSize:
diff --git a/lib/screen_ui/multi_vendor_service/home_screen/home_screen_two.dart b/lib/screen_ui/multi_vendor_service/home_screen/home_screen_two.dart
index 3c35f0d..0606069 100644
--- a/lib/screen_ui/multi_vendor_service/home_screen/home_screen_two.dart
+++ b/lib/screen_ui/multi_vendor_service/home_screen/home_screen_two.dart
@@ -19,7 +19,6 @@ import 'package:customer/themes/custom_dialog_box.dart';
 import 'package:customer/themes/responsive.dart';
 import 'package:customer/themes/round_button_fill.dart';
 import 'package:customer/themes/text_field_widget.dart';
-import 'package:customer/utils/app_router.dart';
 import 'package:customer/utils/network_image_widget.dart';
 import 'package:customer/utils/preferences.dart';
 import 'package:customer/widget/osm_map/map_picker_page.dart';
@@ -791,7 +790,7 @@ class HomeScreenTwo extends StatelessWidget {
                     value: controller.selectedOrderTypeValue.value.tr,
                     icon: const Icon(Icons.keyboard_arrow_down),
                     items:
-                        <String>['Delivery'.tr, 'TakeAway'.tr].map((
+                        <String>[ConstTexts.delivery, ConstTexts.takeAway].map((
                           String value,
                         ) {
                           return DropdownMenuItem<String>(
diff --git a/lib/screen_ui/multi_vendor_service/order_list_screen/order_screen.dart b/lib/screen_ui/multi_vendor_service/order_list_screen/order_screen.dart
index 3e3cdaa..9ac7315 100644
--- a/lib/screen_ui/multi_vendor_service/order_list_screen/order_screen.dart
+++ b/lib/screen_ui/multi_vendor_service/order_list_screen/order_screen.dart
@@ -5,7 +5,6 @@ import 'package:customer/models/order_model.dart';
 import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/responsive.dart';
 import 'package:customer/themes/round_button_fill.dart';
-import 'package:customer/utils/app_router.dart';
 import 'package:customer/utils/network_image_widget.dart';
 
 import 'package:flutter/material.dart';
diff --git a/lib/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart b/lib/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart
index 5f1b3b3..56b4a25 100644
--- a/lib/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart
+++ b/lib/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart
@@ -6,7 +6,6 @@ import 'package:customer/screen_ui/on_demand_service/worker_inbox_screen.dart';
 import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/custom_dialog_box.dart';
 import 'package:customer/themes/responsive.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:in_app_review/in_app_review.dart';
 import '../../../controllers/theme_controller.dart';
diff --git a/lib/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart b/lib/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart
index 832f7fa..298abca 100644
--- a/lib/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart
+++ b/lib/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart
@@ -4,7 +4,6 @@ import 'package:customer/models/wallet_transaction_model.dart';
 import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/payment_list_screen.dart';
 import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/round_button_fill.dart';
-import 'package:customer/utils/app_router.dart';
 
 import '../../../constant/collection_name.dart';
 import '../../../controllers/theme_controller.dart';
diff --git a/lib/screen_ui/on_boarding_screen/on_boarding_screen.dart b/lib/screen_ui/on_boarding_screen/on_boarding_screen.dart
index b549d97..d4ae3f5 100644
--- a/lib/screen_ui/on_boarding_screen/on_boarding_screen.dart
+++ b/lib/screen_ui/on_boarding_screen/on_boarding_screen.dart
@@ -1,6 +1,5 @@
 import 'package:customer/constant/assets.dart';
 import 'package:customer/themes/round_button_fill.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
diff --git a/lib/screen_ui/on_demand_service/favourite_ondemand_screen.dart b/lib/screen_ui/on_demand_service/favourite_ondemand_screen.dart
index 4744a1c..832da30 100644
--- a/lib/screen_ui/on_demand_service/favourite_ondemand_screen.dart
+++ b/lib/screen_ui/on_demand_service/favourite_ondemand_screen.dart
@@ -320,8 +320,9 @@ class FavouriteOndemandScreen extends StatelessWidget {
                                                                   "",
                                                             ),
                                                         builder: (ctx, snap) {
-                                                          if (!snap.hasData)
+                                                          if (!snap.hasData) {
                                                             return const SizedBox();
+                                                          }
                                                           return Text(
                                                             snap.data?.title ??
                                                                 "",
@@ -553,8 +554,9 @@ class FavouriteOndemandScreen extends StatelessWidget {
                                                               ctx,
                                                               snap,
                                                             ) {
-                                                              if (!snap.hasData)
+                                                              if (!snap.hasData) {
                                                                 return const SizedBox();
+                                                              }
                                                               return Text(
                                                                 snap
                                                                         .data
diff --git a/lib/screen_ui/on_demand_service/on_demand_details_screen.dart b/lib/screen_ui/on_demand_service/on_demand_details_screen.dart
index b524540..0c0e004 100644
--- a/lib/screen_ui/on_demand_service/on_demand_details_screen.dart
+++ b/lib/screen_ui/on_demand_service/on_demand_details_screen.dart
@@ -1,7 +1,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:customer/constant/constant.dart';
 import 'package:customer/screen_ui/on_demand_service/provider_screen.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_rating_bar/flutter_rating_bar.dart';
diff --git a/lib/screen_ui/on_demand_service/on_demand_home_screen.dart b/lib/screen_ui/on_demand_service/on_demand_home_screen.dart
index 3d22b0c..92e0e2e 100644
--- a/lib/screen_ui/on_demand_service/on_demand_home_screen.dart
+++ b/lib/screen_ui/on_demand_service/on_demand_home_screen.dart
@@ -12,7 +12,6 @@ import 'package:customer/screen_ui/on_demand_service/view_category_service_scree
 import 'package:customer/themes/app_them_data.dart';
 import 'package:customer/themes/round_button_fill.dart';
 import 'package:customer/themes/show_toast_dialog.dart';
-import 'package:customer/utils/app_router.dart';
 import 'package:customer/utils/network_image_widget.dart';
 import 'package:customer/widget/osm_map/map_picker_page.dart';
 import 'package:customer/widget/place_picker/location_picker_screen.dart';
diff --git a/lib/screen_ui/parcel_service/my_booking_screen.dart b/lib/screen_ui/parcel_service/my_booking_screen.dart
index f5348c3..9d4ccc4 100644
--- a/lib/screen_ui/parcel_service/my_booking_screen.dart
+++ b/lib/screen_ui/parcel_service/my_booking_screen.dart
@@ -1,7 +1,6 @@
 import 'package:customer/screen_ui/auth_screens/login_screen.dart';
 import 'package:customer/screen_ui/parcel_service/parcel_order_details.dart';
 import 'package:customer/themes/round_button_fill.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
diff --git a/lib/screen_ui/parcel_service/order_successfully_placed.dart b/lib/screen_ui/parcel_service/order_successfully_placed.dart
index 12a0a2a..3b43784 100644
--- a/lib/screen_ui/parcel_service/order_successfully_placed.dart
+++ b/lib/screen_ui/parcel_service/order_successfully_placed.dart
@@ -1,5 +1,4 @@
 import 'package:customer/screen_ui/parcel_service/parcel_dashboard_screen.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
diff --git a/lib/screen_ui/rental_service/my_rental_booking_screen.dart b/lib/screen_ui/rental_service/my_rental_booking_screen.dart
index 321b8ad..e756845 100644
--- a/lib/screen_ui/rental_service/my_rental_booking_screen.dart
+++ b/lib/screen_ui/rental_service/my_rental_booking_screen.dart
@@ -4,7 +4,6 @@ import 'package:customer/screen_ui/auth_screens/login_screen.dart';
 import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
 import 'package:customer/screen_ui/rental_service/rental_order_details_screen.dart';
 import 'package:customer/themes/round_button_fill.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
diff --git a/lib/screen_ui/rental_service/rental_home_screen.dart b/lib/screen_ui/rental_service/rental_home_screen.dart
index 9da2218..6e8c15a 100644
--- a/lib/screen_ui/rental_service/rental_home_screen.dart
+++ b/lib/screen_ui/rental_service/rental_home_screen.dart
@@ -1,6 +1,5 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:customer/constant/constant.dart';
-import 'package:customer/utils/app_router.dart';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index 97b5582..d2374ad 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -152,36 +152,45 @@ class Utils {
     List<String> parts = [];
 
     if (selectedLocation.address!.name != null &&
-        selectedLocation.address!.name!.isNotEmpty)
+        selectedLocation.address!.name!.isNotEmpty) {
       parts.add(selectedLocation.address!.name!);
+    }
     if (selectedLocation.address!.subThoroughfare != null &&
-        selectedLocation.address!.subThoroughfare!.isNotEmpty)
+        selectedLocation.address!.subThoroughfare!.isNotEmpty) {
       parts.add(selectedLocation.address!.subThoroughfare!);
+    }
     if (selectedLocation.address!.thoroughfare != null &&
-        selectedLocation.address!.thoroughfare!.isNotEmpty)
+        selectedLocation.address!.thoroughfare!.isNotEmpty) {
       parts.add(selectedLocation.address!.thoroughfare!);
+    }
     if (selectedLocation.address!.subLocality != null &&
-        selectedLocation.address!.subLocality!.isNotEmpty)
+        selectedLocation.address!.subLocality!.isNotEmpty) {
       parts.add(selectedLocation.address!.subLocality!);
+    }
     if (selectedLocation.address!.locality != null &&
-        selectedLocation.address!.locality!.isNotEmpty)
+        selectedLocation.address!.locality!.isNotEmpty) {
       parts.add(selectedLocation.address!.locality!);
+    }
     if (selectedLocation.address!.subAdministrativeArea != null &&
         selectedLocation.address!.subAdministrativeArea!.isNotEmpty) {
       parts.add(selectedLocation.address!.subAdministrativeArea!);
     }
     if (selectedLocation.address!.administrativeArea != null &&
-        selectedLocation.address!.administrativeArea!.isNotEmpty)
+        selectedLocation.address!.administrativeArea!.isNotEmpty) {
       parts.add(selectedLocation.address!.administrativeArea!);
+    }
     if (selectedLocation.address!.postalCode != null &&
-        selectedLocation.address!.postalCode!.isNotEmpty)
+        selectedLocation.address!.postalCode!.isNotEmpty) {
       parts.add(selectedLocation.address!.postalCode!);
+    }
     if (selectedLocation.address!.country != null &&
-        selectedLocation.address!.country!.isNotEmpty)
+        selectedLocation.address!.country!.isNotEmpty) {
       parts.add(selectedLocation.address!.country!);
+    }
     if (selectedLocation.address!.isoCountryCode != null &&
-        selectedLocation.address!.isoCountryCode!.isNotEmpty)
+        selectedLocation.address!.isoCountryCode!.isNotEmpty) {
       parts.add(selectedLocation.address!.isoCountryCode!);
+    }
 
     return parts.join(', ');
   }