From 84ce77a46f3b74fb26f237b7c873e43596e5086d Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Fri, 22 Mar 2024 01:38:21 +0700
Subject: [PATCH] TF-2667 Fix crash when click on From me in search filter

---
 lib/features/contact/presentation/contact_controller.dart | 6 +++---
 lib/features/contact/presentation/contact_view.dart       | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/features/contact/presentation/contact_controller.dart b/lib/features/contact/presentation/contact_controller.dart
index 4dc141574..c2abee38c 100644
--- a/lib/features/contact/presentation/contact_controller.dart
+++ b/lib/features/contact/presentation/contact_controller.dart
@@ -29,6 +29,7 @@ class ContactController extends BaseController {
   ContactSuggestionSource _contactSuggestionSource = ContactSuggestionSource.tMailContact;
 
   final searchQuery = SearchQuery.initial().obs;
+  final session = Rxn<Session>();
   final listContactSearched = RxList<EmailAddress>();
   final scrollListViewController = ScrollController();
 
@@ -38,7 +39,6 @@ class ContactController extends BaseController {
 
   final Debouncer<String> _deBouncerTime = Debouncer<String>(const Duration(milliseconds: 300), initialValue: '');
   AccountId? _accountId;
-  Session? session;
 
   ContactArguments? arguments;
   EmailAddress? contactSelected;
@@ -63,14 +63,14 @@ class ContactController extends BaseController {
     textInputSearchFocus.requestFocus();
     if (arguments != null) {
       _accountId = arguments!.accountId;
-      session = arguments!.session;
+      session.value = arguments!.session;
       final listContactSelected = arguments!.listContactSelected;
       log('ContactController::onReady(): arguments: $arguments');
       log('ContactController::onReady(): listContactSelected: $listContactSelected');
       if (listContactSelected.isNotEmpty) {
         contactSelected = EmailAddress(listContactSelected.first, listContactSelected.first);
       }
-      injectAutoCompleteBindings(session, _accountId);
+      injectAutoCompleteBindings(session.value, _accountId);
     }
     if (PlatformInfo.isMobile) {
       Future.delayed(
diff --git a/lib/features/contact/presentation/contact_view.dart b/lib/features/contact/presentation/contact_view.dart
index 2818c5b9a..1d691c452 100644
--- a/lib/features/contact/presentation/contact_view.dart
+++ b/lib/features/contact/presentation/contact_view.dart
@@ -62,8 +62,6 @@ class ContactView extends GetWidget<ContactController> {
                               searchInputController: controller.textInputSearchController,
                               hasBackButton: false,
                               hasSearchButton: true,
-                              padding: EdgeInsets.zero,
-                              heightSearchBar: 44,
                               margin: ContactUtils.getPaddingSearchInputForm(context, controller.responsiveUtils),
                               decoration: const BoxDecoration(
                                 borderRadius: BorderRadius.all(Radius.circular(10)),
@@ -80,10 +78,11 @@ class ContactView extends GetWidget<ContactController> {
                             ),
                             if (PlatformInfo.isWeb)
                               Obx(() {
-                                if (controller.session?.username.value.isNotEmpty == true) {
+                                final username = controller.session.value?.username.value ?? '';
+                                if (username.isNotEmpty) {
                                   final userEmailAddress = EmailAddress(
                                     AppLocalizations.of(context).me,
-                                    controller.session?.username.value);
+                                    username);
                                   final fromMeSuggestionEmailAddress = SuggestionEmailAddress(userEmailAddress, state: SuggestionEmailState.valid);
                                   return Padding(
                                     padding: const EdgeInsets.symmetric(horizontal: 4),