From 48398c2119bb679cb4d7db56ff175e13e7a9ba08 Mon Sep 17 00:00:00 2001
From: Diogo <diogofncunha@gmail.com>
Date: Thu, 29 Aug 2024 17:05:58 +0100
Subject: [PATCH] close picker on desktop opening modals

---
 .../simplex/common/views/chatlist/UserPicker.kt   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
index 500079b4ae..e10b09d653 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
@@ -324,7 +324,8 @@ fun UserPicker(
     Column(
       Modifier
         .height(IntrinsicSize.Min)
-        .then(if (appPlatform.isAndroid) Modifier.fillMaxWidth() else Modifier.width(IntrinsicSize.Min))
+        .then(if (appPlatform.isDesktop) Modifier.widthIn(max = 375.dp) else Modifier)
+        .fillMaxWidth()
         .background(MaterialTheme.colors.surface)
     ) {
       val currentRemoteHost = remember { chatModel.currentRemoteHost }.value
@@ -355,9 +356,19 @@ fun UserPicker(
           userPickerState = userPickerState,
           drawerState = drawerState,
           remoteHosts = remoteHosts,
-          showCustomModal = { modalView -> { ModalManager.start.showCustomModal { close -> modalView(chatModel, close) } } },
+          showCustomModal = { modalView ->
+            {
+              if (appPlatform.isDesktop) {
+                userPickerState.value = AnimatedViewState.HIDING
+              }
+              ModalManager.start.showCustomModal { close -> modalView(chatModel, close) }
+            }
+          },
           withAuth = ::doWithAuth,
           showModalWithSearch = { modalView ->
+            if (appPlatform.isDesktop) {
+              userPickerState.value = AnimatedViewState.HIDING
+            }
             ModalManager.start.showCustomModal { close ->
               val search = rememberSaveable { mutableStateOf("") }
               ModalView(