From e91a1f151d1aee7a9a0b6dc1fe022cc01176e8e7 Mon Sep 17 00:00:00 2001 From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com> Date: Sat, 25 Nov 2023 03:24:16 +0800 Subject: [PATCH] desktop: hide profiles screen on remote host change (#3454) --- .../simplex/common/views/usersettings/UserProfilesView.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt index ec6d4e196e..401c3afedd 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt @@ -21,14 +21,13 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import chat.simplex.common.model.* -import chat.simplex.common.platform.chatPasswordHash +import chat.simplex.common.platform.* import chat.simplex.common.ui.theme.* import chat.simplex.common.views.chat.item.ItemAction import chat.simplex.common.views.chatlist.UserProfilePickerItem import chat.simplex.common.views.chatlist.UserProfileRow import chat.simplex.common.views.database.PassphraseField import chat.simplex.common.views.helpers.* -import chat.simplex.common.platform.appPlatform import chat.simplex.common.views.CreateProfile import chat.simplex.res.MR import dev.icerock.moko.resources.StringResource @@ -138,6 +137,9 @@ fun UserProfilesView(m: ChatModel, search: MutableState, profileHidden: } } ) + KeyChangeEffect(remember { m.currentRemoteHost }.value) { + ModalManager.start.closeModal() + } } @Composable @@ -169,7 +171,7 @@ private fun UserProfilesLayout( } SectionSpacer() } - AppBarTitle(stringResource(MR.strings.your_chat_profiles)) + AppBarTitle(stringResource(MR.strings.your_chat_profiles), hostDevice(remember { chatModel.remoteHostId() })) SectionView { for (user in filteredUsers) {