Merge branch 'master' into master_new_changes

lib/classes/app_state.dart

@@ -67,7 +67,7 @@ class AppState {
 
   List<Subscription> get getproviderSubscription => _providerSubscription ?? [Subscription(name: "")];
 
-  set setproviderSubscription(List<Subscription> value) {
+  set setproviderSubscription(List<Subscription>? value) {
     _providerSubscription = value;
   }
 }

lib/view_models/user_view_model.dart

@@ -34,6 +34,7 @@ import 'package:mc_common_app/utils/navigator.dart';
 import 'package:mc_common_app/utils/shared_prefrence.dart';
 import 'package:mc_common_app/utils/utils.dart';
 import 'package:mc_common_app/view_models/base_view_model.dart';
+import 'package:mc_common_app/views/location_views/map_selection_widget.dart';
 import 'package:mc_common_app/widgets/dialog/dialogs.dart';
 import 'package:mc_common_app/widgets/dialog/message_dialog.dart';
 import 'package:mc_common_app/widgets/dialog/otp_dialog.dart';
@@ -550,8 +551,7 @@ class UserVM extends BaseVM {
     return await userRepo.getAllCountries();
   }
 
-  Future<void> performBasicOtpRegisterPage(BuildContext context,
+  Future<void> performBasicOtpRegisterPage(BuildContext context, {required String countryCode, required String phoneNum, required int role, bool isNeedToPassToken = false, VoidCallback? reloadPage}) async {
-      {required String countryCode, required String phoneNum, required int role, bool isNeedToPassToken = false, VoidCallback? reloadPage}) async {
     Utils.showLoading(context);
     BasicOtpRespModel basicOtp = await userRepo.basicOtp(countryCode + phoneNum, roleId: role, isNeedToPassToken: isNeedToPassToken);
     Utils.hideLoading(context);
@@ -673,6 +673,7 @@ class UserVM extends BaseVM {
       AppState().getUser.data!.userInfo!.userLocalImage = null;
       AppState().getUser.data!.userInfo!.userImageUrl = null;
     }
+    AppState().setproviderSubscription = null;
     navigateReplaceWithNameUntilRoute(context, AppRoutes.registerSelection);
   }
 }