From ba53cc63c6a860ca8802fe726c51bf172410a2e5 Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:45:24 +0400
Subject: [PATCH] Revert "handle click when have unsaved changes"

This reverts commit 39ca03f9c086b87b5b6571f93443ba16f2870d24.
---
 .../kotlin/chat/simplex/common/App.kt         |  6 ++--
 .../chat/simplex/common/model/ChatModel.kt    |  3 --
 .../networkAndServers/NetworkAndServers.kt    | 28 ++++++++-----------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
index fc17c49c7e..b1ce003812 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
@@ -431,10 +431,8 @@ fun DesktopScreen(userPickerState: MutableStateFlow<AnimatedViewState>) {
         .fillMaxSize()
         .padding(start = DEFAULT_START_MODAL_WIDTH * fontSizeSqrtMultiplier)
         .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, onClick = {
-          if (chatModel.centerPanelBackgroundClickHandler == null || chatModel.centerPanelBackgroundClickHandler?.invoke() == false) {
-            ModalManager.start.closeModals()
-            userPickerState.value = AnimatedViewState.HIDING
-          }
+          ModalManager.start.closeModals()
+          userPickerState.value = AnimatedViewState.HIDING
         })
     )
   }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
index ca03d0ce72..e501ed5a91 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
@@ -167,9 +167,6 @@ object ChatModel {
   val processedCriticalError: ProcessedErrors<AgentErrorType.CRITICAL> = ProcessedErrors(60_000)
   val processedInternalError: ProcessedErrors<AgentErrorType.INTERNAL> = ProcessedErrors(20_000)
 
-  // return true if you handled the click
-  var centerPanelBackgroundClickHandler: (() -> Boolean)? = null
-
   fun getUser(userId: Long): User? = if (currentUser.value?.userId == userId) {
     currentUser.value
   } else {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
index 67c04518c6..a4a3762ef1 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
@@ -52,24 +52,18 @@ fun ModalData.NetworkAndServersView(close: () -> Unit) {
   val scope = rememberCoroutineScope()
 
   val proxyPort = remember { derivedStateOf { appPrefs.networkProxy.state.value.port } }
-  fun onClose(): Boolean = if (!serversCanBeSaved(currUserServers.value, userServers.value, serverErrors.value)) {
-    close()
-    false
-  } else {
-    showUnsavedChangesAlert(
-      { scope.launch { saveServers(currentRemoteHost?.remoteHostId, currUserServers, userServers) }},
-      close
-    )
-    true
-  }
-
-  DisposableEffect(Unit) {
-    chatModel.centerPanelBackgroundClickHandler = ::onClose
-    onDispose {
-      chatModel.centerPanelBackgroundClickHandler = null
+  ModalView(
+    close = {
+      if (!serversCanBeSaved(currUserServers.value, userServers.value, serverErrors.value)) {
+        close()
+      } else {
+        showUnsavedChangesAlert(
+          { scope.launch { saveServers(currentRemoteHost?.remoteHostId, currUserServers, userServers) }},
+          close
+        )
+      }
     }
-  }
-  ModalView(close = ::onClose) {
+  ) {
     NetworkAndServersLayout(
       currentRemoteHost = currentRemoteHost,
       networkUseSocksProxy = networkUseSocksProxy,