Merge branch 'development_haroon' into 'master'

Development haroon

See merge request Cloud_Solution/mohemm-flutter-app!118

lib/provider/chat_provider_model.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
+
 import 'package:audio_waveforms/audio_waveforms.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/cupertino.dart';
@@ -11,7 +12,6 @@ import 'package:http/http.dart';
 import 'package:just_audio/just_audio.dart' as JustAudio;
 import 'package:mohem_flutter_app/api/chat/chat_api_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
-import 'package:mohem_flutter_app/classes/app_permissions.dart';
 import 'package:mohem_flutter_app/classes/consts.dart';
 import 'package:mohem_flutter_app/classes/encryption.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
@@ -820,15 +820,15 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
     sFileType = "";
     deleteData();
     favUsersList.clear();
-    searchedChats!.clear();
-    pChatHistory!.clear();
+    if (searchedChats != null) searchedChats!.clear();
+    if (pChatHistory != null) pChatHistory!.clear();
     chatHubConnection.stop();
     AppState().chatDetails = null;
   }
 
   void deleteData() {
     List<ChatUser> exists = [], unique = [];
-    if(searchedChats != null) exists.addAll(searchedChats!);
+    if (searchedChats != null) exists.addAll(searchedChats!);
     exists.addAll(favUsersList!);
     Map<String, ChatUser> profileMap = {};
     for (ChatUser item in exists) {

lib/provider/dashboard_provider_model.dart

@@ -107,7 +107,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       DrawerMenuItem("assets/images/drawer/performance_evaluation.svg", LocaleKeys.performanceEvaluation.tr(), AppRoutes.performanceEvaluation),
       DrawerMenuItem("assets/images/drawer/mowadhafi.svg", LocaleKeys.mowadhafhi.tr(), AppRoutes.mowadhafhi),
       DrawerMenuItem("assets/images/drawer/pending_trasactions.svg", LocaleKeys.pendingTransactions.tr(), AppRoutes.pendingTransactions),
-      DrawerMenuItem("assets/images/drawer/drawer_marathon.svg", LocaleKeys.brainMarathon.tr(), AppRoutes.marathonIntroScreen),
+      // DrawerMenuItem("assets/images/drawer/drawer_marathon.svg", LocaleKeys.brainMarathon.tr(), AppRoutes.marathonIntroScreen),
       DrawerMenuItem("assets/images/drawer/change_password.svg", LocaleKeys.changePassword.tr(), AppRoutes.changePassword),
     ];