5.8.2: ios 226, android 223, desktop 55

android, desktop: close modals only for desktop (#4390 )
android, desktop: notifications improvement (missed call, hidden user) (#4389 )
2024-12-17 17:20:21 +01:00 · 2024-07-02 21:28:34 +01:00 · 2024-07-02 18:26:23 +01:00 · 2024-07-02 18:19:43 +01:00 · 2024-07-02 15:07:46 +01:00 · 2024-07-02 15:02:36 +01:00
69 changed files with 1068 additions and 2720 deletions
@@ -230,7 +230,7 @@ struct ContentView: View {

    private func mainView() -> some View {
        ZStack(alignment: .top) {
-            HomeView(showSettings: $showSettings).privacySensitive(protectScreen)
+            ChatListView(showSettings: $showSettings).privacySensitive(protectScreen)
            .onAppear {
                requestNtfAuthorization()
                // Local Authentication notice is to be shown on next start after onboarding is complete
@@ -744,37 +744,21 @@ func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Co
    return (nil, alert)
 }

-func apiDeleteChat(type: ChatType, id: Int64, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async throws {
+func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
    let chatId = type.rawValue + id.description
    DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
    defer { DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) } }
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
+    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
    if case .direct = type, case .contactDeleted = r { return }
    if case .contactConnection = type, case .contactConnectionDeleted = r { return }
    if case .group = type, case .groupDeletedUser = r { return }
    throw r
 }

-func apiDeleteContact(id: Int64, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async throws -> Contact {
-    let type: ChatType = .direct
-    let chatId = type.rawValue + id.description
-    if case .full = chatDeleteMode {
-        DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
-    }
-    defer {
-        if case .full = chatDeleteMode {
-            DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) }
-        }
-    }
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
-    if case let .contactDeleted(_, contact) = r { return contact }
-    throw r
-}
-
-func deleteChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async {
+func deleteChat(_ chat: Chat, notify: Bool? = nil) async {
    do {
        let cInfo = chat.chatInfo
-        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, chatDeleteMode: chatDeleteMode)
+        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, notify: notify)
        DispatchQueue.main.async { ChatModel.shared.removeChat(cInfo.id) }
    } catch let error {
        logger.error("deleteChat apiDeleteChat error: \(responseError(error))")
@@ -785,39 +769,6 @@ func deleteChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: tru
    }
 }

-func deleteChatContact(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async {
-    do {
-        let cInfo = chat.chatInfo
-        let ct = try await apiDeleteContact(id: cInfo.apiId, chatDeleteMode: chatDeleteMode)
-        DispatchQueue.main.async {
-            switch chatDeleteMode {
-            case .full:
-                ChatModel.shared.removeChat(cInfo.id)
-            case .entity:
-                // removeChat forces list update (for ContactsView)
-                ChatModel.shared.removeChat(cInfo.id)
-                ChatModel.shared.addChat(Chat(
-                    chatInfo: .direct(contact: ct),
-                    chatItems: chat.chatItems
-                ))
-            case .messages:
-                // removeChat forces list update (for ChatListView)
-                ChatModel.shared.removeChat(cInfo.id)
-                ChatModel.shared.addChat(Chat(
-                    chatInfo: .direct(contact: ct),
-                    chatItems: []
-                ))
-            }
-        }
-    } catch let error {
-        logger.error("deleteChatContact apiDeleteContact error: \(responseError(error))")
-        AlertManager.shared.showAlertMsg(
-            title: "Error deleting chat!",
-            message: "Error: \(responseError(error))"
-        )
-    }
-}
-
 func apiClearChat(type: ChatType, id: Int64) async throws -> ChatInfo {
    let r = await chatSendCmd(.apiClearChat(type: type, id: id), bgTask: false)
    if case let .chatCleared(_, updatedChatInfo) = r { return updatedChatInfo }
@@ -1704,11 +1655,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
        let cItem = aChatItem.chatItem
        await MainActor.run {
            if active(user) {
-                if case let .direct(contact) = cInfo, contact.chatDeleted {
-                    var updatedContact = contact
-                    updatedContact.chatDeleted = false
-                    m.updateContact(updatedContact)
-                }
                m.addChatItem(cInfo, cItem)
            } else if cItem.isRcvNew && cInfo.ntfsEnabled {
                m.increaseUnreadCounter(user: user)
@@ -88,36 +88,21 @@ enum SendReceipts: Identifiable, Hashable {
    }
 }

-enum ContactDeleteMode {
-    case full
-    case entity
-
-    public func toChatDeleteMode(notify: Bool) -> ChatDeleteMode {
-        switch self {
-        case .full: .full(notify: notify)
-        case .entity: .entity(notify: notify)
-        }
-    }
-}
-
 struct ChatInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
    @Environment(\.dismiss) var dismiss: DismissAction
-    var openedFromChatView: Bool
    @ObservedObject var chat: Chat
    @State var contact: Contact
+    @Binding var connectionStats: ConnectionStats?
+    @Binding var customUserProfile: Profile?
    @State var localAlias: String
-    @State private var connectionStats: ConnectionStats? = nil
-    @State private var customUserProfile: Profile? = nil
-    @State private var connectionCode: String? = nil
+    @Binding var connectionCode: String?
    @FocusState private var aliasTextFieldFocused: Bool
    @State private var alert: ChatInfoViewAlert? = nil
-    @State private var actionSheet: ChatInfoViewActionSheet? = nil
-    @State private var showConnectContactViaAddressDialog = false
+    @State private var showDeleteContactActionSheet = false
    @State private var sendReceipts = SendReceipts.userDefault(true)
    @State private var sendReceiptsUserDefault = true
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    @AppStorage(DEFAULT_SHOW_DELETE_CONTACT_NOTICE) private var showDeleteContactNotice = true

    enum ChatInfoViewAlert: Identifiable {
        case clearChatAlert
@@ -125,7 +110,6 @@ struct ChatInfoView: View {
        case switchAddressAlert
        case abortSwitchAddressAlert
        case syncConnectionForceAlert
-        case deleteContactNotice
        case queueInfo(info: String)
        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")

@@ -136,25 +120,12 @@ struct ChatInfoView: View {
            case .switchAddressAlert: return "switchAddressAlert"
            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
-            case .deleteContactNotice: return "deleteContactNotice"
            case let .queueInfo(info): return "queueInfo \(info)"
            case let .error(title, _): return "error \(title)"
            }
        }
    }

-    enum ChatInfoViewActionSheet: Identifiable {
-        case deleteContactActionSheet
-        case confirmDeleteContactActionSheet(contactDeleteMode: ContactDeleteMode)
-
-        var id: String {
-            switch self {
-            case .deleteContactActionSheet: return "deleteContactActionSheet"
-            case .confirmDeleteContactActionSheet: return "confirmDeleteContactActionSheet"
-            }
-        }
-    }
-
    var body: some View {
        NavigationView {
            List {
@@ -171,23 +142,6 @@ struct ChatInfoView: View {
                .listRowBackground(Color.clear)
                .listRowSeparator(.hidden)

-                HStack {
-                    if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
-                        connectButton()
-                    } else if !contact.active && !contact.chatDeleted {
-                        openButton()
-                    } else {
-                        messageButton()
-                    }
-                    Spacer()
-                    callButton()
-                    Spacer()
-                    videoButton()
-                }
-                .padding(.horizontal)
-                .listRowBackground(Color.clear)
-                .listRowSeparator(.hidden)
-
                if let customUserProfile = customUserProfile {
                    Section("Incognito") {
                        HStack {
@@ -207,9 +161,9 @@ struct ChatInfoView: View {
                       connStats.ratchetSyncAllowed {
                        synchronizeConnectionButton()
                    }
-                    //                    } else if developerTools {
-                    //                        synchronizeConnectionButtonForce()
-                    //                    }
+//                    } else if developerTools {
+//                        synchronizeConnectionButtonForce()
+//                    }
                }
                .disabled(!contact.ready || !contact.active)

@@ -295,23 +249,6 @@ struct ChatInfoView: View {
                sendReceiptsUserDefault = currentUser.sendRcptsContacts
            }
            sendReceipts = SendReceipts.fromBool(contact.chatSettings.sendRcpts, userDefault: sendReceiptsUserDefault)
-
-            Task {
-                do {
-                    let (stats, profile) = try await apiContactInfo(chat.chatInfo.apiId)
-                    let (ct, code) = try await apiGetContactCode(chat.chatInfo.apiId)
-                    await MainActor.run {
-                        connectionStats = stats
-                        customUserProfile = profile
-                        connectionCode = code
-                        if contact.activeConn?.connectionCode != ct.activeConn?.connectionCode {
-                            chat.chatInfo = .direct(contact: ct)
-                        }
-                    }
-                } catch let error {
-                    logger.error("apiContactInfo or apiGetContactCode error: \(responseError(error))")
-                }
-            }
        }
        .alert(item: $alert) { alertItem in
            switch(alertItem) {
@@ -320,47 +257,28 @@ struct ChatInfoView: View {
            case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
            case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchContactAddress)
            case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncContactConnection(force: true) })
-            case .deleteContactNotice: return deleteContactNotice(contact)
            case let .queueInfo(info): return queueInfoAlert(info)
            case let .error(title, error): return mkAlert(title: title, message: error)
            }
        }
-        .actionSheet(item: $actionSheet) { sheet in
-            switch(sheet) {
-            case .deleteContactActionSheet:
-                var sheetButtons: [ActionSheet.Button] = []
-                sheetButtons.append(
-                    .destructive(Text("Delete contact")) { actionSheet = .confirmDeleteContactActionSheet(contactDeleteMode: .full) }
-                )
-                if !contact.chatDeleted {
-                    sheetButtons.append(
-                        .destructive(Text("Delete contact, keep conversation")) { actionSheet = .confirmDeleteContactActionSheet(contactDeleteMode: .entity) }
-                    )
-                }
-                sheetButtons.append(.cancel())
+        .actionSheet(isPresented: $showDeleteContactActionSheet) {
+            if contact.ready && contact.active {
                return ActionSheet(
-                    title: Text("Delete contact?"),
-                    buttons: sheetButtons
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete and notify contact")) { deleteContact(notify: true) },
+                        .destructive(Text("Delete")) { deleteContact(notify: false) },
+                        .cancel()
+                    ]
+                )
+            } else {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete")) { deleteContact() },
+                        .cancel()
+                    ]
                )
-            case let .confirmDeleteContactActionSheet(contactDeleteMode):
-                if contact.ready && contact.active {
-                    return ActionSheet(
-                        title: Text("Notify contact?\nThis cannot be undone!"),
-                        buttons: [
-                            .destructive(Text("Delete and notify contact")) { deleteContact(chatDeleteMode: contactDeleteMode.toChatDeleteMode(notify: true)) },
-                            .destructive(Text("Delete without notification")) { deleteContact(chatDeleteMode: contactDeleteMode.toChatDeleteMode(notify: false)) },
-                            .cancel()
-                        ]
-                    )
-                } else {
-                    return ActionSheet(
-                        title: Text("Confirm contact deletion.\nThis cannot be undone!"),
-                        buttons: [
-                            .destructive(Text("Delete")) { deleteContact(chatDeleteMode: contactDeleteMode.toChatDeleteMode(notify: false)) },
-                            .cancel()
-                        ]
-                    )
-                }
            }
        }
    }
@@ -431,83 +349,6 @@ struct ChatInfoView: View {
        }
    }

-    // when contact is a "contact card"
-    private func connectButton() -> some View {
-        InfoViewActionButtonLayout(image: "message.fill", title: "connect")
-            .onTapGesture {
-                showConnectContactViaAddressDialog = true
-            }
-            .confirmationDialog("Connect with \(contact.chatViewName)", isPresented: $showConnectContactViaAddressDialog, titleVisibility: .visible) {
-                Button("Use current profile") { connectContactViaAddress_(contact, false) }
-                Button("Use new incognito profile") { connectContactViaAddress_(contact, true) }
-            }
-    }
-
-    private func connectContactViaAddress_(_ contact: Contact, _ incognito: Bool) {
-        Task {
-            let ok = await connectContactViaAddress(contact.contactId, incognito)
-            if ok {
-                await MainActor.run {
-                    if openedFromChatView {
-                        dismiss()
-                    } else {
-                        if contact.chatDeleted {
-                            var updatedContact = contact
-                            updatedContact.chatDeleted = false
-                            chatModel.updateContact(updatedContact)
-                        }
-                        chatModel.chatId = chat.id
-                    }
-                }
-            }
-        }
-    }
-
-    private func openButton() -> some View {
-        InfoViewActionButtonLayout(image: "message.fill", title: "open")
-            .onTapGesture {
-                if openedFromChatView {
-                    dismiss()
-                } else {
-                    chatModel.chatId = chat.id
-                }
-            }
-    }
-
-    // TODO show keyboard
-    private func messageButton() -> some View {
-        InfoViewActionButtonLayout(image: "message.fill", title: "message")
-            .onTapGesture {
-                if openedFromChatView {
-                    dismiss()
-                } else {
-                    if contact.chatDeleted {
-                        var updatedContact = contact
-                        updatedContact.chatDeleted = false
-                        chatModel.updateContact(updatedContact)
-                    }
-                    chatModel.chatId = chat.id
-                }
-            }
-            .disabled(!contact.sendMsgEnabled)
-    }
-
-    private func callButton() -> some View {
-        InfoViewActionButtonLayout(image: "phone.fill", title: "call")
-            .onTapGesture {
-                CallController.shared.startCall(contact, .audio)
-            }
-            .disabled(!contact.ready || !contact.active || !contact.mergedPreferences.calls.enabled.forUser || chatModel.activeCall != nil)
-    }
-
-    private func videoButton() -> some View {
-        InfoViewActionButtonLayout(image: "video.fill", title: "video")
-            .onTapGesture {
-                CallController.shared.startCall(contact, .video)
-            }
-            .disabled(!contact.ready || !contact.active || !contact.mergedPreferences.calls.enabled.forUser || chatModel.activeCall != nil)
-    }
-
    private func verifyCodeButton(_ code: String) -> some View {
        NavigationLink {
            VerifyCodeView(
@@ -611,9 +452,9 @@ struct ChatInfoView: View {

    private func deleteContactButton() -> some View {
        Button(role: .destructive) {
-            actionSheet = .deleteContactActionSheet
+            showDeleteContactActionSheet = true
        } label: {
-            Label("Delete contact", systemImage: "person.badge.minus")
+            Label("Delete contact", systemImage: "trash")
                .foregroundColor(Color.red)
        }
    }
@@ -627,34 +468,17 @@ struct ChatInfoView: View {
        }
    }

-    private func deleteContact(chatDeleteMode: ChatDeleteMode) {
+    private func deleteContact(notify: Bool? = nil) {
        Task {
            do {
-                let ct = try await apiDeleteContact(id: chat.chatInfo.apiId, chatDeleteMode: chatDeleteMode)
+                try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, notify: notify)
                await MainActor.run {
                    dismiss()
                    chatModel.chatId = nil
-                    switch chatDeleteMode {
-                    case .full:
-                        chatModel.removeChat(chat.chatInfo.id)
-                    case .entity:
-                        chatModel.updateContact(ct)
-                        // dismissing sheet when opened from ChatView closes deleteContactNotice alert,
-                        // also it makes less sense to show this alert as user is already in Chats tab
-                        if showDeleteContactNotice && !openedFromChatView {
-                            alert = .deleteContactNotice
-                        }
-                    case .messages:
-                        logger.warning("ChatInfoView deleteContact case .messages should be unreachable")
-                        chatModel.removeChat(chat.chatInfo.id)
-                        chatModel.addChat(Chat(
-                            chatInfo: .direct(contact: ct),
-                            chatItems: []
-                        ))
-                    }
+                    chatModel.removeChat(chat.chatInfo.id)
                }
            } catch let error {
-                logger.error("ChatInfoView deleteContact apiDeleteContact error: \(responseError(error))")
+                logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
                let a = getErrorAlert(error, "Error deleting contact")
                await MainActor.run {
                    alert = .error(title: a.title, error: a.message)
@@ -739,38 +563,6 @@ struct ChatInfoView: View {
            }
        }
    }
-
-    private func deleteContactNotice(_ contact: Contact) -> Alert {
-        return Alert(
-            title: Text("Contact deleted!"),
-            message: Text("You can still view conversation with \(contact.displayName) in the Chats tab."),
-            primaryButton: .default(Text("Don't show again")) {
-                showDeleteContactNotice = false
-            },
-            secondaryButton: .default(Text("Ok"))
-        )
-    }
-}
-
-struct InfoViewActionButtonLayout: View {
-    var image: String
-    var title: LocalizedStringKey
-
-    var body: some View {
-        VStack(spacing: 4) {
-            Image(systemName: image)
-                .resizable()
-                .scaledToFit()
-                .frame(width: 24, height: 24)
-            Text(title)
-                .font(.caption)
-        }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
-        .foregroundColor(.accentColor)
-        .background(Color(.secondarySystemGroupedBackground))
-        .cornerRadius(12.0)
-        .frame(width: 90, height: 60)
-    }
 }

 func switchAddressAlert(_ switchAddress: @escaping () -> Void) -> Alert {
@@ -819,10 +611,12 @@ func queueInfoAlert(_ info: String) -> Alert {
 struct ChatInfoView_Previews: PreviewProvider {
    static var previews: some View {
        ChatInfoView(
-            openedFromChatView: true,
            chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []),
            contact: Contact.sampleData,
-            localAlias: ""
+            connectionStats: Binding.constant(nil),
+            customUserProfile: Binding.constant(nil),
+            localAlias: "",
+            connectionCode: Binding.constant(nil)
        )
    }
 }
@@ -23,6 +23,9 @@ struct ChatView: View {
    @State private var showAddMembersSheet: Bool = false
    @State private var composeState = ComposeState()
    @State private var keyboardVisible = false
+    @State private var connectionStats: ConnectionStats?
+    @State private var customUserProfile: Profile?
+    @State private var connectionCode: String?
    @State private var tableView: UITableView?
    @State private var loadingItems = false
    @State private var firstPage = false
@@ -42,7 +45,6 @@ struct ChatView: View {
    var body: some View {
        if #available(iOS 16.0, *) {
            viewBody
-            .toolbarBackground(.visible, for: .navigationBar)
            .scrollDismissesKeyboard(.immediately)
            .keyboardPadding()
        } else {
@@ -109,17 +111,32 @@ struct ChatView: View {
            ToolbarItem(placement: .principal) {
                if case let .direct(contact) = cInfo {
                    Button {
-                        showChatInfoSheet = true
+                        Task {
+                            do {
+                                let (stats, profile) = try await apiContactInfo(chat.chatInfo.apiId)
+                                let (ct, code) = try await apiGetContactCode(chat.chatInfo.apiId)
+                                await MainActor.run {
+                                    connectionStats = stats
+                                    customUserProfile = profile
+                                    connectionCode = code
+                                    if contact.activeConn?.connectionCode != ct.activeConn?.connectionCode {
+                                        chat.chatInfo = .direct(contact: ct)
+                                    }
+                                }
+                            } catch let error {
+                                logger.error("apiContactInfo or apiGetContactCode error: \(responseError(error))")
+                            }
+                            await MainActor.run { showChatInfoSheet = true }
+                        }
                    } label: {
                        ChatInfoToolbar(chat: chat)
                    }
-                    .appSheet(isPresented: $showChatInfoSheet) {
-                        ChatInfoView(
-                            openedFromChatView: true,
-                            chat: chat,
-                            contact: contact,
-                            localAlias: chat.chatInfo.localAlias
-                        )
+                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: {
+                        connectionStats = nil
+                        customUserProfile = nil
+                        connectionCode = nil
+                    }) {
+                        ChatInfoView(chat: chat, contact: contact, connectionStats: $connectionStats, customUserProfile: $customUserProfile, localAlias: chat.chatInfo.localAlias, connectionCode: $connectionCode)
                    }
                } else if case let .group(groupInfo) = cInfo {
                    Button {
@@ -64,11 +64,10 @@ struct GroupMemberInfoView: View {
        }
    }

-    private func knownDirectChat(_ contactId: Int64) -> (Chat, Contact)? {
+    private func knownDirectChat(_ contactId: Int64) -> Chat? {
        if let chat = chatModel.getContactChat(contactId),
-           let contact = chat.chatInfo.contact,
-           contact.directOrUsed == true {
-            return (chat, contact)
+           chat.chatInfo.contact?.directOrUsed == true {
+            return chat
        } else {
            return nil
        }
@@ -81,35 +80,18 @@ struct GroupMemberInfoView: View {
                List {
                    groupMemberInfoHeader(member)
                        .listRowBackground(Color.clear)
-                        .listRowSeparator(.hidden)
-
-                    HStack {
-                        if let contactId = member.memberContactId, let (chat, contact) = knownDirectChat(contactId) {
-                            knownDirectChatButton(chat)
-                            Spacer()
-                            callButton(contact)
-                            Spacer()
-                            videoButton(contact)
-                        } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
-                            if let contactId = member.memberContactId {
-                                newDirectChatButton(contactId)
-                            } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
-                                createMemberContactButton()
-                            }
-                            Spacer()
-                            InfoViewActionButtonLayout(image: "phone.fill", title: "call")
-                                .disabled(true)
-                            Spacer()
-                            InfoViewActionButtonLayout(image: "video.fill", title: "video")
-                                .disabled(true)
-                        }
-                    }
-                    .padding(.horizontal)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)

                    if member.memberActive {
                        Section {
+                            if let contactId = member.memberContactId, let chat = knownDirectChat(contactId) {
+                                knownDirectChatButton(chat)
+                            } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                                if let contactId = member.memberContactId {
+                                    newDirectChatButton(contactId)
+                                } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
+                                    createMemberContactButton()
+                                }
+                            }
                            if let code = connectionCode { verifyCodeButton(code) }
                            if let connStats = connectionStats,
                               connStats.ratchetSyncAllowed {
@@ -282,71 +264,58 @@ struct GroupMemberInfoView: View {
    }

    func knownDirectChatButton(_ chat: Chat) -> some View {
-        InfoViewActionButtonLayout(image: "message.fill", title: "message")
-            .onTapGesture {
+        Button {
+            dismissAllSheets(animated: true)
+            DispatchQueue.main.async {
+                chatModel.chatId = chat.id
+            }
+        } label: {
+            Label("Send direct message", systemImage: "message")
+        }
+    }
+
+    func newDirectChatButton(_ contactId: Int64) -> some View {
+        Button {
+            do {
+                let chat = try apiGetChat(type: .direct, id: contactId)
+                chatModel.addChat(chat)
                dismissAllSheets(animated: true)
                DispatchQueue.main.async {
                    chatModel.chatId = chat.id
                }
+            } catch let error {
+                logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
            }
-    }
-
-    func newDirectChatButton(_ contactId: Int64) -> some View {
-        InfoViewActionButtonLayout(image: "message.fill", title: "message")
-            .onTapGesture {
-                do {
-                    let chat = try apiGetChat(type: .direct, id: contactId)
-                    chatModel.addChat(chat)
-                    dismissAllSheets(animated: true)
-                    DispatchQueue.main.async {
-                        chatModel.chatId = chat.id
-                    }
-                } catch let error {
-                    logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
-                }
-            }
+        } label: {
+            Label("Send direct message", systemImage: "message")
+        }
    }

    func createMemberContactButton() -> some View {
-        InfoViewActionButtonLayout(image: "message.fill", title: "message")
-            .onTapGesture {
-                progressIndicator = true
-                Task {
-                    do {
-                        let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.groupMemberId)
-                        await MainActor.run {
-                            progressIndicator = false
-                            chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
-                            dismissAllSheets(animated: true)
-                            chatModel.chatId = memberContact.id
-                            chatModel.setContactNetworkStatus(memberContact, .connected)
-                        }
-                    } catch let error {
-                        logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
-                        let a = getErrorAlert(error, "Error creating member contact")
-                        await MainActor.run {
-                            progressIndicator = false
-                            alert = .error(title: a.title, error: a.message)
-                        }
+        Button {
+            progressIndicator = true
+            Task {
+                do {
+                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.groupMemberId)
+                    await MainActor.run {
+                        progressIndicator = false
+                        chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
+                        dismissAllSheets(animated: true)
+                        chatModel.chatId = memberContact.id
+                        chatModel.setContactNetworkStatus(memberContact, .connected)
+                    }
+                } catch let error {
+                    logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
+                    let a = getErrorAlert(error, "Error creating member contact")
+                    await MainActor.run {
+                        progressIndicator = false
+                        alert = .error(title: a.title, error: a.message)
                    }
                }
            }
-    }
-
-    private func callButton(_ contact: Contact) -> some View {
-        InfoViewActionButtonLayout(image: "phone.fill", title: "call")
-            .onTapGesture {
-                CallController.shared.startCall(contact, .audio)
-            }
-            .disabled(!contact.ready || !contact.active || !contact.mergedPreferences.calls.enabled.forUser || chatModel.activeCall != nil)
-    }
-
-    private func videoButton(_ contact: Contact) -> some View {
-        InfoViewActionButtonLayout(image: "video.fill", title: "video")
-            .onTapGesture {
-                CallController.shared.startCall(contact, .video)
-            }
-            .disabled(!contact.ready || !contact.active || !contact.mergedPreferences.calls.enabled.forUser || chatModel.activeCall != nil)
+        } label: {
+            Label("Send direct message", systemImage: "message")
+        }
    }

    private func groupMemberInfoHeader(_ mem: GroupMember) -> some View {
@@ -63,6 +63,7 @@ struct ChatHelp: View {

 struct ChatHelp_Previews: PreviewProvider {
    static var previews: some View {
-        return ChatHelp(showSettings: Binding.constant(false))
+        @State var showSettings = false
+        return ChatHelp(showSettings: $showSettings)
    }
 }
@@ -32,25 +32,11 @@ struct ChatListNavLink: View {
    @State private var showJoinGroupDialog = false
    @State private var showContactConnectionInfo = false
    @State private var showInvalidJSON = false
-    @State private var contactNavLinkSheet: ContactNavLinkActionSheet? = nil
+    @State private var showDeleteContactActionSheet = false
    @State private var showConnectContactViaAddressDialog = false
    @State private var inProgress = false
    @State private var progressByTimeout = false

-    @AppStorage(DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE) private var showDeleteConversationNotice = true
-
-    enum ContactNavLinkActionSheet: Identifiable {
-        case deleteContactActionSheet
-        case confirmDeleteContactActionSheet
-
-        var id: String {
-            switch self {
-            case .deleteContactActionSheet: return "deleteContactActionSheet"
-            case .confirmDeleteContactActionSheet: return "confirmDeleteContactActionSheet"
-            }
-        }
-    }
-
    var body: some View {
        Group {
            switch chat.chatInfo {
@@ -81,12 +67,12 @@ struct ChatListNavLink: View {

    @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
        Group {
-            if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
+            if contact.activeConn == nil && contact.profile.contactLink != nil {
                ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
                    .frame(height: rowHeights[dynamicTypeSize])
                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                        Button {
-                            contactNavLinkSheet = .deleteContactActionSheet
+                            showDeleteContactActionSheet = true
                        } label: {
                            Label("Delete", systemImage: "trash")
                        }
@@ -114,7 +100,7 @@ struct ChatListNavLink: View {
                    }
                    Button {
                        if contact.ready || !contact.active {
-                            contactNavLinkSheet = .deleteContactActionSheet
+                            showDeleteContactActionSheet = true
                        } else {
                            AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
                        }
@@ -126,53 +112,24 @@ struct ChatListNavLink: View {
                .frame(height: rowHeights[dynamicTypeSize])
            }
        }
-        .actionSheet(item: $contactNavLinkSheet) { sheet in
-            switch(sheet) {
-            case .deleteContactActionSheet:
-                if contact.contactStatus == .deletedByUser {
-                    return ActionSheet(
-                        title: Text("Delete conversation?\nThis cannot be undone!"),
-                        buttons: [
-                            .destructive(Text("Delete conversation")) { Task { await deleteChatContact(chat, chatDeleteMode: .full(notify: false)) } },
-                            .cancel()
-                        ]
-                    )
-                } else {
-                    return ActionSheet(
-                        title: Text("Delete contact?"),
-                        buttons: [
-                            .destructive(Text("Delete contact")) { contactNavLinkSheet = .confirmDeleteContactActionSheet },
-                            .destructive(Text("Only delete conversation")) {
-                                Task {
-                                    await deleteChatContact(chat, chatDeleteMode: .messages)
-                                    if showDeleteConversationNotice {
-                                        AlertManager.shared.showAlert(deleteConversationNotice(contact))
-                                    }
-                                }
-                            },
-                            .cancel()
-                        ]
-                    )
-                }
-            case .confirmDeleteContactActionSheet:
-                if contact.ready && contact.active {
-                    return ActionSheet(
-                        title: Text("Notify contact?\nThis cannot be undone!"),
-                        buttons: [
-                            .destructive(Text("Delete and notify contact")) { Task { await deleteChatContact(chat, chatDeleteMode: .full(notify: true)) } },
-                            .destructive(Text("Delete without notification")) { Task { await deleteChatContact(chat, chatDeleteMode: .full(notify: false)) } },
-                            .cancel()
-                        ]
-                    )
-                } else {
-                    return ActionSheet(
-                        title: Text("Confirm contact deletion.\nThis cannot be undone!"),
-                        buttons: [
-                            .destructive(Text("Delete")) { Task { await deleteChatContact(chat, chatDeleteMode: .full(notify: false)) } },
-                            .cancel()
-                        ]
-                    )
-                }
+        .actionSheet(isPresented: $showDeleteContactActionSheet) {
+            if contact.ready && contact.active {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete and notify contact")) { Task { await deleteChat(chat, notify: true) } },
+                        .destructive(Text("Delete")) { Task { await deleteChat(chat, notify: false) } },
+                        .cancel()
+                    ]
+                )
+            } else {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete")) { Task { await deleteChat(chat) } },
+                        .cancel()
+                    ]
+                )
            }
        }
    }
@@ -482,17 +439,6 @@ struct ChatListNavLink: View {
        )
    }

-    private func deleteConversationNotice(_ contact: Contact) -> Alert {
-        return Alert(
-            title: Text("Conversation deleted!"),
-            message: Text("You can still send messages to \(contact.displayName) from the Contacts tab."),
-            primaryButton: .default(Text("Don't show again")) {
-                showDeleteConversationNotice = false
-            },
-            secondaryButton: .default(Text("Ok"))
-        )
-    }
-
    private func deletePendingContactAlert(_ chat: Chat, _ contact: Contact) -> Alert {
        Alert(
            title: Text("Delete pending connection"),
@@ -11,15 +11,16 @@ import SimpleXChat

 struct ChatListView: View {
    @EnvironmentObject var chatModel: ChatModel
-
+    @Binding var showSettings: Bool
    @State private var searchMode = false
    @FocusState private var searchFocussed
    @State private var searchText = ""
    @State private var searchShowingSimplexLink = false
    @State private var searchChatFilteredBySimplexLink: String? = nil
-
+    @State private var newChatMenuOption: NewChatMenuOption? = nil
+    @State private var userPickerVisible = false
+    @State private var showConnectDesktop = false
    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
-    @AppStorage(DEFAULT_ONE_HAND_UI) private var oneHandUI = false

    var body: some View {
        if #available(iOS 16.0, *) {
@@ -30,10 +31,44 @@ struct ChatListView: View {
    }

    private var viewBody: some View {
+        ZStack(alignment: .topLeading) {
+            NavStackCompat(
+                isActive: Binding(
+                    get: { chatModel.chatId != nil },
+                    set: { _ in }
+                ),
+                destination: chatView
+            ) {
+                VStack {
+                    if chatModel.chats.isEmpty {
+                        onboardingButtons()
+                    }
+                    chatListView
+                }
+            }
+            if userPickerVisible {
+                Rectangle().fill(.white.opacity(0.001)).onTapGesture {
+                    withAnimation {
+                        userPickerVisible.toggle()
+                    }
+                }
+            }
+            UserPicker(
+                showSettings: $showSettings,
+                showConnectDesktop: $showConnectDesktop,
+                userPickerVisible: $userPickerVisible
+            )
+        }
+        .sheet(isPresented: $showConnectDesktop) {
+            ConnectDesktopView()
+        }
+    }
+
+    private var chatListView: some View {
        VStack {
            chatList
        }
-        .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
+        .onDisappear() { withAnimation { userPickerVisible = false } }
        .refreshable {
            AlertManager.shared.showAlert(Alert(
                title: Text("Reconnect servers?"),
@@ -51,6 +86,58 @@ struct ChatListView: View {
            ))
        }
        .listStyle(.plain)
+        .navigationBarTitleDisplayMode(.inline)
+        .navigationBarHidden(searchMode)
+        .toolbar {
+            ToolbarItem(placement: .navigationBarLeading) {
+                let user = chatModel.currentUser ?? User.sampleData
+                ZStack(alignment: .topTrailing) {
+                    ProfileImage(imageStr: user.image, size: 32, color: Color(uiColor: .quaternaryLabel))
+                        .padding(.trailing, 4)
+                    let allRead = chatModel.users
+                        .filter { u in !u.user.activeUser && !u.user.hidden }
+                        .allSatisfy { u in u.unreadCount == 0 }
+                    if !allRead {
+                        unreadBadge(size: 12)
+                    }
+                }
+                .onTapGesture {
+                    if chatModel.users.filter({ u in u.user.activeUser || !u.user.hidden }).count > 1 {
+                        withAnimation {
+                            userPickerVisible.toggle()
+                        }
+                    } else {
+                        showSettings = true
+                    }
+                }
+            }
+            ToolbarItem(placement: .principal) {
+                HStack(spacing: 4) {
+                    Text("Chats")
+                        .font(.headline)
+                    if chatModel.chats.count > 0 {
+                        toggleFilterButton()
+                    }
+                }
+                .frame(maxWidth: .infinity, alignment: .center)
+            }
+            ToolbarItem(placement: .navigationBarTrailing) {
+                switch chatModel.chatRunning {
+                case .some(true): NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
+                case .some(false): chatStoppedIcon()
+                case .none: EmptyView()
+                }
+            }
+        }
+    }
+
+    private func toggleFilterButton() -> some View {
+        Button {
+            showUnreadAndFavorites = !showUnreadAndFavorites
+        } label: {
+            Image(systemName: "line.3.horizontal.decrease.circle" + (showUnreadAndFavorites ? ".fill" : ""))
+                .foregroundColor(.accentColor)
+        }
    }

    @ViewBuilder private var chatList: some View {
@@ -66,13 +153,11 @@ struct ChatListView: View {
                            searchShowingSimplexLink: $searchShowingSimplexLink,
                            searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
                        )
-                        .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
                        .listRowSeparator(.hidden)
                        .frame(maxWidth: .infinity)
                    }
                    ForEach(cs, id: \.viewId) { chat in
                        ChatListNavLink(chat: chat)
-                            .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
                            .padding(.trailing, -16)
                            .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
                    }
@@ -86,9 +171,7 @@ struct ChatListView: View {
                }
            }
            if cs.isEmpty && !chatModel.chats.isEmpty {
-                Text("No filtered chats")
-                    .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                    .foregroundColor(.secondary)
+                Text("No filtered chats").foregroundColor(.secondary)
            }
        }
    }
@@ -99,24 +182,66 @@ struct ChatListView: View {
            .foregroundColor(.accentColor)
    }

+    private func onboardingButtons() -> some View {
+        VStack(alignment: .trailing, spacing: 0) {
+            Path { p in
+                p.move(to: CGPoint(x: 8, y: 0))
+                p.addLine(to: CGPoint(x: 16, y: 10))
+                p.addLine(to: CGPoint(x: 0, y: 10))
+                p.addLine(to: CGPoint(x: 8, y: 0))
+            }
+            .fill(Color.accentColor)
+            .frame(width: 20, height: 10)
+            .padding(.trailing, 12)
+
+            connectButton("Tap to start a new chat") {
+                newChatMenuOption = .newContact
+            }
+
+            Spacer()
+            Text("You have no chats")
+                .foregroundColor(.secondary)
+                .frame(maxWidth: .infinity)
+        }
+        .padding(.trailing, 6)
+        .frame(maxHeight: .infinity)
+    }
+
+    private func connectButton(_ label: LocalizedStringKey, action: @escaping () -> Void) -> some View {
+        Button(action: action) {
+            Text(label)
+                .padding(.vertical, 10)
+                .padding(.horizontal, 20)
+        }
+        .background(Color.accentColor)
+        .foregroundColor(.white)
+        .clipShape(RoundedRectangle(cornerRadius: 16))
+    }
+
+    @ViewBuilder private func chatView() -> some View {
+        if let chatId = chatModel.chatId, let chat = chatModel.getChat(chatId) {
+            ChatView(chat: chat).onAppear {
+                loadChat(chat: chat)
+            }
+        }
+    }
+
    private func filteredChats() -> [Chat] {
        if let linkChatId = searchChatFilteredBySimplexLink {
            return chatModel.chats.filter { $0.id == linkChatId }
        } else {
            let s = searchString()
            return s == "" && !showUnreadAndFavorites
-            ? chatModel.chats.filter { chat in !chat.chatInfo.chatDeleted }
+            ? chatModel.chats
            : chatModel.chats.filter { chat in
                let cInfo = chat.chatInfo
                switch cInfo {
                case let .direct(contact):
-                    return !contact.chatDeleted && (
-                        s == ""
-                        ? filtered(chat)
-                        : (viewNameContains(cInfo, s) ||
-                           contact.profile.displayName.localizedLowercase.contains(s) ||
-                           contact.fullName.localizedLowercase.contains(s))
-                    )
+                    return s == ""
+                    ? filtered(chat)
+                    : (viewNameContains(cInfo, s) ||
+                       contact.profile.displayName.localizedLowercase.contains(s) ||
+                       contact.fullName.localizedLowercase.contains(s))
                case let .group(gInfo):
                    return s == ""
                    ? (filtered(chat) || gInfo.membership.memberStatus == .memInvited)
@@ -157,9 +282,9 @@ struct ChatListSearchBar: View {
    @Binding var searchShowingSimplexLink: Bool
    @Binding var searchChatFilteredBySimplexLink: String?
    @State private var ignoreSearchTextChange = false
+    @State private var showScanCodeSheet = false
    @State private var alert: PlanAndConnectAlert?
    @State private var sheet: PlanAndConnectActionSheet?
-    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false

    var body: some View {
        VStack(spacing: 12) {
@@ -176,6 +301,26 @@ struct ChatListSearchBar: View {
                            .onTapGesture {
                                searchText = ""
                            }
+                    } else if !searchFocussed {
+                        HStack(spacing: 24) {
+                            if m.pasteboardHasStrings {
+                                Image(systemName: "doc")
+                                    .onTapGesture {
+                                        if let str = UIPasteboard.general.string {
+                                            searchText = str
+                                        }
+                                    }
+                            }
+
+                            Image(systemName: "qrcode")
+                                .resizable()
+                                .scaledToFit()
+                                .frame(width: 20, height: 20)
+                                .onTapGesture {
+                                    showScanCodeSheet = true
+                                }
+                        }
+                        .padding(.trailing, 2)
                    }
                }
                .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
@@ -190,10 +335,13 @@ struct ChatListSearchBar: View {
                            searchText = ""
                            searchFocussed = false
                        }
-                } else if m.chats.count > 0 {
-                    toggleFilterButton()
                }
            }
+            Divider()
+        }
+        .sheet(isPresented: $showScanCodeSheet) {
+            NewChatView(selection: .connect, showQRCodeScanner: true)
+                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil) // fixes .refreshable in ChatListView affecting nested view
        }
        .onChange(of: searchFocussed) { sf in
            withAnimation { searchMode = sf }
@@ -228,21 +376,6 @@ struct ChatListSearchBar: View {
        }
    }

-    private func toggleFilterButton() -> some View {
-        ZStack {
-            Color.clear
-                .frame(width: 22, height: 22)
-            Image(systemName: showUnreadAndFavorites ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease")
-                .resizable()
-                .scaledToFit()
-                .foregroundColor(showUnreadAndFavorites ? .accentColor : .secondary)
-                .frame(width: showUnreadAndFavorites ? 22 : 16, height: showUnreadAndFavorites ? 22 : 16)
-                .onTapGesture {
-                    showUnreadAndFavorites = !showUnreadAndFavorites
-                }
-        }
-    }
-
    private func connect(_ link: String) {
        planAndConnect(
            link,
@@ -256,6 +389,17 @@ struct ChatListSearchBar: View {
    }
 }

+func chatStoppedIcon() -> some View {
+    Button {
+        AlertManager.shared.showAlertMsg(
+            title: "Chat is stopped",
+            message: "You can start chat via app Settings / Database or by restarting the app"
+        )
+    } label: {
+        Image(systemName: "exclamationmark.octagon.fill").foregroundColor(.red)
+    }
+}
+
 struct ChatListView_Previews: PreviewProvider {
    static var previews: some View {
        let chatModel = ChatModel()
@@ -275,9 +419,9 @@ struct ChatListView_Previews: PreviewProvider {

        ]
        return Group {
-            ChatListView()
+            ChatListView(showSettings: Binding.constant(false))
                .environmentObject(chatModel)
-            ChatListView()
+            ChatListView(showSettings: Binding.constant(false))
                .environmentObject(ChatModel())
        }
    }
@@ -204,7 +204,7 @@ struct ChatPreviewView: View {
        } else {
            switch (chat.chatInfo) {
            case let .direct(contact):
-                if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
+                if contact.activeConn == nil && contact.profile.contactLink != nil {
                    chatPreviewInfoText("Tap to Connect")
                        .foregroundColor(.accentColor)
                } else if !contact.ready && contact.activeConn != nil {
@@ -1,210 +0,0 @@
-//
-//  ContactListNavLink.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 06.05.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct ContactListNavLink: View {
-    @ObservedObject var chat: Chat
-    @State private var contactNavLinkSheet: ContactNavLinkActionSheet? = nil
-
-    @AppStorage(DEFAULT_SHOW_DELETE_CONTACT_NOTICE) private var showDeleteContactNotice = true
-
-    enum ContactNavLinkActionSheet: Identifiable {
-        case deleteContactActionSheet
-        case confirmDeleteContactActionSheet(contactDeleteMode: ContactDeleteMode)
-
-        var id: String {
-            switch self {
-            case .deleteContactActionSheet: return "deleteContactActionSheet"
-            case .confirmDeleteContactActionSheet: return "confirmDeleteContactActionSheet"
-            }
-        }
-    }
-
-    var body: some View {
-        switch chat.chatInfo {
-        case let .direct(contact):
-            NavigationLink {
-                ChatInfoView(
-                    openedFromChatView: false,
-                    chat: chat,
-                    contact: contact,
-                    localAlias: chat.chatInfo.localAlias
-                )
-            } label: {
-                HStack{
-                    ZStack(alignment: .bottomTrailing) {
-                        ProfileImage(imageStr: contact.image, size: 38)
-                        chatPreviewImageOverlayIcon(contact)
-                            .padding([.bottom, .trailing], 1)
-                    }
-                    .padding(.trailing, 2)
-
-                    previewTitle(contact)
-
-                    Spacer()
-
-                    HStack {
-                        if chat.chatInfo.chatSettings?.favorite ?? false {
-                            Image(systemName: "star.fill")
-                                .resizable()
-                                .scaledToFill()
-                                .frame(width: 18, height: 18)
-                                .padding(.trailing, 1)
-                                .foregroundColor(.secondary.opacity(0.65))
-                        }
-                        if contact.contactConnIncognito {
-                            Image(systemName: "theatermasks")
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 22, height: 22)
-                                .foregroundColor(.secondary)
-                        }
-                    }
-                }
-            }
-            .swipeActions(edge: .leading, allowsFullSwipe: true) {
-                toggleFavoriteButton()
-            }
-            .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                Button {
-                    contactNavLinkSheet = .deleteContactActionSheet
-                } label: {
-                    Label("Delete", systemImage: "person.badge.minus")
-                }
-                .tint(.red)
-            }
-            .actionSheet(item: $contactNavLinkSheet) { sheet in
-                switch(sheet) {
-                case .deleteContactActionSheet:
-                    var sheetButtons: [ActionSheet.Button] = []
-                    sheetButtons.append(
-                        .destructive(Text("Delete contact")) { contactNavLinkSheet = .confirmDeleteContactActionSheet(contactDeleteMode: .full) }
-                    )
-                    if !contact.chatDeleted {
-                        sheetButtons.append(
-                            .destructive(Text("Delete contact, keep conversation")) { contactNavLinkSheet = .confirmDeleteContactActionSheet(contactDeleteMode: .entity) }
-                        )
-                    }
-                    sheetButtons.append(.cancel())
-                    return ActionSheet(
-                        title: Text("Delete contact?"),
-                        buttons: sheetButtons
-                    )
-                case let .confirmDeleteContactActionSheet(contactDeleteMode):
-                    if contact.ready && contact.active {
-                        return ActionSheet(
-                            title: Text("Notify contact?\nThis cannot be undone!"),
-                            buttons: [
-                                .destructive(Text("Delete and notify contact")) {
-                                    Task {
-                                        await deleteChatContact(chat, chatDeleteMode: contactDeleteMode.toChatDeleteMode(notify: true))
-                                        if contactDeleteMode == .entity && showDeleteContactNotice {
-                                            AlertManager.shared.showAlert(deleteContactNotice(contact))
-                                        }
-                                    }
-                                },
-                                .destructive(Text("Delete without notification")) {
-                                    Task {
-                                        await deleteChatContact(chat, chatDeleteMode: contactDeleteMode.toChatDeleteMode(notify: false))
-                                        if contactDeleteMode == .entity && showDeleteContactNotice {
-                                            AlertManager.shared.showAlert(deleteContactNotice(contact))
-                                        }
-                                    }
-                                },
-                                .cancel()
-                            ]
-                        )
-                    } else {
-                        return ActionSheet(
-                            title: Text("Confirm contact deletion.\nThis cannot be undone!"),
-                            buttons: [
-                                .destructive(Text("Delete")) {
-                                    Task {
-                                        await deleteChatContact(chat, chatDeleteMode: contactDeleteMode.toChatDeleteMode(notify: false))
-                                        if contactDeleteMode == .entity && showDeleteContactNotice {
-                                            AlertManager.shared.showAlert(deleteContactNotice(contact))
-                                        }
-                                    }
-                                },
-                                .cancel()
-                            ]
-                        )
-                    }
-                }
-            }
-        default:
-            EmptyView()
-        }
-    }
-
-    @ViewBuilder private func previewTitle(_ contact: Contact) -> some View {
-        let t = Text(chat.chatInfo.chatViewName)
-        (
-            contact.verified == true
-            ? verifiedIcon + t
-            : t
-        )
-        .lineLimit(1)
-    }
-
-    private var verifiedIcon: Text {
-        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
-            .foregroundColor(.secondary)
-            .baselineOffset(1)
-            .kerning(-2)
-    }
-
-    @ViewBuilder private func chatPreviewImageOverlayIcon(_ contact: Contact) -> some View {
-        if !contact.active {
-            inactiveIcon()
-        } else {
-            EmptyView()
-        }
-    }
-
-    private func inactiveIcon() -> some View {
-        Image(systemName: "multiply.circle.fill")
-            .foregroundColor(.secondary.opacity(0.65))
-            .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
-    }
-
-    private func deleteContactNotice(_ contact: Contact) -> Alert {
-        return Alert(
-            title: Text("Contact deleted!"),
-            message: Text("You can still view conversation with \(contact.displayName) in the Chats tab."),
-            primaryButton: .default(Text("Don't show again")) {
-                showDeleteContactNotice = false
-            },
-            secondaryButton: .default(Text("Ok"))
-        )
-    }
-
-    @ViewBuilder private func toggleFavoriteButton() -> some View {
-        if chat.chatInfo.chatSettings?.favorite == true {
-            Button {
-                toggleChatFavorite(chat, favorite: false)
-            } label: {
-                Label("Unfav.", systemImage: "star.slash")
-            }
-            .tint(.green)
-        } else {
-            Button {
-                toggleChatFavorite(chat, favorite: true)
-            } label: {
-                Label("Favorite", systemImage: "star.fill")
-            }
-            .tint(.green)
-        }
-    }
-}
-
-#Preview {
-    ContactListNavLink(chat: Chat.sampleData)
-}
@@ -1,199 +0,0 @@
-//
-//  ContactsView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 06.05.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct ContactsView: View {
-    @EnvironmentObject var chatModel: ChatModel
-
-    @State private var searchMode = false
-    @FocusState private var searchFocussed
-    @State private var searchText = ""
-
-    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
-    @AppStorage(DEFAULT_ONE_HAND_UI) private var oneHandUI = false
-
-    var body: some View {
-        if #available(iOS 16.0, *) {
-            viewBody.scrollDismissesKeyboard(.immediately)
-        } else {
-            viewBody
-        }
-    }
-
-    private var viewBody: some View {
-        VStack {
-            contactList
-        }
-        .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-        .listStyle(.plain)
-    }
-
-    @ViewBuilder private var contactList: some View {
-        let contactChats = contactChats()
-        let filteredContactChats = filteredContactChats(contactChats)
-        ZStack {
-            VStack {
-                List {
-                    if !contactChats.isEmpty {
-                        ContactsSearchBar(
-                            searchMode: $searchMode,
-                            searchFocussed: $searchFocussed,
-                            searchText: $searchText
-                        )
-                        .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                        .listRowSeparator(.hidden)
-                        .frame(maxWidth: .infinity)
-                    }
-                    ForEach(filteredContactChats, id: \.viewId) { chat in
-                        switch chat.chatInfo {
-                        case let .direct(contact):
-                            ContactListNavLink(chat: chat)
-                                .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                                .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(contact.id))
-                        default:
-                            EmptyView()
-                        }
-                    }
-                }
-            }
-            if filteredContactChats.isEmpty && !contactChats.isEmpty {
-                Text("No filtered contacts")
-                    .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                    .foregroundColor(.secondary)
-            } else if contactChats.isEmpty {
-                Text("No contacts")
-                    .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                    .foregroundColor(.secondary)
-            }
-        }
-    }
-
-    private func contactChats() -> [Chat] {
-        return chatModel.chats.filter { chat in
-            switch chat.chatInfo {
-            case .direct: true
-            default: false
-            }
-        }
-    }
-
-    private func filteredContactChats(_ contactChats: [Chat]) -> [Chat] {
-        let s = searchString()
-        return (
-            s == "" && !showUnreadAndFavorites
-            ? contactChats.filter { chat in
-                switch chat.chatInfo {
-                case let .direct(contact): return contact.contactStatus != .deletedByUser
-                default: return false
-                }
-            }
-            : contactChats.filter { chat in
-                switch chat.chatInfo {
-                case let .direct(contact):
-                    return contact.contactStatus != .deletedByUser && (
-                        s == ""
-                        ? (chat.chatInfo.chatSettings?.favorite ?? false)
-                        : (viewNameContains(contact, s) ||
-                           contact.profile.displayName.localizedLowercase.contains(s) ||
-                           contact.fullName.localizedLowercase.contains(s))
-                    )
-                default: return false
-                }
-            }
-        )
-        .sorted{ $0.chatInfo.displayName.lowercased() < $1.chatInfo.displayName.lowercased() }
-
-        func searchString() -> String {
-            searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-        }
-
-        func viewNameContains(_ contact: Contact, _ s: String) -> Bool {
-            contact.chatViewName.localizedLowercase.contains(s)
-        }
-    }
-}
-
-struct ContactsSearchBar: View {
-    @EnvironmentObject var m: ChatModel
-    @Binding var searchMode: Bool
-    @FocusState.Binding var searchFocussed: Bool
-    @Binding var searchText: String
-    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
-
-    var body: some View {
-        VStack(spacing: 12) {
-            HStack(spacing: 12) {
-                HStack(spacing: 4) {
-                    Image(systemName: "magnifyingglass")
-                    TextField("Search", text: $searchText)
-                        .focused($searchFocussed)
-                        .frame(maxWidth: .infinity)
-                    if !searchText.isEmpty {
-                        Image(systemName: "xmark.circle.fill")
-                            .onTapGesture {
-                                searchText = ""
-                            }
-                    }
-                }
-                .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
-                .foregroundColor(.secondary)
-                .background(Color(.tertiarySystemFill))
-                .cornerRadius(10.0)
-
-                if searchFocussed {
-                    Text("Cancel")
-                        .foregroundColor(.accentColor)
-                        .onTapGesture {
-                            searchText = ""
-                            searchFocussed = false
-                        }
-                } else if m.chats.count > 0 {
-                    toggleFilterButton()
-                }
-            }
-        }
-        .onChange(of: searchFocussed) { sf in
-            withAnimation { searchMode = sf }
-        }
-    }
-
-    private func toggleFilterButton() -> some View {
-        ZStack {
-            Color.clear
-                .frame(width: 22, height: 22)
-            Image(systemName: showUnreadAndFavorites ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease")
-                .resizable()
-                .scaledToFit()
-                .foregroundColor(showUnreadAndFavorites ? .accentColor : .secondary)
-                .frame(width: showUnreadAndFavorites ? 22 : 16, height: showUnreadAndFavorites ? 22 : 16)
-                .onTapGesture {
-                    showUnreadAndFavorites = !showUnreadAndFavorites
-                }
-        }
-    }
-}
-
-struct ContactsView_Previews: PreviewProvider {
-    static var previews: some View {
-        let chatModel = ChatModel()
-        chatModel.chats = [
-            Chat(
-                chatInfo: ChatInfo.sampleData.direct,
-                chatItems: []
-            )
-        ]
-        return Group {
-            ContactsView()
-                .environmentObject(chatModel)
-            ContactsView()
-                .environmentObject(ChatModel())
-        }
-    }
-}
@@ -1,229 +0,0 @@
-//
-//  HomeView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 01.05.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-enum HomeTab {
-    case contacts
-    case chats
-}
-
-struct HomeView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @Binding var showSettings: Bool
-    @State private var homeTab: HomeTab = .chats
-    @State private var userPickerVisible = false
-    @State private var showConnectDesktop = false
-    @State private var newChatMenuOption: NewChatMenuOption? = nil
-    @State private var toolbarHeight: CGFloat = 0
-
-    @AppStorage(DEFAULT_ONE_HAND_UI) private var oneHandUI = false
-
-    var body: some View {
-        ZStack(alignment: .bottomLeading) {
-            NavStackCompat(
-                isActive: Binding(
-                    get: { chatModel.chatId != nil },
-                    set: { _ in }
-                ),
-                destination: chatView,
-                content: homeView
-            )
-
-            if userPickerVisible {
-                Rectangle().fill(.white.opacity(0.001)).onTapGesture {
-                    withAnimation {
-                        userPickerVisible.toggle()
-                    }
-                }
-            }
-            UserPicker(
-                showSettings: $showSettings,
-                showConnectDesktop: $showConnectDesktop,
-                userPickerVisible: $userPickerVisible
-            )
-        }
-        .sheet(isPresented: $showConnectDesktop) {
-            ConnectDesktopView()
-        }
-    }
-
-    @ViewBuilder private func homeView() -> some View {
-        let v = VStack {
-            switch homeTab {
-            case .contacts: withToolbar("Contacts", contactsView)
-            case .chats: withToolbar("Chats", chatListView)
-            }
-        }
-        .toolbar {
-            ToolbarItemGroup(placement: .bottomBar) {
-                settingsButton()
-                Spacer()
-                contactsButton()
-                Spacer()
-                chatsButton()
-                Spacer()
-                newChatButton()
-            }
-        }
-
-        if #unavailable(iOS 16) {
-            v
-        } else if oneHandUI {
-            v.toolbarBackground(.visible, for: .navigationBar, .bottomBar)
-        } else {
-            v.toolbarBackground(.visible, for: .bottomBar)
-        }
-    }
-
-    func withToolbar<V: View>(_ title: LocalizedStringKey, _ content: () -> V) -> some View {
-        content()
-            .navigationBarTitleDisplayMode(oneHandUI ? .inline : .large)
-            .navigationTitle(title)
-    }
-
-    @ViewBuilder private func settingsButton() -> some View {
-        let user = chatModel.currentUser ?? User.sampleData
-        let multiUser = chatModel.users.filter({ u in u.user.activeUser || !u.user.hidden }).count > 1
-        Button {
-            if multiUser {
-                withAnimation {
-                    userPickerVisible.toggle()
-                }
-            } else {
-                showSettings = true
-            }
-        } label: {
-            VStack(spacing: 2) {
-                ZStack(alignment: .topTrailing) {
-                    ProfileImage(imageStr: user.image, size: 42, color: Color(uiColor: .quaternaryLabel))
-                        .padding(.top, 3)
-                        .padding(.trailing, 3)
-                    let allRead = chatModel.users
-                        .filter { u in !u.user.activeUser && !u.user.hidden }
-                        .allSatisfy { u in u.unreadCount == 0 }
-                    if !allRead {
-                        userUnreadBadge(size: 12)
-                    }
-                }
-            }
-        }
-        .foregroundColor(.secondary)
-    }
-
-    private func userUnreadBadge(_ text: Text? = Text(" "), size: CGFloat = 18) -> some View {
-        Circle()
-            .frame(width: size, height: size)
-            .foregroundColor(.accentColor)
-    }
-
-    private func contactsButton() -> some View {
-        Button {
-            homeTab = .contacts
-        } label: {
-            iconLabel(homeTab == .contacts ? "person.crop.circle.fill" : "person.crop.circle", "Contacts")
-        }
-        .foregroundColor(.secondary)
-    }
-
-    private func chatsButton() -> some View {
-        Button {
-            homeTab = .chats
-        } label: {
-            iconLabel(homeTab == .chats ? "message.fill" : "message", "Chats")
-        }
-        .foregroundColor(.secondary)
-    }
-
-    @ViewBuilder private func newChatButton() -> some View {
-        if case .some(false) = chatModel.chatRunning {
-            chatsStoppedButton()
-        } else {
-            Menu {
-                Button {
-                    newChatMenuOption = .newGroup
-                } label: {
-                    Text("Create group")
-                }
-                Button {
-                    newChatMenuOption = .scanPaste
-                } label: {
-                    Text("Scan / Paste link")
-                }
-                Button {
-                    newChatMenuOption = .newContact
-                } label: {
-                    Text("Add contact")
-                }
-            } label: {
-                iconLabel("square.and.pencil", "New chat")
-            }
-            .sheet(item: $newChatMenuOption) { opt in
-                switch opt {
-                case .newContact: NewChatView(selection: .invite)
-                case .scanPaste: NewChatView(selection: .connect, showQRCodeScanner: true)
-                case .newGroup: AddGroupView()
-                }
-            }
-        }
-    }
-
-    func chatsStoppedButton() -> some View {
-        Button {
-            AlertManager.shared.showAlertMsg(
-                title: "Chat is stopped",
-                message: "You can start chat via app Settings / Database or by restarting the app"
-            )
-        } label: {
-            VStack(spacing: 4) {
-                Image(systemName: "exclamationmark.octagon.fill")
-                    .resizable()
-                    .scaledToFit()
-                    .foregroundColor(.red)
-                    .frame(width: 24, height: 24)
-                Text("Stopped")
-                    .font(.caption)
-                    .foregroundColor(.secondary)
-            }
-        }
-    }
-
-    private func iconLabel(_ image: String, _ title: LocalizedStringKey) -> some View {
-        VStack(spacing: 2) {
-            Image(systemName: image)
-                .resizable()
-                .scaledToFit()
-                .frame(width: 24, height: 24)
-            Text(title)
-                .font(.caption2)
-        }
-        .padding(.top, 3)
-    }
-
-    @ViewBuilder private func contactsView() -> some View {
-        ContactsView()
-    }
-
-    @ViewBuilder private func chatListView() -> some View {
-        // TODO reverse scale effect for swipe actions
-        ChatListView()
-    }
-
-    @ViewBuilder private func chatView() -> some View {
-        if let chatId = chatModel.chatId, let chat = chatModel.getChat(chatId) {
-            ChatView(chat: chat).onAppear {
-                loadChat(chat: chat)
-            }
-        }
-    }
-}
-
-#Preview {
-    HomeView(showSettings: Binding.constant(false))
-}
@@ -10,7 +10,6 @@ import SwiftUI

 enum NewChatMenuOption: Identifiable {
    case newContact
-    case scanPaste
    case newGroup

    var id: Self { self }
@@ -26,11 +25,6 @@ struct NewChatMenuButton: View {
            } label: {
                Text("Add contact")
            }
-            Button {
-                newChatMenuOption = .scanPaste
-            } label: {
-                Text("Scan / Paste link")
-            }
            Button {
                newChatMenuOption = .newGroup
            } label: {
@@ -45,7 +39,6 @@ struct NewChatMenuButton: View {
        .sheet(item: $newChatMenuOption) { opt in
            switch opt {
            case .newContact: NewChatView(selection: .invite)
-            case .scanPaste: NewChatView(selection: .connect, showQRCodeScanner: true)
            case .newGroup: AddGroupView()
            }
        }
@@ -44,7 +44,6 @@ extension AppSettings {
        if let val = androidCallOnLockScreen { def.setValue(val.rawValue, forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN) }
        if let val = iosCallKitEnabled { callKitEnabledGroupDefault.set(val) }
        if let val = iosCallKitCallsInRecents { def.setValue(val, forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS) }
-        if let val = oneHandUI { def.setValue(val, forKey: DEFAULT_ONE_HAND_UI) }
    }

    public static var current: AppSettings {
@@ -70,7 +69,6 @@ extension AppSettings {
        c.androidCallOnLockScreen = AppSettingsLockScreenCalls(rawValue: def.string(forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN)!)
        c.iosCallKitEnabled = callKitEnabledGroupDefault.get()
        c.iosCallKitCallsInRecents = def.bool(forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS)
-        c.oneHandUI = def.bool(forKey: DEFAULT_ONE_HAND_UI)
        return c
    }
 }
@@ -25,7 +25,6 @@ struct AppearanceSettings: View {
    @State private var userInterfaceStyle = getUserInterfaceStyleDefault()
    @State private var uiTintColor = getUIAccentColorDefault()
    @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var profileImageCornerRadius = defaultProfileImageCorner
-    @AppStorage(DEFAULT_ONE_HAND_UI) private var oneHandUI = false

    var body: some View {
        VStack{
@@ -40,12 +39,6 @@ struct AppearanceSettings: View {
                    }
                }

-                // Section("Interface") {
-                //     settingsRow("hand.wave") {
-                //         Toggle("One-hand UI", isOn: $oneHandUI)
-                //     }
-                // }
-
                Section("App icon") {
                    HStack {
                        updateAppIcon(image: "icon-light", icon: nil, tapped: $iconLightTapped)
@@ -12,7 +12,6 @@ import SimpleXChat
 struct DeveloperView: View {
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
    @AppStorage(GROUP_DEFAULT_CONFIRM_DB_UPGRADES, store: groupDefaults) private var confirmDatabaseUpgrades = false
-    @AppStorage(DEFAULT_ONE_HAND_UI) private var oneHandUI = false
    @Environment(\.colorScheme) var colorScheme

    var body: some View {
@@ -32,6 +31,9 @@ struct DeveloperView: View {
                    } label: {
                        settingsRow("terminal") { Text("Chat console") }
                    }
+                    settingsRow("internaldrive") {
+                        Toggle("Confirm database upgrades", isOn: $confirmDatabaseUpgrades)
+                    }
                    settingsRow("chevron.left.forwardslash.chevron.right") {
                        Toggle("Show developer options", isOn: $developerTools)
                    }
@@ -40,19 +42,6 @@ struct DeveloperView: View {
                } footer: {
                    (developerTools ? Text("Show:") : Text("Hide:")) + Text(" ") + Text("Database IDs and Transport isolation option.")
                }
-
-                if developerTools {
-                    Section {
-                        settingsRow("internaldrive") {
-                            Toggle("Confirm database upgrades", isOn: $confirmDatabaseUpgrades)
-                        }
-                        settingsRow("hand.wave") {
-                            Toggle("One-hand UI", isOn: $oneHandUI)
-                        }
-                    } header: {
-                        Text("Developer options")
-                    }
-                }
            }
        }
    }
@@ -14,6 +14,7 @@ struct ProtocolServerView: View {
    let serverProtocol: ServerProtocol
    @Binding var server: ServerCfg
    @State var serverToEdit: ServerCfg
+    @State var serverEnabled: Bool
    @State private var showTestFailure = false
    @State private var testing = false
    @State private var testFailure: ProtocolTestFailure?
@@ -110,7 +111,10 @@ struct ProtocolServerView: View {
                Spacer()
                showTestStatus(server: serverToEdit)
            }
-            Toggle("Use for new connections", isOn: $serverToEdit.enabled)
+            Toggle("Use for new connections", isOn: $serverEnabled)
+                .onChange(of: serverEnabled) { enabled in
+                    serverToEdit.enabled = enabled ? .enabled : .disabled
+                }
        }
    }
 }
@@ -179,7 +183,8 @@ struct ProtocolServerView_Previews: PreviewProvider {
        ProtocolServerView(
            serverProtocol: .smp,
            server: Binding.constant(ServerCfg.sampleData.custom),
-            serverToEdit: ServerCfg.sampleData.custom
+            serverToEdit: ServerCfg.sampleData.custom,
+            serverEnabled: true
        )
    }
 }
@@ -159,7 +159,7 @@ struct ProtocolServersView: View {
    }

    private var allServersDisabled: Bool {
-        servers.allSatisfy { !$0.enabled }
+        servers.allSatisfy { $0.enabled != .enabled }
    }

    private func protocolServerView(_ server: Binding<ServerCfg>) -> some View {
@@ -168,7 +168,8 @@ struct ProtocolServersView: View {
            ProtocolServerView(
                serverProtocol: serverProtocol,
                server: server,
-                serverToEdit: srv
+                serverToEdit: srv,
+                serverEnabled: srv.enabled == .enabled
            )
            .navigationBarTitle(srv.preset ? "Preset server" : "Your server")
            .navigationBarTitleDisplayMode(.large)
@@ -181,7 +182,7 @@ struct ProtocolServersView: View {
                            invalidServer()
                        } else if !uniqueAddress(srv, address) {
                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                        } else if !srv.enabled {
+                        } else if srv.enabled != .enabled {
                            Image(systemName: "slash.circle").foregroundColor(.secondary)
                        } else {
                            showTestStatus(server: srv)
@@ -194,7 +195,7 @@ struct ProtocolServersView: View {
                .padding(.trailing, 4)

                let v = Text(address?.hostnames.first ?? srv.server).lineLimit(1)
-                if srv.enabled {
+                if srv.enabled == .enabled {
                    v
                } else {
                    v.foregroundColor(.secondary)
@@ -235,7 +236,7 @@ struct ProtocolServersView: View {
    private func addAllPresets() {
        for srv in presetServers {
            if !hasPreset(srv) {
-                servers.append(ServerCfg(server: srv, preset: true, tested: nil, enabled: true))
+                servers.append(ServerCfg(server: srv, preset: true, tested: nil, enabled: .enabled))
            }
        }
    }
@@ -260,7 +261,7 @@ struct ProtocolServersView: View {

    private func resetTestStatus() {
        for i in 0..<servers.count {
-            if servers[i].enabled {
+            if servers[i].enabled == .enabled {
                servers[i].tested = nil
            }
        }
@@ -269,7 +270,7 @@ struct ProtocolServersView: View {
    private func runServersTest() async -> [String: ProtocolTestFailure] {
        var fs: [String: ProtocolTestFailure] = [:]
        for i in 0..<servers.count {
-            if servers[i].enabled {
+            if servers[i].enabled == .enabled {
                if let f = await testServerConnection(server: $servers[i]) {
                    fs[serverHostname(servers[i].server)] = f
                }
@@ -40,7 +40,7 @@ struct ScanProtocolServer: View {
        switch resp {
        case let .success(r):
            if parseServerAddress(r.string) != nil {
-                servers.append(ServerCfg(server: r.string, preset: false, tested: nil, enabled: true))
+                servers.append(ServerCfg(server: r.string, preset: false, tested: nil, enabled: .enabled))
                dismiss()
            } else {
                showAddressError = true
@@ -46,7 +46,6 @@ let DEFAULT_ACCENT_COLOR_GREEN = "accentColorGreen"
 let DEFAULT_ACCENT_COLOR_BLUE = "accentColorBlue"
 let DEFAULT_USER_INTERFACE_STYLE = "userInterfaceStyle"
 let DEFAULT_PROFILE_IMAGE_CORNER_RADIUS = "profileImageCornerRadius"
-let DEFAULT_ONE_HAND_UI = "oneHandUI"
 let DEFAULT_CONNECT_VIA_LINK_TAB = "connectViaLinkTab"
 let DEFAULT_LIVE_MESSAGE_ALERT_SHOWN = "liveMessageAlertShown"
 let DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE = "showHiddenProfilesNotice"
@@ -61,8 +60,6 @@ let DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS = "deviceNameForRemoteAccess"
 let DEFAULT_CONFIRM_REMOTE_SESSIONS = "confirmRemoteSessions"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST = "connectRemoteViaMulticast"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "connectRemoteViaMulticastAuto"
-let DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE = "showDeleteConversationNotice"
-let DEFAULT_SHOW_DELETE_CONTACT_NOTICE = "showDeleteContactNotice"
 let DEFAULT_SHOW_SENT_VIA_RPOXY = "showSentViaProxy"

 let ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN = "androidCallOnLockScreen"
@@ -93,7 +90,6 @@ let appDefaults: [String: Any] = [
    DEFAULT_ACCENT_COLOR_BLUE: 1.000,
    DEFAULT_USER_INTERFACE_STYLE: 0,
    DEFAULT_PROFILE_IMAGE_CORNER_RADIUS: defaultProfileImageCorner,
-    DEFAULT_ONE_HAND_UI: false,
    DEFAULT_CONNECT_VIA_LINK_TAB: ConnectViaLinkTab.scan.rawValue,
    DEFAULT_LIVE_MESSAGE_ALERT_SHOWN: false,
    DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE: true,
@@ -104,8 +100,6 @@ let appDefaults: [String: Any] = [
    DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
-    DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE: true,
-    DEFAULT_SHOW_DELETE_CONTACT_NOTICE: true,
    DEFAULT_SHOW_SENT_VIA_RPOXY: false,
    ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN: AppSettingsLockScreenCalls.show.rawValue
 ]
@@ -454,8 +448,9 @@ struct SettingsView_Previews: PreviewProvider {
    static var previews: some View {
        let chatModel = ChatModel()
        chatModel.currentUser = User.sampleData
+        @State var showSettings = false

-        return SettingsView(showSettings: Binding.constant(false))
+        return SettingsView(showSettings: $showSettings)
            .environmentObject(chatModel)
    }
 }
@@ -403,6 +403,6 @@ public func chatPasswordHash(_ pwd: String, _ salt: String) -> String {

 struct UserProfilesView_Previews: PreviewProvider {
    static var previews: some View {
-        UserProfilesView(showSettings: Binding.constant(false))
+        UserProfilesView(showSettings: Binding.constant(true))
    }
 }
@@ -150,7 +150,6 @@
 		6407BA83295DA85D0082BA18 /* CIInvalidJSONView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6407BA82295DA85D0082BA18 /* CIInvalidJSONView.swift */; };
 		6419EC562AB8BC8B004A607A /* ContextInvitingContactMemberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */; };
 		6419EC582AB97507004A607A /* CIMemberCreatedContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */; };
-		642CE4952BE2651E00AD7757 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 642CE4942BE2651E00AD7757 /* HomeView.swift */; };
 		6432857C2925443C00FBE5C8 /* GroupPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6432857B2925443C00FBE5C8 /* GroupPreferencesView.swift */; };
 		6440CA00288857A10062C672 /* CIEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6440C9FF288857A10062C672 /* CIEventView.swift */; };
 		6440CA03288AECA70062C672 /* AddGroupMembersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6440CA02288AECA70062C672 /* AddGroupMembersView.swift */; };
@@ -168,11 +167,9 @@
 		646BB38E283FDB6D001CE359 /* LocalAuthenticationUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646BB38D283FDB6D001CE359 /* LocalAuthenticationUtils.swift */; };
 		647F090E288EA27B00644C40 /* GroupMemberInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647F090D288EA27B00644C40 /* GroupMemberInfoView.swift */; };
 		648010AB281ADD15009009B9 /* CIFileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648010AA281ADD15009009B9 /* CIFileView.swift */; };
-		6485F7C62BE8DB6500FAE413 /* ContactsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6485F7C52BE8DB6500FAE413 /* ContactsView.swift */; };
 		648679AB2BC96A74006456E7 /* ChatItemForwardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648679AA2BC96A74006456E7 /* ChatItemForwardingView.swift */; };
 		649BCDA0280460FD00C3A862 /* ComposeImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649BCD9F280460FD00C3A862 /* ComposeImageView.swift */; };
 		649BCDA22805D6EF00C3A862 /* CIImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649BCDA12805D6EF00C3A862 /* CIImageView.swift */; };
-		64A596452BE90DEC00B69266 /* ContactListNavLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64A596442BE90DEC00B69266 /* ContactListNavLink.swift */; };
 		64AA1C6927EE10C800AC7277 /* ContextItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6827EE10C800AC7277 /* ContextItemView.swift */; };
 		64AA1C6C27F3537400AC7277 /* DeletedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */; };
 		64C06EB52A0A4A7C00792D4D /* ChatItemInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64C06EB42A0A4A7C00792D4D /* ChatItemInfoView.swift */; };
@@ -195,11 +192,11 @@
 		D741547A29AF90B00022400A /* PushKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D741547929AF90B00022400A /* PushKit.framework */; };
 		D77B92DC2952372200A5A1CC /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = D77B92DB2952372200A5A1CC /* SwiftyGif */; };
 		D7F0E33929964E7E0068AF69 /* LZString in Frameworks */ = {isa = PBXBuildFile; productRef = D7F0E33829964E7E0068AF69 /* LZString */; };
-		E5D68D3F2C22D78C00CBA347 /* libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5D68D3A2C22D78C00CBA347 /* libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c.a */; };
-		E5D68D402C22D78C00CBA347 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5D68D3B2C22D78C00CBA347 /* libffi.a */; };
-		E5D68D412C22D78C00CBA347 /* libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5D68D3C2C22D78C00CBA347 /* libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c-ghc9.6.3.a */; };
-		E5D68D422C22D78C00CBA347 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5D68D3D2C22D78C00CBA347 /* libgmp.a */; };
-		E5D68D432C22D78C00CBA347 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5D68D3E2C22D78C00CBA347 /* libgmpxx.a */; };
+		E52FF8DA2C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E52FF8D52C34676600BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a */; };
+		E52FF8DB2C34676700BF81EB /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E52FF8D62C34676600BF81EB /* libgmpxx.a */; };
+		E52FF8DC2C34676700BF81EB /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E52FF8D72C34676700BF81EB /* libffi.a */; };
+		E52FF8DD2C34676700BF81EB /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E52FF8D82C34676700BF81EB /* libgmp.a */; };
+		E52FF8DE2C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E52FF8D92C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -448,7 +445,6 @@
 		6407BA82295DA85D0082BA18 /* CIInvalidJSONView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIInvalidJSONView.swift; sourceTree = "<group>"; };
 		6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextInvitingContactMemberView.swift; sourceTree = "<group>"; };
 		6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIMemberCreatedContactView.swift; sourceTree = "<group>"; };
-		642CE4942BE2651E00AD7757 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
 		6432857B2925443C00FBE5C8 /* GroupPreferencesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupPreferencesView.swift; sourceTree = "<group>"; };
 		6440C9FF288857A10062C672 /* CIEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIEventView.swift; sourceTree = "<group>"; };
 		6440CA02288AECA70062C672 /* AddGroupMembersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddGroupMembersView.swift; sourceTree = "<group>"; };
@@ -466,12 +462,10 @@
 		646BB38D283FDB6D001CE359 /* LocalAuthenticationUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalAuthenticationUtils.swift; sourceTree = "<group>"; };
 		647F090D288EA27B00644C40 /* GroupMemberInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupMemberInfoView.swift; sourceTree = "<group>"; };
 		648010AA281ADD15009009B9 /* CIFileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIFileView.swift; sourceTree = "<group>"; };
-		6485F7C52BE8DB6500FAE413 /* ContactsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactsView.swift; sourceTree = "<group>"; };
 		648679AA2BC96A74006456E7 /* ChatItemForwardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemForwardingView.swift; sourceTree = "<group>"; };
 		6493D667280ED77F007A76FB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		649BCD9F280460FD00C3A862 /* ComposeImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeImageView.swift; sourceTree = "<group>"; };
 		649BCDA12805D6EF00C3A862 /* CIImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIImageView.swift; sourceTree = "<group>"; };
-		64A596442BE90DEC00B69266 /* ContactListNavLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactListNavLink.swift; sourceTree = "<group>"; };
 		64AA1C6827EE10C800AC7277 /* ContextItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextItemView.swift; sourceTree = "<group>"; };
 		64AA1C6B27F3537400AC7277 /* DeletedItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletedItemView.swift; sourceTree = "<group>"; };
 		64C06EB42A0A4A7C00792D4D /* ChatItemInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemInfoView.swift; sourceTree = "<group>"; };
@@ -493,11 +487,11 @@
 		D741547729AF89AF0022400A /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
 		D7AA2C3429A936B400737B40 /* MediaEncryption.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = MediaEncryption.playground; path = Shared/MediaEncryption.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
-		E5D68D3A2C22D78C00CBA347 /* libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c.a"; sourceTree = "<group>"; };
-		E5D68D3B2C22D78C00CBA347 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		E5D68D3C2C22D78C00CBA347 /* libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c-ghc9.6.3.a"; sourceTree = "<group>"; };
-		E5D68D3D2C22D78C00CBA347 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		E5D68D3E2C22D78C00CBA347 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		E52FF8D52C34676600BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a"; sourceTree = "<group>"; };
+		E52FF8D62C34676600BF81EB /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		E52FF8D72C34676700BF81EB /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		E52FF8D82C34676700BF81EB /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		E52FF8D92C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -535,13 +529,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E5D68D412C22D78C00CBA347 /* libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c-ghc9.6.3.a in Frameworks */,
+				E52FF8DE2C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a in Frameworks */,
+				E52FF8DB2C34676700BF81EB /* libgmpxx.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				E5D68D3F2C22D78C00CBA347 /* libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c.a in Frameworks */,
-				E5D68D422C22D78C00CBA347 /* libgmp.a in Frameworks */,
-				E5D68D402C22D78C00CBA347 /* libffi.a in Frameworks */,
-				E5D68D432C22D78C00CBA347 /* libgmpxx.a in Frameworks */,
+				E52FF8DC2C34676700BF81EB /* libffi.a in Frameworks */,
+				E52FF8DD2C34676700BF81EB /* libgmp.a in Frameworks */,
+				E52FF8DA2C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -568,13 +562,11 @@
 		5C2E260D27A30E2400F70299 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				642CE4932BE2650500AD7757 /* Home */,
 				5CB0BA8C282711BC00B3292C /* Onboarding */,
 				3C714775281C080100CB4D4B /* Call */,
 				5C971E1F27AEBF7000C8A3CE /* Helpers */,
 				5C5F4AC227A5E9AF00B51EF1 /* Chat */,
 				5CB9250B27A942F300ACCCDD /* ChatList */,
-				6485F7C42BE8DB4F00FAE413 /* Contacts */,
 				5CB924DD27A8622200ACCCDD /* NewChat */,
 				5CFA59C22860B04D00863A68 /* Database */,
 				5CB634AB29E46CDB0066AD6B /* LocalAuth */,
@@ -609,11 +601,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				E5D68D3B2C22D78C00CBA347 /* libffi.a */,
-				E5D68D3D2C22D78C00CBA347 /* libgmp.a */,
-				E5D68D3E2C22D78C00CBA347 /* libgmpxx.a */,
-				E5D68D3C2C22D78C00CBA347 /* libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c-ghc9.6.3.a */,
-				E5D68D3A2C22D78C00CBA347 /* libHSsimplex-chat-5.8.1.0-GEbUSGuGADZH0bnStuks0c.a */,
+				E52FF8D72C34676700BF81EB /* libffi.a */,
+				E52FF8D82C34676700BF81EB /* libgmp.a */,
+				E52FF8D62C34676600BF81EB /* libgmpxx.a */,
+				E52FF8D52C34676600BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7-ghc9.6.3.a */,
+				E52FF8D92C34676700BF81EB /* libHSsimplex-chat-5.8.2.0-D50x9PQRTdqAAO9AQK2dA7.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -907,14 +899,6 @@
 			path = Database;
 			sourceTree = "<group>";
 		};
-		642CE4932BE2650500AD7757 /* Home */ = {
-			isa = PBXGroup;
-			children = (
-				642CE4942BE2651E00AD7757 /* HomeView.swift */,
-			);
-			path = Home;
-			sourceTree = "<group>";
-		};
 		6440CA01288AEC770062C672 /* Group */ = {
 			isa = PBXGroup;
 			children = (
@@ -929,15 +913,6 @@
 			path = Group;
 			sourceTree = "<group>";
 		};
-		6485F7C42BE8DB4F00FAE413 /* Contacts */ = {
-			isa = PBXGroup;
-			children = (
-				6485F7C52BE8DB6500FAE413 /* ContactsView.swift */,
-				64A596442BE90DEC00B69266 /* ContactListNavLink.swift */,
-			);
-			path = Contacts;
-			sourceTree = "<group>";
-		};
 		8C7D94982B8894D300B7B9E1 /* Migration */ = {
 			isa = PBXGroup;
 			children = (
@@ -1173,7 +1148,6 @@
 				5CB0BA9A2827FD8800B3292C /* HowItWorks.swift in Sources */,
 				5C13730B28156D2700F43030 /* ContactConnectionView.swift in Sources */,
 				644EFFE0292CFD7F00525D5B /* CIVoiceView.swift in Sources */,
-				64A596452BE90DEC00B69266 /* ContactListNavLink.swift in Sources */,
 				6432857C2925443C00FBE5C8 /* GroupPreferencesView.swift in Sources */,
 				5C93293129239BED0090FFF9 /* ProtocolServerView.swift in Sources */,
 				5C9CC7AD28C55D7800BEF955 /* DatabaseEncryptionView.swift in Sources */,
@@ -1194,7 +1168,6 @@
 				5CB2084F28DA4B4800D024EC /* RTCServers.swift in Sources */,
 				5CB634AF29E4BB7D0066AD6B /* SetAppPasscodeView.swift in Sources */,
 				5C10D88828EED12E00E58BF0 /* ContactConnectionInfo.swift in Sources */,
-				6485F7C62BE8DB6500FAE413 /* ContactsView.swift in Sources */,
 				5CBE6C12294487F7002D9531 /* VerifyCodeView.swift in Sources */,
 				3CDBCF4227FAE51000354CDD /* ComposeLinkView.swift in Sources */,
 				648679AB2BC96A74006456E7 /* ChatItemForwardingView.swift in Sources */,
@@ -1239,7 +1212,6 @@
 				5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */,
 				5C35CFC827B2782E00FB6C6D /* BGManager.swift in Sources */,
 				5CB634B129E5EFEA0066AD6B /* PasscodeView.swift in Sources */,
-				642CE4952BE2651E00AD7757 /* HomeView.swift in Sources */,
 				8C69FE7D2B8C7D2700267E38 /* AppSettings.swift in Sources */,
 				5C2E260F27A30FDC00F70299 /* ChatView.swift in Sources */,
 				5C2E260B27A30CFA00F70299 /* ChatListView.swift in Sources */,
@@ -1580,7 +1552,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 226;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1605,7 +1577,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 5.8.1;
+				MARKETING_VERSION = 5.8.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1629,7 +1601,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 226;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1654,7 +1626,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.8.1;
+				MARKETING_VERSION = 5.8.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1715,7 +1687,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 226;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -1730,7 +1702,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.8.1;
+				MARKETING_VERSION = 5.8.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1752,7 +1724,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 226;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -1767,7 +1739,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.8.1;
+				MARKETING_VERSION = 5.8.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1789,7 +1761,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 226;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1815,7 +1787,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.8.1;
+				MARKETING_VERSION = 5.8.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1840,7 +1812,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 226;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1866,7 +1838,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 5.8.1;
+				MARKETING_VERSION = 5.8.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -99,7 +99,7 @@ public enum ChatCommand {
    case apiConnectPlan(userId: Int64, connReq: String)
    case apiConnect(userId: Int64, incognito: Bool, connReq: String)
    case apiConnectContactViaAddress(userId: Int64, incognito: Bool, contactId: Int64)
-    case apiDeleteChat(type: ChatType, id: Int64, chatDeleteMode: ChatDeleteMode)
+    case apiDeleteChat(type: ChatType, id: Int64, notify: Bool?)
    case apiClearChat(type: ChatType, id: Int64)
    case apiListContacts(userId: Int64)
    case apiUpdateProfile(userId: Int64, profile: Profile)
@@ -257,7 +257,11 @@ public enum ChatCommand {
            case let .apiConnectPlan(userId, connReq): return "/_connect plan \(userId) \(connReq)"
            case let .apiConnect(userId, incognito, connReq): return "/_connect \(userId) incognito=\(onOff(incognito)) \(connReq)"
            case let .apiConnectContactViaAddress(userId, incognito, contactId): return "/_connect contact \(userId) incognito=\(onOff(incognito)) \(contactId)"
-            case let .apiDeleteChat(type, id, chatDeleteMode): return "/_delete \(ref(type, id)) \(chatDeleteMode.cmdString)"
+            case let .apiDeleteChat(type, id, notify): if let notify = notify {
+                return "/_delete \(ref(type, id)) notify=\(onOff(notify))"
+            } else {
+                return "/_delete \(ref(type, id))"
+            }
            case let .apiClearChat(type, id): return "/_clear chat \(ref(type, id))"
            case let .apiListContacts(userId): return "/_contacts \(userId)"
            case let .apiUpdateProfile(userId, profile): return "/_profile \(userId) \(encodeJSON(profile))"
@@ -481,6 +485,10 @@ public enum ChatCommand {
        return nil
    }

+    private func onOff(_ b: Bool) -> String {
+        b ? "on" : "off"
+    }
+
    private func onOffParam(_ param: String, _ b: Bool?) -> String {
        if let b = b {
            return " \(param)=\(onOff(b))"
@@ -493,10 +501,6 @@ public enum ChatCommand {
    }
 }

-private func onOff(_ b: Bool) -> String {
-    b ? "on" : "off"
-}
-
 public struct APIResponse: Decodable {
    var resp: ChatResponse
 }
@@ -1006,20 +1010,6 @@ public func chatError(_ chatResponse: ChatResponse) -> ChatErrorType? {
    }
 }

-public enum ChatDeleteMode: Codable {
-    case full(notify: Bool)
-    case entity(notify: Bool)
-    case messages
-
-    var cmdString: String {
-        switch self {
-        case let .full(notify): "full notify=\(onOff(notify))"
-        case let .entity(notify): "entity notify=\(onOff(notify))"
-        case .messages: "messages"
-        }
-    }
-}
-
 public enum ConnectionPlan: Decodable {
    case invitationLink(invitationLinkPlan: InvitationLinkPlan)
    case contactAddress(contactAddressPlan: ContactAddressPlan)
@@ -1119,13 +1109,13 @@ public struct ServerCfg: Identifiable, Equatable, Codable {
    public var server: String
    public var preset: Bool
    public var tested: Bool?
-    public var enabled: Bool
+    public var enabled: ServerEnabled
    var createdAt = Date()
 //    public var sendEnabled: Bool // can we potentially want to prevent sending on the servers we use to receive?
 // Even if we don't see the use case, it's probably better to allow it in the model
 // In any case, "trusted/known" servers are out of scope of this change

-    public init(server: String, preset: Bool, tested: Bool?, enabled: Bool) {
+    public init(server: String, preset: Bool, tested: Bool?, enabled: ServerEnabled) {
        self.server = server
        self.preset = preset
        self.tested = tested
@@ -1138,7 +1128,7 @@ public struct ServerCfg: Identifiable, Equatable, Codable {

    public var id: String { "\(server) \(createdAt)" }

-    public static var empty = ServerCfg(server: "", preset: false, tested: nil, enabled: true)
+    public static var empty = ServerCfg(server: "", preset: false, tested: nil, enabled: .enabled)

    public var isEmpty: Bool {
        server.trimmingCharacters(in: .whitespaces) == ""
@@ -1155,19 +1145,19 @@ public struct ServerCfg: Identifiable, Equatable, Codable {
            server: "smp://abcd@smp8.simplex.im",
            preset: true,
            tested: true,
-            enabled: true
+            enabled: .enabled
        ),
        custom: ServerCfg(
            server: "smp://abcd@smp9.simplex.im",
            preset: false,
            tested: false,
-            enabled: false
+            enabled: .disabled
        ),
        untested: ServerCfg(
            server: "smp://abcd@smp10.simplex.im",
            preset: false,
            tested: nil,
-            enabled: true
+            enabled: .enabled
        )
    )

@@ -1179,6 +1169,12 @@ public struct ServerCfg: Identifiable, Equatable, Codable {
    }
 }

+public enum ServerEnabled: String, Codable {
+    case disabled
+    case enabled
+    case known
+}
+
 public enum ProtocolTestStep: String, Decodable, Equatable {
    case connect
    case disconnect
@@ -2081,7 +2077,6 @@ public struct AppSettings: Codable, Equatable {
    public var androidCallOnLockScreen: AppSettingsLockScreenCalls? = nil
    public var iosCallKitEnabled: Bool? = nil
    public var iosCallKitCallsInRecents: Bool? = nil
-    public var oneHandUI: Bool? = nil

    public func prepareForExport() -> AppSettings {
        var empty = AppSettings()
@@ -2106,7 +2101,6 @@ public struct AppSettings: Codable, Equatable {
        if androidCallOnLockScreen != def.androidCallOnLockScreen { empty.androidCallOnLockScreen = androidCallOnLockScreen }
        if iosCallKitEnabled != def.iosCallKitEnabled { empty.iosCallKitEnabled = iosCallKitEnabled }
        if iosCallKitCallsInRecents != def.iosCallKitCallsInRecents { empty.iosCallKitCallsInRecents = iosCallKitCallsInRecents }
-        if oneHandUI != def.oneHandUI { empty.oneHandUI = oneHandUI }
        return empty
    }

@@ -2131,8 +2125,7 @@ public struct AppSettings: Codable, Equatable {
            confirmDBUpgrades: false,
            androidCallOnLockScreen: AppSettingsLockScreenCalls.show,
            iosCallKitEnabled: true,
-            iosCallKitCallsInRecents: false,
-            oneHandUI: false
+            iosCallKitCallsInRecents: false
        )
    }
 }
@@ -1287,15 +1287,6 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat {
        }
    }

-    public var chatDeleted: Bool {
-        get {
-            switch self {
-            case let .direct(contact): return contact.chatDeleted
-            default: return false
-            }
-        }
-    }
-
    public var sendMsgEnabled: Bool {
        get {
            switch self {
@@ -1513,7 +1504,6 @@ public struct Contact: Identifiable, Decodable, NamedChat {
    var chatTs: Date?
    var contactGroupMemberId: Int64?
    var contactGrpInvSent: Bool
-    public var chatDeleted: Bool

    public var id: ChatId { get { "@\(contactId)" } }
    public var apiId: Int64 { get { contactId } }
@@ -1580,15 +1570,13 @@ public struct Contact: Identifiable, Decodable, NamedChat {
        mergedPreferences: ContactUserPreferences.sampleData,
        createdAt: .now,
        updatedAt: .now,
-        contactGrpInvSent: false,
-        chatDeleted: false
+        contactGrpInvSent: false
    )
 }

 public enum ContactStatus: String, Decodable {
    case active = "active"
    case deleted = "deleted"
-    case deletedByUser = "deletedByUser"
 }

 public struct ContactRef: Decodable, Equatable {
@@ -179,6 +179,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
      override fun notifyCallInvitation(invitation: RcvCallInvitation): Boolean = NtfManager.notifyCallInvitation(invitation)
      override fun hasNotificationsForChat(chatId: String): Boolean = NtfManager.hasNotificationsForChat(chatId)
      override fun cancelNotificationsForChat(chatId: String) = NtfManager.cancelNotificationsForChat(chatId)
+      override fun cancelNotificationsForUser(userId: Long) = NtfManager.cancelNotificationsForUser(userId)
      override fun displayNotification(user: UserLike, chatId: String, displayName: String, msgText: String, image: String?, actions: List<Pair<NotificationAction, () -> Unit>>) = NtfManager.displayNotification(user, chatId, displayName, msgText, image, actions.map { it.first })
      override fun androidCreateNtfChannelsMaybeShowAlert() = NtfManager.createNtfChannelsMaybeShowAlert()
      override fun cancelCallNotification() = NtfManager.cancelCallNotification()
@@ -48,7 +48,8 @@ object NtfManager {
  }

  private val manager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-  private var prevNtfTime = mutableMapOf<String, Long>()
+  // (UserId, ChatId) -> Time
+  private var prevNtfTime = mutableMapOf<Pair<Long, ChatId>, Long>()
  private val msgNtfTimeoutMs = 30000L

  init {
@@ -72,7 +73,8 @@ object NtfManager {
  }

  fun cancelNotificationsForChat(chatId: String) {
-    prevNtfTime.remove(chatId)
+    val key = prevNtfTime.keys.firstOrNull { it.second == chatId }
+    prevNtfTime.remove(key)
    manager.cancel(chatId.hashCode())
    val msgNtfs = manager.activeNotifications.filter { ntf ->
      ntf.notification.channelId == MessageChannel
@@ -83,12 +85,26 @@ object NtfManager {
    }
  }

+  fun cancelNotificationsForUser(userId: Long) {
+    prevNtfTime.keys.filter { it.first == userId }.forEach {
+      prevNtfTime.remove(it)
+      manager.cancel(it.second.hashCode())
+    }
+    val msgNtfs = manager.activeNotifications.filter { ntf ->
+      ntf.notification.channelId == MessageChannel
+    }
+    if (msgNtfs.size <= 1) {
+      // Have a group notification with no children so cancel it
+      manager.cancel(0)
+    }
+  }
+
  fun displayNotification(user: UserLike, chatId: String, displayName: String, msgText: String, image: String? = null, actions: List<NotificationAction> = emptyList()) {
    if (!user.showNotifications) return
    Log.d(TAG, "notifyMessageReceived $chatId")
    val now = Clock.System.now().toEpochMilliseconds()
-    val recentNotification = (now - prevNtfTime.getOrDefault(chatId, 0) < msgNtfTimeoutMs)
-    prevNtfTime[chatId] = now
+    val recentNotification = (now - prevNtfTime.getOrDefault(user.userId to chatId, 0) < msgNtfTimeoutMs)
+    prevNtfTime[user.userId to chatId] = now
    val previewMode = appPreferences.notificationPreviewMode.get()
    val title = if (previewMode == NotificationPreviewMode.HIDDEN.name) generalGetString(MR.strings.notification_preview_somebody) else displayName
    val content = if (previewMode != NotificationPreviewMode.MESSAGE.name) generalGetString(MR.strings.notification_preview_new_message) else msgText
@@ -1,4 +1,4 @@
-package chat.simplex.common.views.home
+package chat.simplex.common.views.chatlist

 import android.app.Activity
 import androidx.compose.foundation.*
@@ -4,12 +4,16 @@ import androidx.compose.animation.core.Animatable
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.views.usersettings.SetDeliveryReceiptsView
@@ -24,7 +28,6 @@ import chat.simplex.common.views.chat.ChatView
 import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.database.DatabaseErrorView
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.home.*
 import chat.simplex.common.views.localauth.VerticalDivider
 import chat.simplex.common.views.onboarding.*
 import chat.simplex.common.views.usersettings.*
@@ -284,7 +287,7 @@ fun StartPartOfScreen(settingsState: SettingsViewState) {
  } else {
    val stopped = chatModel.chatRunning.value == false
    if (chatModel.sharedContent.value == null)
-      HomeView(chatModel, settingsState, AppLock::setPerformLA, stopped)
+      ChatListView(chatModel, settingsState, AppLock::setPerformLA, stopped)
    else
      ShareListView(chatModel, settingsState, stopped)
  }
@@ -52,6 +52,7 @@ object ChatModel {
  val chatDbStatus = mutableStateOf<DBMigrationResult?>(null)
  val ctrlInitInProgress = mutableStateOf(false)
  val dbMigrationInProgress = mutableStateOf(false)
+  val incompleteInitializedDbRemoved = mutableStateOf(false)
  val chats = mutableStateListOf<Chat>()
  // map of connections network statuses, key is agent connection id
  val networkStatuses = mutableStateMapOf<String, NetworkStatus>()
@@ -779,7 +780,6 @@ interface SomeChat {
  val id: ChatId
  val apiId: Long
  val ready: Boolean
-  val chatDeleted: Boolean
  val sendMsgEnabled: Boolean
  val ntfsEnabled: Boolean
  val incognito: Boolean
@@ -860,7 +860,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val id get() = contact.id
    override val apiId get() = contact.apiId
    override val ready get() = contact.ready
-    override val chatDeleted get() = contact.chatDeleted
    override val sendMsgEnabled get() = contact.sendMsgEnabled
    override val ntfsEnabled get() = contact.ntfsEnabled
    override val incognito get() = contact.incognito
@@ -885,7 +884,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val id get() = groupInfo.id
    override val apiId get() = groupInfo.apiId
    override val ready get() = groupInfo.ready
-    override val chatDeleted get() = groupInfo.chatDeleted
    override val sendMsgEnabled get() = groupInfo.sendMsgEnabled
    override val ntfsEnabled get() = groupInfo.ntfsEnabled
    override val incognito get() = groupInfo.incognito
@@ -910,7 +908,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val id get() = noteFolder.id
    override val apiId get() = noteFolder.apiId
    override val ready get() = noteFolder.ready
-    override val chatDeleted get() = noteFolder.chatDeleted
    override val sendMsgEnabled get() = noteFolder.sendMsgEnabled
    override val ntfsEnabled get() = noteFolder.ntfsEnabled
    override val incognito get() = noteFolder.incognito
@@ -935,7 +932,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val id get() = contactRequest.id
    override val apiId get() = contactRequest.apiId
    override val ready get() = contactRequest.ready
-    override val chatDeleted get() = contactRequest.chatDeleted
    override val sendMsgEnabled get() = contactRequest.sendMsgEnabled
    override val ntfsEnabled get() = contactRequest.ntfsEnabled
    override val incognito get() = contactRequest.incognito
@@ -960,7 +956,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val id get() = contactConnection.id
    override val apiId get() = contactConnection.apiId
    override val ready get() = contactConnection.ready
-    override val chatDeleted get() = contactConnection.chatDeleted
    override val sendMsgEnabled get() = contactConnection.sendMsgEnabled
    override val ntfsEnabled get() = false
    override val incognito get() = contactConnection.incognito
@@ -986,7 +981,6 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val id get() = ""
    override val apiId get() = 0L
    override val ready get() = false
-    override val chatDeleted get() = false
    override val sendMsgEnabled get() = false
    override val ntfsEnabled get() = false
    override val incognito get() = false
@@ -1063,7 +1057,6 @@ data class Contact(
  val chatTs: Instant?,
  val contactGroupMemberId: Long? = null,
  val contactGrpInvSent: Boolean,
-  override val chatDeleted: Boolean,
  val uiThemes: ThemeModeOverrides? = null,
 ): SomeChat, NamedChat {
  override val chatType get() = ChatType.Direct
@@ -1137,7 +1130,6 @@ data class Contact(
      updatedAt = Clock.System.now(),
      chatTs = Clock.System.now(),
      contactGrpInvSent = false,
-      chatDeleted = false,
      uiThemes = null,
    )
  }
@@ -1146,8 +1138,7 @@ data class Contact(
@Serializable
 enum class ContactStatus {
  @SerialName("active") Active,
-  @SerialName("deleted") Deleted,
-  @SerialName("deletedByUser") DeletedByUser;
+  @SerialName("deleted") Deleted;
 }

@Serializable
@@ -1286,7 +1277,6 @@ data class GroupInfo (
  override val id get() = "#$groupId"
  override val apiId get() = groupId
  override val ready get() = membership.memberActive
-  override val chatDeleted get() = false
  override val sendMsgEnabled get() = membership.memberActive
  override val ntfsEnabled get() = chatSettings.enableNtfs == MsgFilter.All
  override val incognito get() = membership.memberIncognito
@@ -1592,7 +1582,6 @@ class NoteFolder(
  override val chatType get() = ChatType.Local
  override val id get() = "*$noteFolderId"
  override val apiId get() = noteFolderId
-  override val chatDeleted get() = false
  override val ready get() = true
  override val sendMsgEnabled get() = true
  override val ntfsEnabled get() = false
@@ -1629,7 +1618,6 @@ class UserContactRequest (
  override val chatType get() = ChatType.ContactRequest
  override val id get() = "<@$contactRequestId"
  override val apiId get() = contactRequestId
-  override val chatDeleted get() = false
  override val ready get() = true
  override val sendMsgEnabled get() = false
  override val ntfsEnabled get() = false
@@ -1669,7 +1657,6 @@ class PendingContactConnection(
  override val chatType get() = ChatType.ContactConnection
  override val id get () = ":$pccConnId"
  override val apiId get() = pccConnId
-  override val chatDeleted get() = false
  override val ready get() = false
  override val sendMsgEnabled get() = false
  override val ntfsEnabled get() = false
@@ -176,6 +176,12 @@ class AppPreferences {
  val selfDestruct = mkBoolPreference(SHARED_PREFS_SELF_DESTRUCT, false)
  val selfDestructDisplayName = mkStrPreference(SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME, null)

+  // This flag is set when database is first initialized and resets only when the database is removed.
+  // This is needed for recover from incomplete initialization when only one database file is created.
+  // If false - the app will clear database folder on missing file and re-initialize.
+  // Note that this situation can only happen if passphrase for the first database is incorrect because, otherwise, backend will re-create second database automatically
+  val newDatabaseInitialized = mkBoolPreference(SHARED_PREFS_NEW_DATABASE_INITIALIZED, false)
+
  val currentTheme = mkStrPreference(SHARED_PREFS_CURRENT_THEME, DefaultTheme.SYSTEM_THEME_NAME)
  val systemDarkTheme = mkStrPreference(SHARED_PREFS_SYSTEM_DARK_THEME, DefaultTheme.SIMPLEX.themeName)
  val currentThemeIds = mkMapPreference(SHARED_PREFS_CURRENT_THEME_IDs, mapOf(), encode = {
@@ -204,8 +210,6 @@ class AppPreferences {

  val desktopWindowState = mkStrPreference(SHARED_PREFS_DESKTOP_WINDOW_STATE, null)

-  val showDeleteConversationNotice = mkBoolPreference(SHARED_PREFS_SHOW_DELETE_CONVERSATION_NOTICE, true)
-  val showDeleteContactNotice = mkBoolPreference(SHARED_PREFS_SHOW_DELETE_CONTACT_NOTICE, true)
  val showSentViaProxy = mkBoolPreference(SHARED_PREFS_SHOW_SENT_VIA_RPOXY, false)


@@ -363,6 +367,7 @@ class AppPreferences {
    private const val SHARED_PREFS_ENCRYPTED_SELF_DESTRUCT_PASSPHRASE = "EncryptedSelfDestructPassphrase"
    private const val SHARED_PREFS_INITIALIZATION_VECTOR_SELF_DESTRUCT_PASSPHRASE = "InitializationVectorSelfDestructPassphrase"
    private const val SHARED_PREFS_ENCRYPTION_STARTED_AT = "EncryptionStartedAt"
+    private const val SHARED_PREFS_NEW_DATABASE_INITIALIZED = "NewDatabaseInitialized"
    private const val SHARED_PREFS_CONFIRM_DB_UPGRADES = "ConfirmDBUpgrades"
    private const val SHARED_PREFS_SELF_DESTRUCT = "LocalAuthenticationSelfDestruct"
    private const val SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME = "LocalAuthenticationSelfDestructDisplayName"
@@ -382,8 +387,6 @@ class AppPreferences {
    private const val SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "ConnectRemoteViaMulticastAuto"
    private const val SHARED_PREFS_OFFER_REMOTE_MULTICAST = "OfferRemoteMulticast"
    private const val SHARED_PREFS_DESKTOP_WINDOW_STATE = "DesktopWindowState"
-    private const val SHARED_PREFS_SHOW_DELETE_CONVERSATION_NOTICE = "showDeleteConversationNotice"
-    private const val SHARED_PREFS_SHOW_DELETE_CONTACT_NOTICE = "showDeleteContactNotice"
    private const val SHARED_PREFS_SHOW_SENT_VIA_RPOXY = "showSentViaProxy"

    private const val SHARED_PREFS_IOS_CALL_KIT_ENABLED = "iOSCallKitEnabled"
@@ -495,11 +498,15 @@ object ChatController {
  }

  suspend fun changeActiveUser_(rhId: Long?, toUserId: Long?, viewPwd: String?) {
+    val prevActiveUser = chatModel.currentUser.value
    val currentUser = changingActiveUserMutex.withLock {
      (if (toUserId != null) apiSetActiveUser(rhId, toUserId, viewPwd) else apiGetActiveUser(rhId)).also {
        chatModel.currentUser.value = it
      }
    }
+    if (prevActiveUser?.hidden == true) {
+      ntfManager.cancelNotificationsForUser(prevActiveUser.userId)
+    }
    val users = listUsers(rhId)
    chatModel.users.clear()
    chatModel.users.addAll(users)
@@ -1112,16 +1119,16 @@ object ChatController {
    }
  }

-  suspend fun deleteChat(chat: Chat, chatDeleteMode: ChatDeleteMode = ChatDeleteMode.Full(notify = true)) {
+  suspend fun deleteChat(chat: Chat, notify: Boolean? = null) {
    val cInfo = chat.chatInfo
-    if (apiDeleteChat(rh = chat.remoteHostId, type = cInfo.chatType, id = cInfo.apiId, chatDeleteMode = chatDeleteMode)) {
+    if (apiDeleteChat(rh = chat.remoteHostId, type = cInfo.chatType, id = cInfo.apiId, notify = notify)) {
      chatModel.removeChat(chat.remoteHostId, cInfo.id)
    }
  }

-  suspend fun apiDeleteChat(rh: Long?, type: ChatType, id: Long, chatDeleteMode: ChatDeleteMode = ChatDeleteMode.Full(notify = true)): Boolean {
+  suspend fun apiDeleteChat(rh: Long?, type: ChatType, id: Long, notify: Boolean? = null): Boolean {
    chatModel.deletedChats.value += rh to type.type + id
-    val r = sendCmd(rh, CC.ApiDeleteChat(type, id, chatDeleteMode))
+    val r = sendCmd(rh, CC.ApiDeleteChat(type, id, notify))
    val success = when {
      r is CR.ContactDeleted && type == ChatType.Direct -> true
      r is CR.ContactConnectionDeleted && type == ChatType.ContactConnection -> true
@@ -1142,22 +1149,6 @@ object ChatController {
    return success
  }

-  suspend fun apiDeleteContact(rh: Long?, id: Long, chatDeleteMode: ChatDeleteMode = ChatDeleteMode.Full(notify = true)): Contact? {
-    val type = ChatType.Direct
-    chatModel.deletedChats.value += rh to type.type + id
-    val r = sendCmd(rh, CC.ApiDeleteChat(type, id, chatDeleteMode))
-    val contact = when {
-      r is CR.ContactDeleted -> r.contact
-      else -> {
-        val titleId = MR.strings.error_deleting_contact
-        apiErrorAlert("apiDeleteChat", generalGetString(titleId), r)
-        null
-      }
-    }
-    chatModel.deletedChats.value -= rh to type.type + id
-    return contact
-  }
-
  fun clearChat(chat: Chat, close: (() -> Unit)? = null) {
    withBGApi {
      val updatedChatInfo = apiClearChat(chat.remoteHostId, chat.chatInfo.chatType, chat.chatInfo.apiId)
@@ -1896,10 +1887,6 @@ object ChatController {
        val cInfo = r.chatItem.chatInfo
        val cItem = r.chatItem.chatItem
        if (active(r.user)) {
-          if (cInfo is ChatInfo.Direct && cInfo.chatDeleted) {
-            val updatedContact = cInfo.contact.copy(chatDeleted = false)
-            chatModel.updateContact(rhId, updatedContact)
-          }
          chatModel.addChatItem(rhId, cInfo, cItem)
        } else if (cItem.isRcvNew && cInfo.ntfsEnabled) {
          chatModel.increaseUnreadCounter(rhId, r.user)
@@ -2371,6 +2358,8 @@ object ChatController {
      notify()
    } else if (chatModel.upsertChatItem(rh, cInfo, cItem)) {
      notify()
+    } else if (cItem.content is CIContent.RcvCall && cItem.content.status == CICallStatus.Missed) {
+      notify()
    }
  }

@@ -2609,7 +2598,7 @@ sealed class CC {
  class APIConnectPlan(val userId: Long, val connReq: String): CC()
  class APIConnect(val userId: Long, val incognito: Boolean, val connReq: String): CC()
  class ApiConnectContactViaAddress(val userId: Long, val incognito: Boolean, val contactId: Long): CC()
-  class ApiDeleteChat(val type: ChatType, val id: Long, val chatDeleteMode: ChatDeleteMode): CC()
+  class ApiDeleteChat(val type: ChatType, val id: Long, val notify: Boolean?): CC()
  class ApiClearChat(val type: ChatType, val id: Long): CC()
  class ApiListContacts(val userId: Long): CC()
  class ApiUpdateProfile(val userId: Long, val profile: Profile): CC()
@@ -2756,7 +2745,11 @@ sealed class CC {
    is APIConnectPlan -> "/_connect plan $userId $connReq"
    is APIConnect -> "/_connect $userId incognito=${onOff(incognito)} $connReq"
    is ApiConnectContactViaAddress -> "/_connect contact $userId incognito=${onOff(incognito)} $contactId"
-    is ApiDeleteChat -> "/_delete ${chatRef(type, id)} ${chatDeleteMode.cmdString}"
+    is ApiDeleteChat -> if (notify != null) {
+      "/_delete ${chatRef(type, id)} notify=${onOff(notify)}"
+    } else {
+      "/_delete ${chatRef(type, id)}"
+    }
    is ApiClearChat -> "/_clear chat ${chatRef(type, id)}"
    is ApiListContacts -> "/_contacts $userId"
    is ApiUpdateProfile -> "/_profile $userId ${json.encodeToString(profile)}"
@@ -2969,6 +2962,8 @@ sealed class CC {
      null
    }

+  private fun onOff(b: Boolean): String = if (b) "on" else "off"
+
  private fun maybePwd(pwd: String?): String = if (pwd == "" || pwd == null) "" else " " + json.encodeToString(pwd)

  companion object {
@@ -2978,8 +2973,6 @@ sealed class CC {
  }
 }

-fun onOff(b: Boolean): String = if (b) "on" else "off"
-
@Serializable
 data class NewUser(
  val profile: Profile?,
@@ -3038,7 +3031,7 @@ data class ServerCfg(
  val server: String,
  val preset: Boolean,
  val tested: Boolean? = null,
-  val enabled: Boolean
+  val enabled: ServerEnabled
 ) {
  @Transient
  private val createdAt: Date = Date()
@@ -3052,7 +3045,7 @@ data class ServerCfg(
    get() = server.isBlank()

  companion object {
-    val empty = ServerCfg(remoteHostId = null, server = "", preset = false, tested = null, enabled = true)
+    val empty = ServerCfg(remoteHostId = null, server = "", preset = false, tested = null, enabled = ServerEnabled.Enabled)

    class SampleData(
      val preset: ServerCfg,
@@ -3066,26 +3059,33 @@ data class ServerCfg(
        server = "smp://abcd@smp8.simplex.im",
        preset = true,
        tested = true,
-        enabled = true
+        enabled = ServerEnabled.Enabled
      ),
      custom = ServerCfg(
        remoteHostId = null,
        server = "smp://abcd@smp9.simplex.im",
        preset = false,
        tested = false,
-        enabled = false
+        enabled = ServerEnabled.Disabled
      ),
      untested = ServerCfg(
        remoteHostId = null,
        server = "smp://abcd@smp10.simplex.im",
        preset = false,
        tested = null,
-        enabled = true
+        enabled = ServerEnabled.Enabled
      )
    )
  }
 }

+@Serializable
+enum class ServerEnabled {
+  @SerialName("disabled") Disabled,
+  @SerialName("enabled") Enabled,
+  @SerialName("known") Known;
+}
+
@Serializable
 enum class ProtocolTestStep {
  @SerialName("connect") Connect,
@@ -4801,19 +4801,6 @@ fun chatError(r: CR): ChatErrorType? {
      )
 }

-@Serializable
-sealed class ChatDeleteMode {
-  @Serializable @SerialName("full") class Full(val notify: Boolean): ChatDeleteMode()
-  @Serializable @SerialName("entity") class Entity(val notify: Boolean): ChatDeleteMode()
-  @Serializable @SerialName("messages") class Messages: ChatDeleteMode()
-
-  val cmdString: String get() = when (this) {
-    is ChatDeleteMode.Full -> "full notify=${onOff(notify)}"
-    is ChatDeleteMode.Entity -> "entity notify=${onOff(notify)}"
-    is ChatDeleteMode.Messages -> "messages"
-  }
-}
-
@Serializable
 sealed class ConnectionPlan {
  @Serializable @SerialName("invitationLink") class InvitationLink(val invitationLinkPlan: InvitationLinkPlan): ConnectionPlan()
@@ -88,8 +88,23 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
    chatModel.chatDbStatus.value = res
    if (res != DBMigrationResult.OK) {
      Log.d(TAG, "Unable to migrate successfully: $res")
+      if (!appPrefs.newDatabaseInitialized.get() && DatabaseUtils.hasOnlyOneDatabase(dataDir.absolutePath)) {
+        if (chatModel.incompleteInitializedDbRemoved.value) {
+          Log.d(TAG, "Incomplete initialized databases were removed but after repeated migration only one database exists again, not trying to remove again")
+        } else {
+          val dbPath = dbAbsolutePrefixPath
+          File(dbPath + "_chat.db").delete()
+          File(dbPath + "_agent.db").delete()
+          chatModel.incompleteInitializedDbRemoved.value = true
+          Log.d(TAG, "Incomplete initialized databases were removed for the first time, repeating migration")
+          chatModel.ctrlInitInProgress.value = false
+          initChatController(useKey, confirmMigrations, startChat)
+        }
+      }
      return
    }
+    appPrefs.newDatabaseInitialized.set(true)
+    chatModel.incompleteInitializedDbRemoved.value = false
    platform.androidRestartNetworkObserver()
    controller.apiSetAppFilePaths(
      appFilesDir.absolutePath,
@@ -96,6 +96,7 @@ abstract class NtfManager {
  abstract fun notifyCallInvitation(invitation: RcvCallInvitation): Boolean
  abstract fun hasNotificationsForChat(chatId: String): Boolean
  abstract fun cancelNotificationsForChat(chatId: String)
+  abstract fun cancelNotificationsForUser(userId: Long)
  abstract fun displayNotification(user: UserLike, chatId: String, displayName: String, msgText: String, image: String? = null, actions: List<Pair<NotificationAction, () -> Unit>> = emptyList())
  abstract fun cancelCallNotification()
  abstract fun cancelAllNotifications()
@@ -12,14 +12,12 @@ import SectionView
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.text.*
 import dev.icerock.moko.resources.compose.painterResource
@@ -37,8 +35,7 @@ import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.common.platform.*
-import chat.simplex.common.views.call.CallMediaType
-import chat.simplex.common.views.chatlist.*
+import chat.simplex.common.views.chatlist.updateChatSettings
 import chat.simplex.common.views.newchat.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.delay
@@ -48,21 +45,9 @@ import kotlinx.datetime.Clock
 import kotlinx.serialization.encodeToString
 import java.io.File

-sealed class ContactDeleteMode {
-  class Full: ContactDeleteMode()
-  class Entity: ContactDeleteMode()
-
-  fun toChatDeleteMode(notify: Boolean): ChatDeleteMode =
-    when (this) {
-      is Full -> ChatDeleteMode.Full(notify)
-      is Entity -> ChatDeleteMode.Entity(notify)
-    }
-}
-
@Composable
 fun ChatInfoView(
  chatModel: ChatModel,
-  openedFromChatView: Boolean,
  contact: Contact,
  connectionStats: ConnectionStats?,
  customUserProfile: Profile?,
@@ -83,7 +68,6 @@ fun ChatInfoView(
    val chatRh = chat.remoteHostId
    val sendReceipts = remember(contact.id) { mutableStateOf(SendReceipts.fromBool(contact.chatSettings.sendRcpts, currentUser.sendRcptsContacts)) }
    ChatInfoLayout(
-      openedFromChatView = openedFromChatView,
      chat,
      contact,
      currentUser,
@@ -182,8 +166,7 @@ fun ChatInfoView(
            )
          }
        }
-      },
-      close = close,
+      }
    )
  }
 }
@@ -218,127 +201,53 @@ sealed class SendReceipts {

 fun deleteContactDialog(chat: Chat, chatModel: ChatModel, close: (() -> Unit)? = null) {
  val chatInfo = chat.chatInfo
-  if (chatInfo is ChatInfo.Direct) {
-    AlertManager.shared.showAlertDialogButtonsColumn(
-      title = generalGetString(MR.strings.delete_contact_question),
-      buttons = {
-        Column {
-          // Delete contact
+  AlertManager.shared.showAlertDialogButtonsColumn(
+    title = generalGetString(MR.strings.delete_contact_question),
+    text = AnnotatedString(generalGetString(MR.strings.delete_contact_all_messages_deleted_cannot_undo_warning)),
+    buttons = {
+      Column {
+        if (chatInfo is ChatInfo.Direct && chatInfo.contact.ready && chatInfo.contact.active) {
+          // Delete and notify contact
          SectionItemView({
            AlertManager.shared.hideAlert()
-            notifyDeleteContactDialog(chat, chatModel, close, contactDeleteMode = ContactDeleteMode.Full())
+            deleteContact(chat, chatModel, close, notify = true)
          }) {
-            Text(generalGetString(MR.strings.button_delete_contact), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
+            Text(generalGetString(MR.strings.delete_and_notify_contact), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
          }
-          if (!chatInfo.contact.chatDeleted) {
-            // Delete contact, keep conversation
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              notifyDeleteContactDialog(chat, chatModel, close, contactDeleteMode = ContactDeleteMode.Entity())
-            }) {
-              Text(generalGetString(MR.strings.delete_contact_keep_conversation), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-            }
-          }
-          // Cancel
+          // Delete
          SectionItemView({
            AlertManager.shared.hideAlert()
+            deleteContact(chat, chatModel, close, notify = false)
          }) {
-            Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+            Text(generalGetString(MR.strings.delete_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
+          }
+        } else {
+          // Delete
+          SectionItemView({
+            AlertManager.shared.hideAlert()
+            deleteContact(chat, chatModel, close)
+          }) {
+            Text(generalGetString(MR.strings.delete_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
          }
        }
-      }
-    )
-  }
-}
-
-fun notifyDeleteContactDialog(
-  chat: Chat,
-  chatModel: ChatModel,
-  close: (() -> Unit)? = null,
-  contactDeleteMode: ContactDeleteMode = ContactDeleteMode.Full()
-) {
-  val chatInfo = chat.chatInfo
-  if (chatInfo is ChatInfo.Direct) {
-    val contactActive = chatInfo.contact.ready && chatInfo.contact.active
-    AlertManager.shared.showAlertDialogButtonsColumn(
-      title = if (contactActive) generalGetString(MR.strings.notify_delete_contact_question) else generalGetString(MR.strings.confirm_delete_contact_question),
-      text = when (contactDeleteMode) {
-        is ContactDeleteMode.Full -> generalGetString(MR.strings.delete_contact_all_messages_deleted_cannot_undo_warning)
-        is ContactDeleteMode.Entity -> generalGetString(MR.strings.delete_contact_cannot_undo_warning)
-      },
-      buttons = {
-        Column {
-          if (contactActive) {
-            // Delete and notify contact
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              deleteContact(chat, chatModel, close, chatDeleteMode = contactDeleteMode.toChatDeleteMode(notify = true))
-              if (contactDeleteMode is ContactDeleteMode.Entity && chatModel.controller.appPrefs.showDeleteContactNotice.get()) {
-                showDeleteContactNotice(chatInfo.contact)
-              }
-            }) {
-              Text(generalGetString(MR.strings.delete_and_notify_contact), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-            }
-            // Delete without notification
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              deleteContact(chat, chatModel, close, chatDeleteMode = contactDeleteMode.toChatDeleteMode(notify = false))
-              if (contactDeleteMode is ContactDeleteMode.Entity && chatModel.controller.appPrefs.showDeleteContactNotice.get()) {
-                showDeleteContactNotice(chatInfo.contact)
-              }
-            }) {
-              Text(generalGetString(MR.strings.delete_without_notification), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-            }
-          } else {
-            // Delete
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              deleteContact(chat, chatModel, close, chatDeleteMode = contactDeleteMode.toChatDeleteMode(notify = false))
-              if (contactDeleteMode is ContactDeleteMode.Entity && chatModel.controller.appPrefs.showDeleteContactNotice.get()) {
-                showDeleteContactNotice(chatInfo.contact)
-              }
-            }) {
-              Text(generalGetString(MR.strings.delete_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-            }
-          }
-          // Cancel
-          SectionItemView({
-            AlertManager.shared.hideAlert()
-          }) {
-            Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
-          }
+        // Cancel
+        SectionItemView({
+          AlertManager.shared.hideAlert()
+        }) {
+          Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
        }
      }
-    )
-  }
-}
-
-private fun showDeleteContactNotice(contact: Contact) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(MR.strings.contact_deleted),
-    text = String.format(generalGetString(MR.strings.you_can_still_view_conversation_with_contact), contact.displayName),
-    confirmText = generalGetString(MR.strings.ok),
-    dismissText = generalGetString(MR.strings.dont_show_again),
-    onDismiss = {
-      chatModel.controller.appPrefs.showDeleteContactNotice.set(false)
-    },
+    }
  )
 }

-fun deleteContact(chat: Chat, chatModel: ChatModel, close: (() -> Unit)?, chatDeleteMode: ChatDeleteMode = ChatDeleteMode.Full(notify = true)) {
+fun deleteContact(chat: Chat, chatModel: ChatModel, close: (() -> Unit)?, notify: Boolean? = null) {
  val chatInfo = chat.chatInfo
  withBGApi {
    val chatRh = chat.remoteHostId
-    val ct = chatModel.controller.apiDeleteContact(chatRh, chatInfo.apiId, chatDeleteMode)
-    if (ct != null) {
-      when (chatDeleteMode) {
-        is ChatDeleteMode.Full ->
-          chatModel.removeChat(chatRh, chatInfo.id)
-        is ChatDeleteMode.Entity ->
-          chatModel.updateContact(chatRh, ct)
-        is ChatDeleteMode.Messages ->
-          chatModel.clearChat(chatRh, ChatInfo.Direct(ct))
-      }
+    val r = chatModel.controller.apiDeleteChat(chatRh, chatInfo.chatType, chatInfo.apiId, notify)
+    if (r) {
+      chatModel.removeChat(chatRh, chatInfo.id)
      if (chatModel.chatId.value == chatInfo.id) {
        chatModel.chatId.value = null
        ModalManager.end.closeModals()
@@ -371,7 +280,6 @@ fun clearNoteFolderDialog(chat: Chat, close: (() -> Unit)? = null) {

@Composable
 fun ChatInfoLayout(
-  openedFromChatView: Boolean,
  chat: Chat,
  contact: Contact,
  currentUser: User,
@@ -392,7 +300,6 @@ fun ChatInfoLayout(
  syncContactConnection: () -> Unit,
  syncContactConnectionForce: () -> Unit,
  verifyClicked: () -> Unit,
-  close: () -> Unit,
 ) {
  val cStats = connStats.value
  val scrollState = rememberScrollState()
@@ -412,31 +319,7 @@ fun ChatInfoLayout(
    }

    LocalAliasEditor(chat.id, localAlias, updateValue = onLocalAliasChanged)
-
    SectionSpacer()
-
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(horizontal = 10.dp),
-      horizontalArrangement = Arrangement.Center,
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      if (contact.activeConn == null && contact.profile.contactLink != null && contact.active) {
-        ConnectButton(openedFromChatView, chat, contact, close)
-      } else if (!contact.active && !contact.chatDeleted) {
-        OpenButton(openedFromChatView, chat, contact, close)
-      } else {
-        MessageButton(openedFromChatView, chat, contact, close)
-      }
-      Spacer(Modifier.width(10.dp))
-      CallButton(chat, contact)
-      Spacer(Modifier.width(10.dp))
-      VideoButton(chat, contact)
-    }
-
-    SectionSpacer()
-
    if (customUserProfile != null) {
      SectionView(generalGetString(MR.strings.incognito).uppercase()) {
        SectionItemViewSpaceBetween {
@@ -652,155 +535,6 @@ fun LocalAliasEditor(
  }
 }

-// when contact is a "contact card"
-@Composable
-private fun ConnectButton(openedFromChatView: Boolean, chat: Chat, contact: Contact, close: () -> Unit) {
-  InfoViewActionButton(
-    icon = painterResource(MR.images.ic_chat_bubble_filled),
-    title = generalGetString(MR.strings.info_view_connect_button),
-    disabled = false,
-    onClick = {
-      AlertManager.privacySensitive.showAlertDialogButtonsColumn(
-        title = String.format(generalGetString(MR.strings.connect_with_contact_name_question), contact.chatViewName),
-        buttons = {
-          Column {
-            SectionItemView({
-              AlertManager.privacySensitive.hideAlert()
-              infoConnectContactViaAddress(openedFromChatView, chat, contact, incognito = false, close)
-            }) {
-              Text(generalGetString(MR.strings.connect_use_current_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
-            }
-            SectionItemView({
-              AlertManager.privacySensitive.hideAlert()
-              infoConnectContactViaAddress(openedFromChatView, chat, contact, incognito = true, close)
-            }) {
-              Text(generalGetString(MR.strings.connect_use_new_incognito_profile), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
-            }
-            SectionItemView({
-              AlertManager.privacySensitive.hideAlert()
-            }) {
-              Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
-            }
-          }
-        },
-        hostDevice = hostDevice(chat.remoteHostId),
-      )
-    }
-  )
-}
-
-private fun infoConnectContactViaAddress(openedFromChatView: Boolean, chat: Chat, contact: Contact, incognito: Boolean, close: () -> Unit) {
-  withBGApi {
-    val ok = connectContactViaAddress(chatModel, chat.remoteHostId, contact.contactId, incognito = incognito)
-    if (ok) {
-      if (openedFromChatView) {
-        close.invoke()
-      } else {
-        if (contact.chatDeleted) {
-          chatModel.updateContact(chat.remoteHostId, contact.copy(chatDeleted = false))
-        }
-        close.invoke()
-        openDirectChat(chat.remoteHostId, contact.contactId, chatModel)
-      }
-    }
-  }
-}
-
-@Composable
-private fun OpenButton(openedFromChatView: Boolean, chat: Chat, contact: Contact, close: () -> Unit) {
-  InfoViewActionButton(
-    icon = painterResource(MR.images.ic_chat_bubble_filled),
-    title = generalGetString(MR.strings.info_view_open_button),
-    disabled = false,
-    onClick = {
-      if (openedFromChatView) {
-        close.invoke()
-      } else {
-        close.invoke()
-        withBGApi {
-          openDirectChat(chat.remoteHostId, contact.contactId, chatModel)
-        }
-      }
-    }
-  )
-}
-
-@Composable
-private fun MessageButton(openedFromChatView: Boolean, chat: Chat, contact: Contact, close: () -> Unit) {
-  InfoViewActionButton(
-    icon = painterResource(MR.images.ic_chat_bubble_filled),
-    title = generalGetString(MR.strings.info_view_message_button),
-    disabled = !contact.sendMsgEnabled,
-    onClick = {
-      if (openedFromChatView) {
-        close.invoke()
-      } else {
-        if (contact.chatDeleted) {
-          chatModel.updateContact(chat.remoteHostId, contact.copy(chatDeleted = false))
-        }
-        close.invoke()
-        withBGApi {
-          openDirectChat(chat.remoteHostId, contact.contactId, chatModel)
-        }
-      }
-    }
-  )
-}
-
-@Composable
-fun CallButton(chat: Chat, contact: Contact) {
-  InfoViewActionButton(
-    icon = painterResource(MR.images.ic_call_filled),
-    title = generalGetString(MR.strings.info_view_call_button),
-    disabled = !contact.ready || !contact.active || !contact.mergedPreferences.calls.enabled.forUser || chatModel.activeCall.value != null,
-    onClick = {
-      startChatCall(chat, CallMediaType.Audio)
-    }
-  )
-}
-
-@Composable
-fun VideoButton(chat: Chat, contact: Contact) {
-  InfoViewActionButton(
-    icon = painterResource(MR.images.ic_videocam_filled),
-    title = generalGetString(MR.strings.info_view_video_button),
-    disabled = !contact.ready || !contact.active || !contact.mergedPreferences.calls.enabled.forUser || chatModel.activeCall.value != null,
-    onClick = {
-      startChatCall(chat, CallMediaType.Video)
-    }
-  )
-}
-
-@Composable
-fun InfoViewActionButton(icon: Painter, title: String, disabled: Boolean, onClick: () -> Unit) {
-  Surface(
-    Modifier
-      .width(96.dp)
-      .height(66.dp),
-    shape = RoundedCornerShape(20.dp),
-    color = MaterialTheme.colors.secondaryVariant,
-  ) {
-    val modifier = if (disabled) Modifier else Modifier.clickable { onClick () }
-    Column(
-      modifier,
-      horizontalAlignment = Alignment.CenterHorizontally,
-      verticalArrangement = Arrangement.Center
-    ) {
-      Icon(
-        icon,
-        contentDescription = null,
-        Modifier.size(26.dp),
-        tint = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
-      )
-      Text(
-        title,
-        style = MaterialTheme.typography.subtitle2.copy(fontWeight = FontWeight.Normal),
-        color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
-      )
-    }
-  }
-}
-
@Composable
 private fun NetworkStatusRow(networkStatus: NetworkStatus) {
  Row(
@@ -1089,7 +823,6 @@ fun queueInfoText(info: Pair<RcvMsgInfo?, QueueInfo>): String {
 fun PreviewChatInfoLayout() {
  SimpleXTheme {
    ChatInfoLayout(
-      openedFromChatView = false,
      chat = Chat(
        remoteHostId = null,
        chatInfo = ChatInfo.Direct.sampleData,
@@ -1114,7 +847,6 @@ fun PreviewChatInfoLayout() {
      syncContactConnection = {},
      syncContactConnectionForce = {},
      verifyClicked = {},
-      close = {},
    )
  }
 }
@@ -189,7 +189,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
                      code = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
                      preloadedCode = code
                    }
-                    ChatInfoView(chatModel, openedFromChatView = true, (chat.chatInfo as ChatInfo.Direct).contact, contactInfo?.first, contactInfo?.second, chat.chatInfo.localAlias, code, close)
+                    ChatInfoView(chatModel, (chat.chatInfo as ChatInfo.Direct).contact, contactInfo?.first, contactInfo?.second, chat.chatInfo.localAlias, code, close)
                  } else if (chat?.chatInfo is ChatInfo.Group) {
                    var link: Pair<String, GroupMemberRole>? by remember(chat.id) { mutableStateOf(preloadedLink) }
                    KeyChangeEffect(chat.id) {
@@ -306,7 +306,18 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
                onComplete.invoke()
              }
            },
-            startCall = out@{ media -> startChatCall(chat, media) },
+            startCall = out@{ media ->
+              withBGApi {
+                val cInfo = chat.chatInfo
+                if (cInfo is ChatInfo.Direct) {
+                  val contactInfo = chatModel.controller.apiContactInfo(chat.remoteHostId, cInfo.contact.contactId)
+                  val profile = contactInfo?.second ?: chatModel.currentUser.value?.profile?.toProfile() ?: return@withBGApi
+                  chatModel.activeCall.value = Call(remoteHostId = chatRh, contact = cInfo.contact, callState = CallState.WaitCapabilities, localMedia = media, userProfile = profile)
+                  chatModel.showCallView.value = true
+                  chatModel.callCommand.add(WCallCommand.Capabilities(media))
+                }
+              }
+            },
            endCall = {
              val call = chatModel.activeCall.value
              if (call != null) withBGApi { chatModel.callManager.endCall(call) }
@@ -510,19 +521,6 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
  }
 }

-fun startChatCall(chat: Chat, media: CallMediaType) {
-  withBGApi {
-    val cInfo = chat.chatInfo
-    if (cInfo is ChatInfo.Direct) {
-      val contactInfo = chatModel.controller.apiContactInfo(chat.remoteHostId, cInfo.contact.contactId)
-      val profile = contactInfo?.second ?: chatModel.currentUser.value?.profile?.toProfile() ?: return@withBGApi
-      chatModel.activeCall.value = Call(remoteHostId = chat.remoteHostId, contact = cInfo.contact, callState = CallState.WaitCapabilities, localMedia = media, userProfile = profile)
-      chatModel.showCallView.value = true
-      chatModel.callCommand.add(WCallCommand.Capabilities(media))
-    }
-  }
-}
-
@Composable
 fun ChatLayout(
  chat: Chat,
@@ -36,7 +36,6 @@ import chat.simplex.common.views.newchat.*
 import chat.simplex.common.views.usersettings.SettingsActionItem
 import chat.simplex.common.model.GroupInfo
 import chat.simplex.common.platform.*
-import chat.simplex.common.views.call.CallMediaType
 import chat.simplex.common.views.chatlist.openLoadedChat
 import chat.simplex.res.MR
 import kotlinx.datetime.Clock
@@ -247,10 +246,10 @@ fun GroupMemberInfoLayout(
  verifyClicked: () -> Unit,
 ) {
  val cStats = connStats.value
-  fun knownDirectChat(contactId: Long): Pair<Chat, Contact>? {
+  fun knownDirectChat(contactId: Long): Chat? {
    val chat = getContactChat(contactId)
    return if (chat != null && chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.directOrUsed) {
-      chat to chat.chatInfo.contact
+      chat
    } else {
      null
    }
@@ -310,37 +309,17 @@ fun GroupMemberInfoLayout(

    val contactId = member.memberContactId

-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(horizontal = 10.dp),
-      horizontalArrangement = Arrangement.Center,
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      val knownChat = if (contactId != null) knownDirectChat(contactId) else null
-      if (knownChat != null) {
-        val (chat, contact) = knownChat
-        OpenChatButton(onClick = { openDirectChat(contact.contactId) })
-        Spacer(Modifier.width(10.dp))
-        CallButton(chat, contact)
-        Spacer(Modifier.width(10.dp))
-        VideoButton(chat, contact)
-      } else if (groupInfo.fullGroupPreferences.directMessages.on(groupInfo.membership)) {
-        if (contactId != null) {
-          OpenChatButton(onClick = { openDirectChat(contactId) })
-        } else {
-          OpenChatButton(onClick = { createMemberContact() })
-        }
-        Spacer(Modifier.width(10.dp))
-        InfoViewActionButton(painterResource(MR.images.ic_call_filled), generalGetString(MR.strings.info_view_call_button), disabled = true, onClick = {})
-        Spacer(Modifier.width(10.dp))
-        InfoViewActionButton(painterResource(MR.images.ic_videocam_filled), generalGetString(MR.strings.info_view_video_button), disabled = true, onClick = {})
-      }
-    }
-    SectionSpacer()
-
    if (member.memberActive) {
      SectionView {
+        if (contactId != null && knownDirectChat(contactId) != null) {
+          OpenChatButton(onClick = { openDirectChat(contactId) })
+        } else if (groupInfo.fullGroupPreferences.directMessages.on(groupInfo.membership)) {
+          if (contactId != null) {
+            OpenChatButton(onClick = { openDirectChat(contactId) })
+          } else if (member.activeConn?.peerChatVRange?.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) == true) {
+            OpenChatButton(onClick = { createMemberContact() })
+          }
+        }
        if (connectionCode != null) {
          VerifyCodeButton(member.verified, verifyClicked)
        }
@@ -534,11 +513,12 @@ fun RemoveMemberButton(onClick: () -> Unit) {

@Composable
 fun OpenChatButton(onClick: () -> Unit) {
-  InfoViewActionButton(
-    icon = painterResource(MR.images.ic_chat_bubble_filled),
-    title = generalGetString(MR.strings.info_view_message_button),
-    disabled = false,
-    onClick = onClick
+  SettingsActionItem(
+    painterResource(MR.images.ic_chat),
+    stringResource(MR.strings.button_send_direct_message),
+    click = onClick,
+    textColor = MaterialTheme.colors.primary,
+    iconColor = MaterialTheme.colors.primary,
  )
 }

@@ -172,7 +172,7 @@ fun ChatListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>) {
 }

@Composable
-fun ErrorChatListItem() {
+private fun ErrorChatListItem() {
  Box(Modifier.fillMaxWidth().padding(horizontal = 10.dp, vertical = 6.dp)) {
    Text(stringResource(MR.strings.error_showing_content), color = MaterialTheme.colors.error, fontStyle = FontStyle.Italic)
  }
@@ -407,73 +407,13 @@ fun DeleteContactAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState
    stringResource(MR.strings.delete_contact_menu_action),
    painterResource(MR.images.ic_delete),
    onClick = {
-      deleteContactConversationDialog(chat, chatModel)
+      deleteContactDialog(chat, chatModel)
      showMenu.value = false
    },
    color = Color.Red
  )
 }

-fun deleteContactConversationDialog(chat: Chat, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  val chatInfo = chat.chatInfo
-  if (chatInfo is ChatInfo.Direct) {
-    val contactDeletedByUser = chatInfo.contact.contactStatus == ContactStatus.DeletedByUser
-    AlertManager.shared.showAlertDialogButtonsColumn(
-      title = if (contactDeletedByUser) generalGetString(MR.strings.delete_conversation_question) else generalGetString(MR.strings.delete_contact_question),
-      text = if (contactDeletedByUser) generalGetString(MR.strings.delete_conversation_all_messages_deleted_cannot_undo_warning) else null,
-      buttons = {
-        Column {
-          if (contactDeletedByUser) {
-            // Delete conversation
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              deleteContact(chat, chatModel, close, chatDeleteMode = ChatDeleteMode.Full(notify = false))
-            }) {
-              Text(generalGetString(MR.strings.delete_conversation), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-            }
-          } else {
-            // Delete contact
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              notifyDeleteContactDialog(chat, chatModel, close)
-            }) {
-              Text(generalGetString(MR.strings.button_delete_contact), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-            }
-            // Only delete conversation
-            SectionItemView({
-              AlertManager.shared.hideAlert()
-              deleteContact(chat, chatModel, close, chatDeleteMode = ChatDeleteMode.Messages())
-              if (chatModel.controller.appPrefs.showDeleteConversationNotice.get()) {
-                showDeleteConversationNotice(chatInfo.contact)
-              }
-            }) {
-              Text(generalGetString(MR.strings.only_delete_conversation), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.error)
-            }
-          }
-          // Cancel
-          SectionItemView({
-            AlertManager.shared.hideAlert()
-          }) {
-            Text(stringResource(MR.strings.cancel_verb), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
-          }
-        }
-      }
-    )
-  }
-}
-
-private fun showDeleteConversationNotice(contact: Contact) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(MR.strings.conversation_deleted),
-    text = String.format(generalGetString(MR.strings.you_can_still_send_messages_to_contact), contact.displayName),
-    confirmText = generalGetString(MR.strings.ok),
-    dismissText = generalGetString(MR.strings.dont_show_again),
-    onDismiss = {
-      chatModel.controller.appPrefs.showDeleteConversationNotice.set(false)
-    },
-  )
-}
-
@Composable
 fun DeleteGroupAction(chat: Chat, groupInfo: GroupInfo, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
@@ -3,46 +3,336 @@ package chat.simplex.common.views.chatlist
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.*
 import androidx.compose.ui.graphics.*
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.text.TextRange
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.*
+import chat.simplex.common.SettingsViewState
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController.stopRemoteHostAndReloadHosts
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.onboarding.WhatsNewView
+import chat.simplex.common.views.onboarding.shouldShowWhatsNew
+import chat.simplex.common.views.usersettings.SettingsView
 import chat.simplex.common.platform.*
+import chat.simplex.common.views.call.Call
 import chat.simplex.common.views.newchat.*
 import chat.simplex.res.MR
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import java.net.URI

@Composable
-fun ToggleFilterButton() {
+fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerformLA: (Boolean) -> Unit, stopped: Boolean) {
+  val newChatSheetState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
+  val showNewChatSheet = {
+    newChatSheetState.value = AnimatedViewState.VISIBLE
+  }
+  val hideNewChatSheet: (animated: Boolean) -> Unit = { animated ->
+    if (animated) newChatSheetState.value = AnimatedViewState.HIDING
+    else newChatSheetState.value = AnimatedViewState.GONE
+  }
+  LaunchedEffect(Unit) {
+    if (shouldShowWhatsNew(chatModel)) {
+      delay(1000L)
+      ModalManager.center.showCustomModal { close -> WhatsNewView(close = close) }
+    }
+  }
+  LaunchedEffect(chatModel.clearOverlays.value) {
+    if (chatModel.clearOverlays.value && newChatSheetState.value.isVisible()) hideNewChatSheet(false)
+  }
+  if (appPlatform.isDesktop) {
+    KeyChangeEffect(chatModel.chatId.value) {
+      if (chatModel.chatId.value != null) {
+        ModalManager.end.closeModalsExceptFirst()
+      }
+      AudioPlayer.stop()
+      VideoPlayerHolder.stopAll()
+    }
+  }
+  val endPadding = if (appPlatform.isDesktop) 56.dp else 0.dp
+  val searchText = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue("")) }
+  val scope = rememberCoroutineScope()
+  val (userPickerState, scaffoldState ) = settingsState
+  Scaffold(topBar = { Box(Modifier.padding(end = endPadding)) { ChatListToolbar(searchText, scaffoldState.drawerState, userPickerState, stopped)} },
+    scaffoldState = scaffoldState,
+    drawerContent = {
+      tryOrShowError("Settings", error = { ErrorSettingsView() }) {
+        SettingsView(chatModel, setPerformLA, scaffoldState.drawerState)
+      }
+    },
+    contentColor = LocalContentColor.current,
+    drawerContentColor = LocalContentColor.current,
+    drawerScrimColor = MaterialTheme.colors.onSurface.copy(alpha = if (isInDarkTheme()) 0.16f else 0.32f),
+    drawerGesturesEnabled = appPlatform.isAndroid,
+    floatingActionButton = {
+      if (searchText.value.text.isEmpty() && !chatModel.desktopNoUserNoRemote && chatModel.chatRunning.value == true) {
+        FloatingActionButton(
+          onClick = {
+            if (!stopped) {
+              if (newChatSheetState.value.isVisible()) hideNewChatSheet(true) else showNewChatSheet()
+            }
+          },
+          Modifier.padding(end = DEFAULT_PADDING - 16.dp + endPadding, bottom = DEFAULT_PADDING - 16.dp),
+          elevation = FloatingActionButtonDefaults.elevation(
+            defaultElevation = 0.dp,
+            pressedElevation = 0.dp,
+            hoveredElevation = 0.dp,
+            focusedElevation = 0.dp,
+          ),
+          backgroundColor = if (!stopped) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
+          contentColor = Color.White
+        ) {
+          Icon(if (!newChatSheetState.collectAsState().value.isVisible()) painterResource(MR.images.ic_edit_filled) else painterResource(MR.images.ic_close), stringResource(MR.strings.add_contact_or_create_group))
+        }
+      }
+    }
+  ) {
+    Box(Modifier.padding(it).padding(end = endPadding)) {
+      Box(
+        modifier = Modifier
+          .fillMaxSize()
+      ) {
+        if (!chatModel.desktopNoUserNoRemote) {
+          ChatList(chatModel, searchText = searchText)
+        }
+        if (chatModel.chats.isEmpty() && !chatModel.switchingUsersAndHosts.value && !chatModel.desktopNoUserNoRemote) {
+          Text(stringResource(
+            if (chatModel.chatRunning.value == null) MR.strings.loading_chats else MR.strings.you_have_no_chats), Modifier.align(Alignment.Center), color = MaterialTheme.colors.secondary)
+          if (!stopped && !newChatSheetState.collectAsState().value.isVisible() && chatModel.chatRunning.value == true && searchText.value.text.isEmpty()) {
+            OnboardingButtons(showNewChatSheet)
+          }
+        }
+      }
+    }
+  }
+  if (searchText.value.text.isEmpty()) {
+    if (appPlatform.isDesktop) {
+      val call = remember { chatModel.activeCall }.value
+      if (call != null) {
+        ActiveCallInteractiveArea(call, newChatSheetState)
+      }
+    }
+    // TODO disable this button and sheet for the duration of the switch
+    tryOrShowError("NewChatSheet", error = {}) {
+      NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
+    }
+  }
+  if (appPlatform.isAndroid) {
+    tryOrShowError("UserPicker", error = {}) {
+      UserPicker(chatModel, userPickerState) {
+        scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
+        userPickerState.value = AnimatedViewState.GONE
+      }
+    }
+  }
+}
+
+@Composable
+private fun OnboardingButtons(openNewChatSheet: () -> Unit) {
+  Column(Modifier.fillMaxSize().padding(DEFAULT_PADDING), horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.Bottom) {
+    ConnectButton(generalGetString(MR.strings.tap_to_start_new_chat), openNewChatSheet)
+    val color = MaterialTheme.colors.primaryVariant
+    Canvas(modifier = Modifier.width(40.dp).height(10.dp), onDraw = {
+      val trianglePath = Path().apply {
+        moveTo(0.dp.toPx(), 0f)
+        lineTo(16.dp.toPx(), 0.dp.toPx())
+        lineTo(8.dp.toPx(), 10.dp.toPx())
+        lineTo(0.dp.toPx(), 0.dp.toPx())
+      }
+      drawPath(
+        color = color,
+        path = trianglePath
+      )
+    })
+    Spacer(Modifier.height(62.dp))
+  }
+}
+
+@Composable
+private fun ConnectButton(text: String, onClick: () -> Unit) {
+  Button(
+    onClick,
+    shape = RoundedCornerShape(21.dp),
+    colors = ButtonDefaults.textButtonColors(
+      backgroundColor = MaterialTheme.colors.primaryVariant
+    ),
+    elevation = null,
+    contentPadding = PaddingValues(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF),
+    modifier = Modifier.height(42.dp)
+  ) {
+    Text(text, color = Color.White)
+  }
+}
+
+@Composable
+private fun ChatListToolbar(searchInList: State<TextFieldValue>, drawerState: DrawerState, userPickerState: MutableStateFlow<AnimatedViewState>, stopped: Boolean) {
+  val barButtons = arrayListOf<@Composable RowScope.() -> Unit>()
+  if (stopped) {
+    barButtons.add {
+      IconButton(onClick = {
+        AlertManager.shared.showAlertMsg(
+          generalGetString(MR.strings.chat_is_stopped_indication),
+          generalGetString(MR.strings.you_can_start_chat_via_setting_or_by_restarting_the_app)
+        )
+      }) {
+        Icon(
+          painterResource(MR.images.ic_report_filled),
+          generalGetString(MR.strings.chat_is_stopped_indication),
+          tint = Color.Red,
+        )
+      }
+    }
+  }
+  val scope = rememberCoroutineScope()
+  DefaultTopAppBar(
+    navigationButton = {
+      if (chatModel.users.isEmpty() && !chatModel.desktopNoUserNoRemote) {
+        NavigationButtonMenu { scope.launch { if (drawerState.isOpen) drawerState.close() else drawerState.open() } }
+      } else {
+        val users by remember { derivedStateOf { chatModel.users.filter { u -> u.user.activeUser || !u.user.hidden } } }
+        val allRead = users
+          .filter { u -> !u.user.activeUser && !u.user.hidden }
+          .all { u -> u.unreadCount == 0 }
+        UserProfileButton(chatModel.currentUser.value?.profile?.image, allRead) {
+          if (users.size == 1 && chatModel.remoteHosts.isEmpty()) {
+            scope.launch { drawerState.open() }
+          } else {
+            userPickerState.value = AnimatedViewState.VISIBLE
+          }
+        }
+      }
+    },
+    title = {
+      Row(verticalAlignment = Alignment.CenterVertically) {
+        Text(
+          stringResource(MR.strings.your_chats),
+          color = MaterialTheme.colors.onBackground,
+          fontWeight = FontWeight.SemiBold,
+        )
+        if (chatModel.chats.size > 0) {
+          val enabled = remember { derivedStateOf { searchInList.value.text.isEmpty() } }
+          if (enabled.value) {
+            ToggleFilterEnabledButton()
+          } else {
+            ToggleFilterDisabledButton()
+          }
+        }
+      }
+    },
+    onTitleClick = null,
+    showSearch = false,
+    onSearchValueChanged = {},
+    buttons = barButtons
+  )
+  Divider(Modifier.padding(top = AppBarHeight))
+}
+
+@Composable
+fun UserProfileButton(image: String?, allRead: Boolean, onButtonClicked: () -> Unit) {
+  Row(verticalAlignment = Alignment.CenterVertically) {
+    IconButton(onClick = onButtonClicked) {
+      Box {
+        ProfileImage(
+          image = image,
+          size = 37.dp,
+          color = MaterialTheme.colors.secondaryVariant.mixWith(MaterialTheme.colors.onBackground, 0.97f)
+        )
+        if (!allRead) {
+          unreadBadge()
+        }
+      }
+    }
+    if (appPlatform.isDesktop) {
+      val h by remember { chatModel.currentRemoteHost }
+      if (h != null) {
+        Spacer(Modifier.width(12.dp))
+        HostDisconnectButton {
+          stopRemoteHostAndReloadHosts(h!!, true)
+        }
+      }
+    }
+  }
+}
+
+@Composable
+private fun BoxScope.unreadBadge(text: String? = "") {
+  Text(
+    text ?: "",
+    color = MaterialTheme.colors.onPrimary,
+    fontSize = 6.sp,
+    modifier = Modifier
+      .background(MaterialTheme.colors.primary, shape = CircleShape)
+      .badgeLayout()
+      .padding(horizontal = 3.dp)
+      .padding(vertical = 1.dp)
+      .align(Alignment.TopEnd)
+  )
+}
+
+@Composable
+private fun ToggleFilterEnabledButton() {
  val pref = remember { ChatController.appPrefs.showUnreadAndFavorites }
  IconButton(onClick = { pref.set(!pref.get()) }) {
    Icon(
      painterResource(MR.images.ic_filter_list),
      null,
-      tint = if (pref.state.value) MaterialTheme.colors.background else MaterialTheme.colors.secondary,
+      tint = if (pref.state.value) MaterialTheme.colors.background else MaterialTheme.colors.primary,
      modifier = Modifier
        .padding(3.dp)
        .background(color = if (pref.state.value) MaterialTheme.colors.primary else Color.Unspecified, shape = RoundedCornerShape(50))
-        .border(width = 1.dp, color = if (pref.state.value) MaterialTheme.colors.primary else Color.Unspecified, shape = RoundedCornerShape(50))
+        .border(width = 1.dp, color = MaterialTheme.colors.primary, shape = RoundedCornerShape(50))
        .padding(3.dp)
        .size(16.dp)
    )
  }
 }

+@Composable
+private fun ToggleFilterDisabledButton() {
+  IconButton({}, enabled = false) {
+    Icon(
+      painterResource(MR.images.ic_filter_list),
+      null,
+      tint = MaterialTheme.colors.secondary,
+      modifier = Modifier
+        .padding(3.dp)
+        .border(width = 1.dp, color = MaterialTheme.colors.secondary, shape = RoundedCornerShape(50))
+        .padding(3.dp)
+        .size(16.dp)
+    )
+  }
+}
+
+@Composable
+expect fun ActiveCallInteractiveArea(call: Call, newChatSheetState: MutableStateFlow<AnimatedViewState>)
+
+fun connectIfOpenedViaUri(rhId: Long?, uri: URI, chatModel: ChatModel) {
+  Log.d(TAG, "connectIfOpenedViaUri: opened via link")
+  if (chatModel.currentUser.value == null) {
+    chatModel.appOpenUrl.value = rhId to uri
+  } else {
+    withBGApi {
+      planAndConnect(rhId, uri, incognito = null, close = null)
+    }
+  }
+}
+
@Composable
 private fun ChatListSearchBar(listState: LazyListState, searchText: MutableState<TextFieldValue>, searchShowingSimplexLink: MutableState<Boolean>, searchChatFilteredBySimplexLink: MutableState<String?>) {
  Row(verticalAlignment = Alignment.CenterVertically) {
@@ -69,8 +359,28 @@ private fun ChatListSearchBar(listState: LazyListState, searchText: MutableState
    } else {
      Row {
        val padding = if (appPlatform.isDesktop) 0.dp else 7.dp
-        if (chatModel.chats.size > 0) {
-          ToggleFilterButton()
+        val clipboard = LocalClipboardManager.current
+        val clipboardHasText = remember(focused) { chatModel.clipboardHasText }.value
+        if (clipboardHasText) {
+          IconButton(
+            onClick = { searchText.value = searchText.value.copy(clipboard.getText()?.text ?: return@IconButton) },
+            Modifier.size(30.dp).desktopPointerHoverIconHand()
+          ) {
+            Icon(painterResource(MR.images.ic_article), null, tint = MaterialTheme.colors.secondary)
+          }
+        }
+        Spacer(Modifier.width(padding))
+        IconButton(
+          onClick = {
+            val fixedRhId = chatModel.currentRemoteHost.value
+            ModalManager.center.closeModals()
+            ModalManager.center.showModalCloseable { close ->
+              NewChatView(fixedRhId, selection = NewChatOption.CONNECT, showQRCodeScanner = true, close = close)
+            }
+          },
+          Modifier.size(30.dp).desktopPointerHoverIconHand()
+        ) {
+          Icon(painterResource(MR.images.ic_qr_code), null, tint = MaterialTheme.colors.secondary)
        }
        Spacer(Modifier.width(padding))
      }
@@ -127,10 +437,17 @@ private fun connect(link: String, searchChatFilteredBySimplexLink: MutableState<
  }
 }

+@Composable
+private fun ErrorSettingsView() {
+  Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+    Text(generalGetString(MR.strings.error_showing_content), color = MaterialTheme.colors.error, fontStyle = FontStyle.Italic)
+  }
+}
+
 private var lazyListState = 0 to 0

@Composable
-fun ChatList(chatModel: ChatModel, searchText: MutableState<TextFieldValue>) {
+private fun ChatList(chatModel: ChatModel, searchText: MutableState<TextFieldValue>) {
  val listState = rememberLazyListState(lazyListState.first, lazyListState.second)
  DisposableEffect(Unit) {
    onDispose { lazyListState = listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
@@ -191,18 +508,17 @@ private fun filteredChats(
  } else {
    val s = if (searchShowingSimplexLink.value) "" else searchText.trim().lowercase()
    if (s.isEmpty() && !showUnreadAndFavorites)
-      chats.filter { chat -> !chat.chatInfo.chatDeleted }
+      chats
    else {
      chats.filter { chat ->
        when (val cInfo = chat.chatInfo) {
-          is ChatInfo.Direct -> !chat.chatInfo.chatDeleted && (
-              if (s.isEmpty()) {
-                chat.id == chatModel.chatId.value || filtered(chat)
-              } else {
-                (viewNameContains(cInfo, s) ||
-                    cInfo.contact.profile.displayName.lowercase().contains(s) ||
-                    cInfo.contact.fullName.lowercase().contains(s))
-              })
+          is ChatInfo.Direct -> if (s.isEmpty()) {
+            chat.id == chatModel.chatId.value || filtered(chat)
+          } else {
+            (viewNameContains(cInfo, s) ||
+                cInfo.contact.profile.displayName.lowercase().contains(s) ||
+                cInfo.contact.fullName.lowercase().contains(s))
+          }
          is ChatInfo.Group -> if (s.isEmpty()) {
            chat.id == chatModel.chatId.value || filtered(chat) || cInfo.groupInfo.membership.memberStatus == GroupMemberStatus.MemInvited
          } else {
@@ -198,7 +198,7 @@ fun ChatPreviewView(
    } else {
      when (cInfo) {
        is ChatInfo.Direct ->
-          if (cInfo.contact.activeConn == null && cInfo.contact.profile.contactLink != null && cInfo.contact.active) {
+          if (cInfo.contact.activeConn == null && cInfo.contact.profile.contactLink != null) {
            Text(stringResource(MR.strings.contact_tap_to_connect), color = MaterialTheme.colors.primary)
          } else if (!cInfo.ready && cInfo.contact.activeConn != null) {
            if (cInfo.contact.nextSendGrpInv) {
@@ -16,7 +16,6 @@ import chat.simplex.common.SettingsViewState
 import chat.simplex.common.model.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.platform.*
-import chat.simplex.common.views.home.UserProfileButton
 import chat.simplex.res.MR
 import kotlinx.coroutines.flow.MutableStateFlow

@@ -153,8 +153,6 @@ fun UserPicker(
  ) {
    Column(
      Modifier
-        .align(Alignment.BottomStart)
-        .padding(bottom = BottomAppBarHeight)
        .widthIn(min = 260.dp)
        .width(IntrinsicSize.Min)
        .height(IntrinsicSize.Min)
@@ -1,104 +0,0 @@
-package chat.simplex.common.views.contacts
-
-import androidx.compose.runtime.*
-import androidx.compose.ui.graphics.Color
-import dev.icerock.moko.resources.compose.painterResource
-import dev.icerock.moko.resources.compose.stringResource
-import chat.simplex.common.model.*
-import chat.simplex.common.platform.*
-import chat.simplex.common.views.chat.*
-import chat.simplex.common.views.chat.item.ItemAction
-import chat.simplex.common.views.chatlist.*
-import chat.simplex.common.views.helpers.*
-import chat.simplex.res.MR
-import kotlinx.coroutines.delay
-
-@Composable
-fun ContactListNavLinkView(chat: Chat, nextChatSelected: State<Boolean>) {
-  val showMenu = remember { mutableStateOf(false) }
-  val disabled = chatModel.chatRunning.value == false || chatModel.deletedChats.value.contains(chat.remoteHostId to chat.chatInfo.id)
-  LaunchedEffect(chat.id) {
-    showMenu.value = false
-    delay(500L)
-  }
-  val selectedChat = remember(chat.id) { derivedStateOf { chat.id == chatModel.chatId.value } }
-  val view = LocalMultiplatformView()
-
-  when (chat.chatInfo) {
-    is ChatInfo.Direct -> {
-      ChatListNavLinkLayout(
-        chatLinkPreview = {
-          tryOrShowError("${chat.id}ContactListNavLink", error = { ErrorChatListItem() }) {
-            ContactPreviewView(chat, disabled)
-          }
-        },
-        click = {
-          val chatRh = chat.remoteHostId
-          if (ModalManager.end.hasModalsOpen()) {
-            ModalManager.end.closeModals()
-            // return@ChatLayout -- TODO what's this for?
-          }
-          hideKeyboard(view)
-          withBGApi {
-            var preloadedContactInfo: Pair<ConnectionStats?, Profile?>? = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
-            var preloadedCode: String? = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
-            ModalManager.end.showModalCloseable(true) { close ->
-              var contactInfo: Pair<ConnectionStats?, Profile?>? by remember { mutableStateOf(preloadedContactInfo) }
-              var code: String? by remember { mutableStateOf(preloadedCode) }
-              KeyChangeEffect(chat.id, ChatModel.networkStatuses.toMap()) {
-                contactInfo = chatModel.controller.apiContactInfo(chatRh, chat.chatInfo.apiId)
-                preloadedContactInfo = contactInfo
-                code = chatModel.controller.apiGetContactCode(chatRh, chat.chatInfo.apiId)?.second
-                preloadedCode = code
-              }
-              ChatInfoView(chatModel, openedFromChatView = false, chat.chatInfo.contact, contactInfo?.first, contactInfo?.second, chat.chatInfo.localAlias, code, close)
-            }
-          }
-        },
-        dropdownMenuItems = {
-          tryOrShowError("${chat.id}ContactListNavLinkDropdown", error = {}) {
-            ContactMenuItems(chat, chat.chatInfo.contact, chatModel, showMenu)
-          }
-        },
-        showMenu,
-        disabled,
-        selectedChat,
-        nextChatSelected,
-      )
-    }
-    else -> {}
-  }
-}
-
-@Composable
-fun ContactMenuItems(chat: Chat, contact: Contact, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
-  if (contact.activeConn != null) {
-    ToggleFavoritesChatAction(chat, chatModel, chat.chatInfo.chatSettings?.favorite == true, showMenu)
-  }
-  DeleteContactAction(chat, chatModel, showMenu)
-}
-
-@Composable
-fun ToggleFavoritesChatAction(chat: Chat, chatModel: ChatModel, favorite: Boolean, showMenu: MutableState<Boolean>) {
-  ItemAction(
-    if (favorite) stringResource(MR.strings.unfavorite_chat) else stringResource(MR.strings.favorite_chat),
-    if (favorite) painterResource(MR.images.ic_star_off) else painterResource(MR.images.ic_star),
-    onClick = {
-      toggleChatFavorite(chat, !favorite, chatModel)
-      showMenu.value = false
-    }
-  )
-}
-
-@Composable
-fun DeleteContactAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
-  ItemAction(
-    stringResource(MR.strings.delete_contact_menu_action),
-    painterResource(MR.images.ic_delete),
-    onClick = {
-      deleteContactDialog(chat, chatModel)
-      showMenu.value = false
-    },
-    color = Color.Red
-  )
-}
@@ -1,117 +0,0 @@
-package chat.simplex.common.views.contacts
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import dev.icerock.moko.resources.compose.painterResource
-import dev.icerock.moko.resources.compose.stringResource
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.*
-import chat.simplex.common.views.helpers.*
-import chat.simplex.common.model.*
-import chat.simplex.common.platform.chatModel
-import chat.simplex.common.ui.theme.DEFAULT_SPACE_AFTER_ICON
-import chat.simplex.res.MR
-
-@Composable
-fun ContactPreviewView(
-  chat: Chat,
-  disabled: Boolean,
-) {
-  val cInfo = chat.chatInfo
-
-  @Composable
-  fun inactiveIcon() {
-    Icon(
-      painterResource(MR.images.ic_cancel_filled),
-      stringResource(MR.strings.icon_descr_group_inactive),
-      Modifier.size(18.dp).background(MaterialTheme.colors.background, CircleShape),
-      tint = MaterialTheme.colors.secondary
-    )
-  }
-
-  @Composable
-  fun chatPreviewImageOverlayIcon() {
-    when (cInfo) {
-      is ChatInfo.Direct ->
-        if (!cInfo.contact.active) {
-          inactiveIcon()
-        }
-
-      else -> {}
-    }
-  }
-
-  @Composable
-  fun VerifiedIcon() {
-    Icon(painterResource(MR.images.ic_verified_user), null, Modifier.size(19.dp).padding(end = 3.dp, top = 1.dp), tint = MaterialTheme.colors.secondary)
-  }
-
-  @Composable
-  fun chatPreviewTitle() {
-    val deleting by remember(disabled, chat.id) { mutableStateOf(chatModel.deletedChats.value.contains(chat.remoteHostId to chat.chatInfo.id)) }
-    when (cInfo) {
-      is ChatInfo.Direct ->
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          if (cInfo.contact.verified) {
-            VerifiedIcon()
-          }
-          Text(
-            cInfo.chatViewName,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-            color = if (deleting) MaterialTheme.colors.secondary else Color.Unspecified
-          )
-        }
-
-      else -> {}
-    }
-  }
-
-  Row(
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Box(contentAlignment = Alignment.BottomEnd) {
-      ChatInfoImage(cInfo, size = 42.dp)
-      Box(Modifier.padding(end = 2.dp, bottom = 2.dp)) {
-        chatPreviewImageOverlayIcon()
-      }
-    }
-
-    Spacer(Modifier.width(DEFAULT_SPACE_AFTER_ICON))
-
-    Box(modifier = Modifier.weight(10f, fill = true)) {
-      chatPreviewTitle()
-    }
-
-    Spacer(Modifier.fillMaxWidth().weight(1f))
-
-    if (chat.chatInfo.chatSettings?.favorite == true) {
-      Icon(
-        painterResource(MR.images.ic_star_filled),
-        contentDescription = generalGetString(MR.strings.favorite_chat),
-        tint = MaterialTheme.colors.secondary,
-        modifier = Modifier
-          .size(17.dp)
-      )
-      if (chat.chatInfo.incognito) {
-        Spacer(Modifier.width(DEFAULT_SPACE_AFTER_ICON))
-      }
-    }
-
-    if (chat.chatInfo.incognito) {
-      Icon(
-        painterResource(MR.images.ic_theater_comedy),
-        contentDescription = null,
-        tint = MaterialTheme.colors.secondary,
-        modifier = Modifier
-          .size(21.dp)
-      )
-    }
-  }
-}
@@ -1,160 +0,0 @@
-package chat.simplex.common.views.contacts
-
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.*
-import androidx.compose.ui.platform.*
-import dev.icerock.moko.resources.compose.painterResource
-import dev.icerock.moko.resources.compose.stringResource
-import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.unit.*
-import chat.simplex.common.model.*
-import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.helpers.*
-import chat.simplex.common.platform.*
-import chat.simplex.common.views.chatlist.ToggleFilterButton
-import chat.simplex.common.views.home.contactChats
-import chat.simplex.res.MR
-import kotlinx.coroutines.flow.distinctUntilChanged
-
-@Composable
-private fun ContactsSearchBar(listState: LazyListState, searchText: MutableState<TextFieldValue>) {
-  Row(verticalAlignment = Alignment.CenterVertically) {
-    val focusRequester = remember { FocusRequester() }
-    var focused by remember { mutableStateOf(false) }
-    Icon(painterResource(MR.images.ic_search), null, Modifier.padding(horizontal = DEFAULT_PADDING_HALF), tint = MaterialTheme.colors.secondary)
-    SearchTextField(
-      Modifier.weight(1f).onFocusChanged { focused = it.hasFocus }.focusRequester(focusRequester),
-      placeholder = stringResource(MR.strings.search_verb),
-      alwaysVisible = true,
-      searchText = searchText,
-      trailingContent = null,
-    ) {
-      searchText.value = searchText.value.copy(it)
-    }
-    val hasText = remember { derivedStateOf { searchText.value.text.isNotEmpty() } }
-    if (hasText.value) {
-      val hideSearchOnBack: () -> Unit = { searchText.value = TextFieldValue() }
-      BackHandler(onBack = hideSearchOnBack)
-      KeyChangeEffect(chatModel.currentRemoteHost.value) {
-        hideSearchOnBack()
-      }
-    } else {
-      Row {
-        val padding = if (appPlatform.isDesktop) 0.dp else 7.dp
-        if (chatModel.chats.size > 0) {
-          ToggleFilterButton()
-        }
-        Spacer(Modifier.width(padding))
-      }
-    }
-    val focusManager = LocalFocusManager.current
-    val keyboardState = getKeyboardState()
-    LaunchedEffect(keyboardState.value) {
-      if (keyboardState.value == KeyboardState.Closed && focused) {
-        focusManager.clearFocus()
-      }
-    }
-    LaunchedEffect(Unit) {
-      snapshotFlow { searchText.value.text }
-        .distinctUntilChanged()
-        .collect {
-          if (it.isNotEmpty()) {
-            focusRequester.requestFocus()
-          } else if (listState.layoutInfo.totalItemsCount > 0) {
-            listState.scrollToItem(0)
-          }
-        }
-    }
-  }
-}
-
-private var lazyListState = 0 to 0
-
-@Composable
-fun ContactsList(chatModel: ChatModel, searchText: MutableState<TextFieldValue>) {
-  val listState = rememberLazyListState(lazyListState.first, lazyListState.second)
-  DisposableEffect(Unit) {
-    onDispose { lazyListState = listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
-  }
-  val showUnreadAndFavorites = remember { ChatController.appPrefs.showUnreadAndFavorites.state }.value
-  val allContactChats = remember(chatModel.chats.toList()) { contactChats(chatModel.chats) }
-  // See "IndexOutOfBoundsException" comment in ChatListView
-  val filteredContactChats = filteredContactChats(showUnreadAndFavorites, searchText.value.text, allContactChats.toList())
-  LazyColumnWithScrollBar(
-    Modifier.fillMaxWidth(),
-    listState
-  ) {
-    stickyHeader {
-      Column(
-        Modifier
-          .offset {
-            val y = if (searchText.value.text.isEmpty()) {
-              if (listState.firstVisibleItemIndex == 0) -listState.firstVisibleItemScrollOffset else -1000
-            } else {
-              0
-            }
-            IntOffset(0, y)
-          }
-          .background(MaterialTheme.colors.background)
-      ) {
-        ContactsSearchBar(listState, searchText)
-        Divider()
-      }
-    }
-    itemsIndexed(filteredContactChats) { index, chat ->
-      val nextChatSelected = remember(chat.id, filteredContactChats) { derivedStateOf {
-        chatModel.chatId.value != null && filteredContactChats.getOrNull(index + 1)?.id == chatModel.chatId.value
-      } }
-      ContactListNavLinkView(chat, nextChatSelected)
-    }
-  }
-  if (filteredContactChats.isEmpty() && allContactChats.isNotEmpty()) {
-    Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-      Text(generalGetString(MR.strings.no_filtered_contacts), color = MaterialTheme.colors.secondary)
-    }
-  }
-}
-
-private fun filteredContactChats(
-  showUnreadAndFavorites: Boolean,
-  searchText: String,
-  contactChats: List<Chat>
-): List<Chat> {
-  val s = searchText.trim().lowercase()
-  return (
-      if (s.isEmpty() && !showUnreadAndFavorites)
-        contactChats.filter { chat ->
-          when (val cInfo = chat.chatInfo) {
-            is ChatInfo.Direct -> cInfo.contact.contactStatus != ContactStatus.DeletedByUser
-            else -> false
-          }
-        }
-      else {
-        contactChats.filter { chat ->
-          when (val cInfo = chat.chatInfo) {
-            is ChatInfo.Direct -> cInfo.contact.contactStatus != ContactStatus.DeletedByUser && (
-                if (s.isEmpty()) {
-                  chat.id == chatModel.chatId.value ||
-                      (cInfo.chatSettings?.favorite ?: false)
-                } else {
-                  (viewNameContains(cInfo, s) ||
-                      cInfo.contact.profile.displayName.lowercase().contains(s) ||
-                      cInfo.contact.fullName.lowercase().contains(s))
-                })
-
-            else -> false
-          }
-        }
-      }
-      ).sortedBy { it.chatInfo.displayName.lowercase() }
-}
-
-private fun viewNameContains(cInfo: ChatInfo, s: String): Boolean =
-  cInfo.chatViewName.lowercase().contains(s.lowercase())
@@ -22,8 +22,11 @@ import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.AppVersionText
+import chat.simplex.common.views.usersettings.SettingsActionItem
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
+import dev.icerock.moko.resources.compose.painterResource
+import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.*
 import kotlinx.datetime.Clock
 import java.io.File
@@ -106,7 +109,7 @@ fun DatabaseErrorView(
          }
        }
      is DBMigrationResult.ErrorMigration -> when (val err = status.migrationError) {
-        is MigrationError.Upgrade ->
+        is MigrationError.Upgrade -> {
          DatabaseErrorDetails(MR.strings.database_upgrade) {
            TextButton({ callRunChat(confirmMigrations = MigrationConfirmation.YesUp) }, Modifier.align(Alignment.CenterHorizontally), enabled = !progressIndicator.value) {
              Text(generalGetString(MR.strings.upgrade_and_open_chat))
@@ -116,7 +119,9 @@ fun DatabaseErrorView(
            MigrationsText(err.upMigrations.map { it.upName })
            AppVersionText()
          }
-        is MigrationError.Downgrade ->
+          OpenDatabaseDirectoryButton()
+        }
+        is MigrationError.Downgrade -> {
          DatabaseErrorDetails(MR.strings.database_downgrade) {
            TextButton({ callRunChat(confirmMigrations = MigrationConfirmation.YesUpDown) }, Modifier.align(Alignment.CenterHorizontally), enabled = !progressIndicator.value) {
              Text(generalGetString(MR.strings.downgrade_and_open_chat))
@@ -127,29 +132,41 @@ fun DatabaseErrorView(
            MigrationsText(err.downMigrations)
            AppVersionText()
          }
-        is MigrationError.Error ->
+          OpenDatabaseDirectoryButton()
+        }
+        is MigrationError.Error -> {
          DatabaseErrorDetails(MR.strings.incompatible_database_version) {
            FileNameText(status.dbFile)
            Text(String.format(generalGetString(MR.strings.error_with_info), mtrErrorDescription(err.mtrError)))
          }
+          OpenDatabaseDirectoryButton()
+        }
      }
-      is DBMigrationResult.ErrorSQL ->
+      is DBMigrationResult.ErrorSQL -> {
        DatabaseErrorDetails(MR.strings.database_error) {
          FileNameText(status.dbFile)
          Text(String.format(generalGetString(MR.strings.error_with_info), status.migrationSQLError))
        }
-      is DBMigrationResult.ErrorKeychain ->
+        OpenDatabaseDirectoryButton()
+      }
+      is DBMigrationResult.ErrorKeychain -> {
        DatabaseErrorDetails(MR.strings.keychain_error) {
          Text(generalGetString(MR.strings.cannot_access_keychain))
        }
-      is DBMigrationResult.InvalidConfirmation ->
+        OpenDatabaseDirectoryButton()
+      }
+      is DBMigrationResult.InvalidConfirmation -> {
        DatabaseErrorDetails(MR.strings.invalid_migration_confirmation) {
          // this can only happen if incorrect parameter is passed
        }
-      is DBMigrationResult.Unknown ->
+        OpenDatabaseDirectoryButton()
+      }
+      is DBMigrationResult.Unknown -> {
        DatabaseErrorDetails(MR.strings.database_error) {
          Text(String.format(generalGetString(MR.strings.unknown_database_error_with_info), status.json))
        }
+        OpenDatabaseDirectoryButton()
+      }
      is DBMigrationResult.OK -> {}
      null -> {}
    }
@@ -294,6 +311,18 @@ private fun ColumnScope.SaveAndOpenButton(enabled: Boolean, onClick: () -> Unit)
  }
 }

+@Composable
+private fun OpenDatabaseDirectoryButton() {
+  if (appPlatform.isDesktop) {
+    Spacer(Modifier.padding(top = DEFAULT_PADDING))
+    SettingsActionItem(
+      painterResource(MR.images.ic_folder_open),
+      stringResource(MR.strings.open_database_folder),
+      ::desktopOpenDatabaseDir
+    )
+  }
+}
+
@Composable
 private fun ColumnScope.OpenChatButton(enabled: Boolean, onClick: () -> Unit) {
  TextButton(onClick, Modifier.align(Alignment.CenterHorizontally), enabled = enabled) {
@@ -18,6 +18,7 @@ import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.model.ChatModel.updatingChatsMutex
 import chat.simplex.common.ui.theme.*
@@ -450,7 +451,9 @@ private fun stopChat(m: ChatModel, progressIndicator: MutableState<Boolean>? = n
      platform.androidChatStopped()
      // close chat view for desktop
      chatModel.chatId.value = null
-      ModalManager.end.closeModals()
+      if (appPlatform.isDesktop) {
+        ModalManager.end.closeModals()
+      }
      onStop?.invoke()
    } catch (e: Error) {
      m.chatRunning.value = true
@@ -492,6 +495,7 @@ fun deleteChatDatabaseFilesAndState() {
  wallpapersDir.deleteRecursively()
  wallpapersDir.mkdirs()
  DatabaseUtils.ksDatabasePassword.remove()
+  appPrefs.newDatabaseInitialized.set(false)
  controller.appPrefs.storeDBPassphrase.set(true)
  controller.ctrl = null

@@ -500,6 +504,7 @@ fun deleteChatDatabaseFilesAndState() {
  chatModel.chatItems.clear()
  chatModel.chats.clear()
  chatModel.users.clear()
+  ntfManager.cancelAllNotifications()
 }

 private fun exportArchive(
@@ -39,22 +39,25 @@ object DatabaseUtils {
    }
  }

-  private fun hasDatabase(rootDir: String): Boolean =
-    File(rootDir + File.separator + chatDatabaseFileName).exists() && File(rootDir + File.separator + agentDatabaseFileName).exists()
+  private fun hasAtLeastOneDatabase(rootDir: String): Boolean =
+    File(rootDir + File.separator + chatDatabaseFileName).exists() || File(rootDir + File.separator + agentDatabaseFileName).exists()
+
+  fun hasOnlyOneDatabase(rootDir: String): Boolean =
+    File(rootDir + File.separator + chatDatabaseFileName).exists() != File(rootDir + File.separator + agentDatabaseFileName).exists()

  fun useDatabaseKey(): String {
    Log.d(TAG, "useDatabaseKey ${appPreferences.storeDBPassphrase.get()}")
    var dbKey = ""
    val useKeychain = appPreferences.storeDBPassphrase.get()
    if (useKeychain) {
-      if (!hasDatabase(dataDir.absolutePath)) {
+      if (!hasAtLeastOneDatabase(dataDir.absolutePath)) {
        dbKey = randomDatabasePassword()
        ksDatabasePassword.set(dbKey)
        appPreferences.initialRandomDBPassphrase.set(true)
      } else {
        dbKey = ksDatabasePassword.get() ?: ""
      }
-    } else if (appPlatform.isDesktop && !hasDatabase(dataDir.absolutePath)) {
+    } else if (appPlatform.isDesktop && !hasAtLeastOneDatabase(dataDir.absolutePath)) {
      // In case of database was deleted by hand
      dbKey = randomDatabasePassword()
      ksDatabasePassword.set(dbKey)
@@ -15,7 +15,7 @@ import chat.simplex.res.MR

@Composable
 fun DefaultTopAppBar(
-  navigationButton: (@Composable RowScope.() -> Unit)? = null,
+  navigationButton: @Composable RowScope.() -> Unit,
  title: (@Composable () -> Unit)?,
  onTitleClick: (() -> Unit)? = null,
  showSearch: Boolean,
@@ -125,6 +125,5 @@ private fun TopAppBar(

 val AppBarHeight = 56.dp
 val AppBarHorizontalPadding = 4.dp
-val BottomAppBarHeight = 60.dp
 private val TitleInsetWithoutIcon = DEFAULT_PADDING - AppBarHorizontalPadding
 val TitleInsetWithIcon = 72.dp
@@ -10,7 +10,7 @@ import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.ThemeOverrides
-import chat.simplex.common.views.home.connectIfOpenedViaUri
+import chat.simplex.common.views.chatlist.connectIfOpenedViaUri
 import chat.simplex.res.MR
 import com.charleskorn.kaml.decodeFromStream
 import dev.icerock.moko.resources.StringResource
@@ -1,372 +0,0 @@
-package chat.simplex.common.views.home
-
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.text.font.FontStyle
-import dev.icerock.moko.resources.compose.painterResource
-import dev.icerock.moko.resources.compose.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.unit.*
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.graphics.vector.rememberVectorPainter
-import chat.simplex.common.SettingsViewState
-import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.chatModel
-import chat.simplex.common.model.ChatController.stopRemoteHostAndReloadHosts
-import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.onboarding.WhatsNewView
-import chat.simplex.common.views.onboarding.shouldShowWhatsNew
-import chat.simplex.common.views.usersettings.SettingsView
-import chat.simplex.common.platform.*
-import chat.simplex.common.views.call.Call
-import chat.simplex.common.views.chatlist.*
-import chat.simplex.common.views.contacts.ContactsList
-import chat.simplex.common.views.newchat.*
-import chat.simplex.res.MR
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.MutableStateFlow
-import java.net.URI
-
-sealed class HomeTab {
-  class Chats: HomeTab()
-  class Contacts: HomeTab()
-}
-
-@Composable
-fun HomeView(chatModel: ChatModel, settingsState: SettingsViewState, setPerformLA: (Boolean) -> Unit, stopped: Boolean) {
-  val homeTab = remember { mutableStateOf<HomeTab>(HomeTab.Chats()) }
-  val newChatSheetState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
-  val showNewChatSheet = {
-    newChatSheetState.value = AnimatedViewState.VISIBLE
-  }
-  val hideNewChatSheet: (animated: Boolean) -> Unit = { animated ->
-    if (animated) newChatSheetState.value = AnimatedViewState.HIDING
-    else newChatSheetState.value = AnimatedViewState.GONE
-  }
-  LaunchedEffect(Unit) {
-    if (shouldShowWhatsNew(chatModel)) {
-      delay(1000L)
-      ModalManager.center.showCustomModal { close -> WhatsNewView(close = close) }
-    }
-  }
-  LaunchedEffect(chatModel.clearOverlays.value) {
-    if (chatModel.clearOverlays.value && newChatSheetState.value.isVisible()) hideNewChatSheet(false)
-  }
-  if (appPlatform.isDesktop) {
-    KeyChangeEffect(chatModel.chatId.value) {
-      if (chatModel.chatId.value != null) {
-        ModalManager.end.closeModalsExceptFirst()
-      }
-      AudioPlayer.stop()
-      VideoPlayerHolder.stopAll()
-    }
-  }
-  val endPadding = if (appPlatform.isDesktop) 56.dp else 0.dp
-  val searchText = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue("")) }
-  val scope = rememberCoroutineScope()
-  val (userPickerState, scaffoldState ) = settingsState
-  Scaffold(
-    topBar = { Box(Modifier.padding(end = endPadding)) { HomeTopBar(homeTab, stopped) } },
-    bottomBar = { Box(Modifier.padding(end = endPadding)) { HomeBottomBar(scaffoldState.drawerState, userPickerState, homeTab, stopped) } },
-    scaffoldState = scaffoldState,
-    drawerContent = {
-      tryOrShowError("Settings", error = { ErrorSettingsView() }) {
-        SettingsView(chatModel, setPerformLA, scaffoldState.drawerState)
-      }
-    },
-    contentColor = LocalContentColor.current,
-    drawerContentColor = LocalContentColor.current,
-    drawerScrimColor = MaterialTheme.colors.onSurface.copy(alpha = if (isInDarkTheme()) 0.16f else 0.32f),
-    drawerGesturesEnabled = appPlatform.isAndroid,
-    floatingActionButton = {
-      if (searchText.value.text.isEmpty() && !chatModel.desktopNoUserNoRemote && chatModel.chatRunning.value == true) {
-        FloatingActionButton(
-          onClick = {
-            if (!stopped) {
-              if (newChatSheetState.value.isVisible()) hideNewChatSheet(true) else showNewChatSheet()
-            }
-          },
-          Modifier.padding(end = DEFAULT_PADDING - 16.dp + endPadding, bottom = DEFAULT_PADDING - 16.dp),
-          elevation = FloatingActionButtonDefaults.elevation(
-            defaultElevation = 0.dp,
-            pressedElevation = 0.dp,
-            hoveredElevation = 0.dp,
-            focusedElevation = 0.dp,
-          ),
-          backgroundColor = if (!stopped) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
-          contentColor = Color.White
-        ) {
-          Icon(if (!newChatSheetState.collectAsState().value.isVisible()) painterResource(MR.images.ic_edit_filled) else painterResource(MR.images.ic_close), stringResource(MR.strings.add_contact_or_create_group))
-        }
-      }
-    }
-  ) {
-    Box(Modifier.padding(it).padding(end = endPadding)) {
-      when (homeTab.value) {
-        is HomeTab.Chats -> ChatsView(searchText)
-        is HomeTab.Contacts -> ContactsView(searchText)
-      }
-    }
-  }
-  if (searchText.value.text.isEmpty()) {
-    if (appPlatform.isDesktop) {
-      val call = remember { chatModel.activeCall }.value
-      if (call != null) {
-        ActiveCallInteractiveArea(call, newChatSheetState)
-      }
-    }
-    // TODO disable this button and sheet for the duration of the switch
-    tryOrShowError("NewChatSheet", error = {}) {
-      NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
-    }
-  }
-  if (appPlatform.isAndroid) {
-    tryOrShowError("UserPicker", error = {}) {
-      UserPicker(chatModel, userPickerState) {
-        scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
-        userPickerState.value = AnimatedViewState.GONE
-      }
-    }
-  }
-}
-
-@Composable
-private fun ChatsView(searchText: MutableState<TextFieldValue>) {
-  Box(
-    modifier = Modifier
-      .fillMaxSize()
-  ) {
-    if (!chatModel.desktopNoUserNoRemote) {
-      ChatList(chatModel, searchText = searchText)
-    }
-    if (chatModel.chats.isEmpty() && !chatModel.switchingUsersAndHosts.value && !chatModel.desktopNoUserNoRemote) {
-      Text(stringResource(
-        if (chatModel.chatRunning.value == null) MR.strings.loading_chats else MR.strings.you_have_no_chats),
-        Modifier.align(Alignment.Center), color = MaterialTheme.colors.secondary
-      )
-    }
-  }
-}
-
-@Composable
-private fun ContactsView(searchText: MutableState<TextFieldValue>) {
-  Box(
-    modifier = Modifier
-      .fillMaxSize()
-  ) {
-    if (!chatModel.desktopNoUserNoRemote) {
-      ContactsList(chatModel, searchText = searchText)
-    }
-    if (remember(chatModel.chats.toList()) { contactChats(chatModel.chats) }.isEmpty() && !chatModel.switchingUsersAndHosts.value && !chatModel.desktopNoUserNoRemote) {
-      Text(stringResource(
-        if (chatModel.chatRunning.value == null) MR.strings.loading_chats else MR.strings.no_contacts),
-        Modifier.align(Alignment.Center), color = MaterialTheme.colors.secondary
-      )
-    }
-  }
-}
-
-fun contactChats(c: List<Chat>): List<Chat> {
-  return c.filter { it.chatInfo is ChatInfo.Direct }
-}
-
-@Composable
-private fun HomeTopBar(homeTab: MutableState<HomeTab>, stopped: Boolean) {
-  val barButtons = arrayListOf<@Composable RowScope.() -> Unit>()
-  if (stopped) {
-    barButtons.add {
-      IconButton(onClick = {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(MR.strings.chat_is_stopped_indication),
-          generalGetString(MR.strings.you_can_start_chat_via_setting_or_by_restarting_the_app)
-        )
-      }) {
-        Icon(
-          painterResource(MR.images.ic_report_filled),
-          generalGetString(MR.strings.chat_is_stopped_indication),
-          tint = Color.Red,
-        )
-      }
-    }
-  }
-  val title = when (homeTab.value) {
-    is HomeTab.Chats -> stringResource(MR.strings.your_chats)
-    is HomeTab.Contacts -> stringResource(MR.strings.contacts)
-  }
-  DefaultTopAppBar(
-    title = {
-      Row(verticalAlignment = Alignment.CenterVertically) {
-        Text(
-          title,
-          color = MaterialTheme.colors.onBackground,
-          fontWeight = FontWeight.SemiBold,
-        )
-      }
-    },
-    onTitleClick = null,
-    showSearch = false,
-    onSearchValueChanged = {},
-    buttons = barButtons
-  )
-  Divider(Modifier.padding(top = AppBarHeight))
-}
-
-@Composable
-private fun HomeBottomBar(
-  drawerState: DrawerState,
-  userPickerState: MutableStateFlow<AnimatedViewState>,
-  homeTab: MutableState<HomeTab>,
-  stopped: Boolean) {
-  Box(
-    Modifier
-      .fillMaxWidth()
-      .height(BottomAppBarHeight)
-      .background(MaterialTheme.colors.background.mixWith(MaterialTheme.colors.onBackground, 0.97f))
-  ) {
-    Divider()
-    Row(
-      Modifier
-        .fillMaxHeight()
-        .fillMaxWidth(),
-      horizontalArrangement = Arrangement.SpaceEvenly,
-      verticalAlignment = Alignment.CenterVertically,
-    ) {
-      SettingsButton(drawerState, userPickerState, stopped)
-
-      HomeTabButton(
-        icon = painterResource(if (homeTab.value is HomeTab.Chats) MR.images.ic_chat_bubble_filled else MR.images.ic_chat_bubble),
-        title = generalGetString(MR.strings.your_chats),
-        onClick = { homeTab.value = HomeTab.Chats() }
-      )
-
-      HomeTabButton(
-        icon = if (homeTab.value is HomeTab.Contacts) rememberVectorPainter(AccountCircleFilled) else painterResource(MR.images.ic_account_circle_filled),
-        title = generalGetString(MR.strings.contacts),
-        onClick = { homeTab.value = HomeTab.Contacts() }
-      )
-    }
-  }
-}
-
-@Composable
-fun SettingsButton(drawerState: DrawerState, userPickerState: MutableStateFlow<AnimatedViewState>, stopped: Boolean) {
-  val scope = rememberCoroutineScope()
-  if (chatModel.users.isEmpty() && !chatModel.desktopNoUserNoRemote) {
-    NavigationButtonMenu { scope.launch { if (drawerState.isOpen) drawerState.close() else drawerState.open() } }
-  } else {
-    val users by remember { derivedStateOf { chatModel.users.filter { u -> u.user.activeUser || !u.user.hidden } } }
-    val allRead = users
-      .filter { u -> !u.user.activeUser && !u.user.hidden }
-      .all { u -> u.unreadCount == 0 }
-    UserProfileButton(chatModel.currentUser.value?.profile?.image, allRead) {
-      if (users.size == 1 && chatModel.remoteHosts.isEmpty()) {
-        scope.launch { drawerState.open() }
-      } else {
-        userPickerState.value = AnimatedViewState.VISIBLE
-      }
-    }
-  }
-}
-
-@Composable
-fun UserProfileButton(image: String?, allRead: Boolean, onButtonClicked: () -> Unit) {
-  Row(verticalAlignment = Alignment.CenterVertically) {
-    IconButton(onClick = onButtonClicked) {
-      Box {
-        ProfileImage(
-          image = image,
-          size = 56.dp,
-          color = MaterialTheme.colors.secondaryVariant.mixWith(MaterialTheme.colors.onBackground, 0.97f)
-        )
-        if (!allRead) {
-          unreadBadge()
-        }
-      }
-    }
-    if (appPlatform.isDesktop) {
-      val h by remember { chatModel.currentRemoteHost }
-      if (h != null) {
-        Spacer(Modifier.width(12.dp))
-        HostDisconnectButton {
-          stopRemoteHostAndReloadHosts(h!!, true)
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun BoxScope.unreadBadge(text: String? = "") {
-  Text(
-    text ?: "",
-    color = MaterialTheme.colors.onPrimary,
-    fontSize = 6.sp,
-    modifier = Modifier
-      .background(MaterialTheme.colors.primary, shape = CircleShape)
-      .badgeLayout()
-      .padding(horizontal = 3.dp)
-      .padding(vertical = 1.dp)
-      .align(Alignment.TopEnd)
-  )
-}
-
-@Composable
-fun HomeTabButton(icon: Painter, title: String, onClick: () -> Unit) {
-  Surface(
-    Modifier
-      .size(56.dp),
-    shape = RoundedCornerShape(10.dp),
-    color = Color.Transparent,
-  ) {
-    Column(
-      Modifier
-        .clickable { onClick () },
-      horizontalAlignment = Alignment.CenterHorizontally,
-      verticalArrangement = Arrangement.Center
-    ) {
-      Icon(
-        icon,
-        contentDescription = null,
-        Modifier.size(24.dp),
-        tint = MaterialTheme.colors.secondary
-      )
-      Text(
-        title,
-        style = MaterialTheme.typography.subtitle2.copy(fontWeight = FontWeight.Normal, fontSize = 12.sp),
-        color = MaterialTheme.colors.secondary
-      )
-    }
-  }
-}
-
-@Composable
-expect fun ActiveCallInteractiveArea(call: Call, newChatSheetState: MutableStateFlow<AnimatedViewState>)
-
-fun connectIfOpenedViaUri(rhId: Long?, uri: URI, chatModel: ChatModel) {
-  Log.d(TAG, "connectIfOpenedViaUri: opened via link")
-  if (chatModel.currentUser.value == null) {
-    chatModel.appOpenUrl.value = rhId to uri
-  } else {
-    withBGApi {
-      planAndConnect(rhId, uri, incognito = null, close = null)
-    }
-  }
-}
-
-@Composable
-private fun ErrorSettingsView() {
-  Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-    Text(generalGetString(MR.strings.error_showing_content), color = MaterialTheme.colors.error, fontStyle = FontStyle.Italic)
-  }
-}
@@ -44,11 +44,6 @@ fun NewChatSheet(chatModel: ChatModel, newChatSheetState: StateFlow<AnimatedView
      ModalManager.center.closeModals()
      ModalManager.center.showModalCloseable { close -> NewChatView(chatModel.currentRemoteHost.value, NewChatOption.INVITE, close = close) }
    },
-    scanPaste = {
-      closeNewChatSheet(false)
-      ModalManager.center.closeModals()
-      ModalManager.center.showModalCloseable { close -> NewChatView(chatModel.currentRemoteHost.value, NewChatOption.CONNECT, showQRCodeScanner = true, close = close) }
-    },
    createGroup = {
      closeNewChatSheet(false)
      ModalManager.center.closeModals()
@@ -60,17 +55,15 @@ fun NewChatSheet(chatModel: ChatModel, newChatSheetState: StateFlow<AnimatedView

 private val titles = listOf(
  MR.strings.add_contact_tab,
-  MR.strings.scan_paste_link,
  MR.strings.create_group_button
 )
-private val icons = listOf(MR.images.ic_add_link, MR.images.ic_qr_code, MR.images.ic_group)
+private val icons = listOf(MR.images.ic_add_link, MR.images.ic_group)

@Composable
 private fun NewChatSheetLayout(
  newChatSheetState: StateFlow<AnimatedViewState>,
  stopped: Boolean,
  addContact: () -> Unit,
-  scanPaste: () -> Unit,
  createGroup: () -> Unit,
  closeNewChatSheet: (animated: Boolean) -> Unit,
 ) {
@@ -109,7 +102,7 @@ private fun NewChatSheetLayout(
    verticalArrangement = Arrangement.Bottom,
    horizontalAlignment = Alignment.End
  ) {
-    val actions = remember { listOf(addContact, scanPaste, createGroup) }
+    val actions = remember { listOf(addContact, createGroup) }
    val backgroundColor = if (isInDarkTheme())
      blendARGB(MaterialTheme.colors.primary, Color.Black, 0.7F)
    else
@@ -152,7 +145,7 @@ private fun NewChatSheetLayout(
    }
    FloatingActionButton(
      onClick = { if (!stopped) closeNewChatSheet(true) },
-      Modifier.padding(end = DEFAULT_PADDING, bottom = DEFAULT_PADDING + BottomAppBarHeight),
+      Modifier.padding(end = DEFAULT_PADDING, bottom = DEFAULT_PADDING),
      elevation = FloatingActionButtonDefaults.elevation(
        defaultElevation = 0.dp,
        pressedElevation = 0.dp,
@@ -271,7 +264,6 @@ private fun PreviewNewChatSheet() {
      MutableStateFlow(AnimatedViewState.VISIBLE),
      stopped = false,
      addContact = {},
-      scanPaste = {},
      createGroup = {},
      closeNewChatSheet = {},
    )
@@ -18,6 +18,7 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.model.User
 import chat.simplex.common.platform.ColumnWithScrollBar
+import chat.simplex.common.platform.ntfManager
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chatlist.UserProfileRow
 import chat.simplex.common.views.database.PassphraseField
@@ -36,6 +37,9 @@ fun HiddenProfileView(
      withBGApi {
        try {
          val u = m.controller.apiHideUser(user, hidePassword)
+          if (!u.activeUser) {
+            ntfManager.cancelNotificationsForUser(u.userId)
+          }
          m.updateUser(u)
          close()
        } catch (e: Exception) {
@@ -175,8 +175,10 @@ private fun UseServerSection(
      Text(stringResource(MR.strings.smp_servers_test_server), color = if (valid && !testing) MaterialTheme.colors.onBackground else MaterialTheme.colors.secondary)
      ShowTestStatus(server)
    }
-    val enabled = rememberUpdatedState(server.enabled)
-    PreferenceToggle(stringResource(MR.strings.smp_servers_use_server_for_new_conn), enabled.value) { onUpdate(server.copy(enabled = it)) }
+    val enabled = rememberUpdatedState(server.enabled == ServerEnabled.Enabled)
+    PreferenceToggle(stringResource(MR.strings.smp_servers_use_server_for_new_conn), enabled.value) { enable ->
+      onUpdate(server.copy(enabled = if (enable) ServerEnabled.Enabled else ServerEnabled.Disabled))
+    }
    SectionItemView(onDelete, disabled = testing) {
      Text(stringResource(MR.strings.smp_servers_delete_server), color = if (testing) MaterialTheme.colors.secondary else MaterialTheme.colors.error)
    }
@@ -34,7 +34,7 @@ fun ModalData.ProtocolServersView(m: ChatModel, rhId: Long?, serverProtocol: Ser
  val currServers = remember(rhId) { mutableStateOf(servers) }
  val testing = rememberSaveable(rhId) { mutableStateOf(false) }
  val serversUnchanged = remember(servers) { derivedStateOf { servers == currServers.value || testing.value } }
-  val allServersDisabled = remember { derivedStateOf { servers.none { it.enabled } } }
+  val allServersDisabled = remember { derivedStateOf { servers.none { it.enabled == ServerEnabled.Enabled } } }
  val saveDisabled = remember(servers) {
    derivedStateOf {
      servers.isEmpty() ||
@@ -250,12 +250,12 @@ private fun ProtocolServerView(serverProtocol: ServerProtocol, srv: ServerCfg, s
  val address = parseServerAddress(srv.server)
  when {
    address == null || !address.valid || address.serverProtocol != serverProtocol || !uniqueAddress(srv, address, servers) -> InvalidServer()
-    !srv.enabled -> Icon(painterResource(MR.images.ic_do_not_disturb_on), null, tint = MaterialTheme.colors.secondary)
+    srv.enabled != ServerEnabled.Enabled -> Icon(painterResource(MR.images.ic_do_not_disturb_on), null, tint = MaterialTheme.colors.secondary)
    else -> ShowTestStatus(srv)
  }
  Spacer(Modifier.padding(horizontal = 4.dp))
  val text = address?.hostnames?.firstOrNull() ?: srv.server
-  if (srv.enabled) {
+  if (srv.enabled == ServerEnabled.Enabled) {
    Text(text, color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.onBackground, maxLines = 1)
  } else {
    Text(text, maxLines = 1, color = MaterialTheme.colors.secondary)
@@ -292,7 +292,7 @@ private fun addAllPresets(rhId: Long?, presetServers: List<String>, servers: Lis
  val toAdd = ArrayList<ServerCfg>()
  for (srv in presetServers) {
    if (!hasPreset(srv, servers)) {
-      toAdd.add(ServerCfg(remoteHostId = rhId, srv, preset = true, tested = null, enabled = true))
+      toAdd.add(ServerCfg(remoteHostId = rhId, srv, preset = true, tested = null, enabled = ServerEnabled.Enabled))
    }
  }
  return toAdd
@@ -319,7 +319,7 @@ private suspend fun testServers(testing: MutableState<Boolean>, servers: List<Se
 private fun resetTestStatus(servers: List<ServerCfg>): List<ServerCfg> {
  val copy = ArrayList(servers)
  for ((index, server) in servers.withIndex()) {
-    if (server.enabled) {
+    if (server.enabled == ServerEnabled.Enabled) {
      copy.removeAt(index)
      copy.add(index, server.copy(tested = null))
    }
@@ -331,7 +331,7 @@ private suspend fun runServersTest(servers: List<ServerCfg>, m: ChatModel, onUpd
  val fs: MutableMap<String, ProtocolTestFailure> = mutableMapOf()
  val updatedServers = ArrayList<ServerCfg>(servers)
  for ((index, server) in servers.withIndex()) {
-    if (server.enabled) {
+    if (server.enabled == ServerEnabled.Enabled) {
      interruptIfCancelled()
      val (updatedServer, f) = testServerConnection(server, m)
      updatedServers.removeAt(index)
@@ -7,6 +7,7 @@ import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.ServerAddress.Companion.parseServerAddress
 import chat.simplex.common.model.ServerCfg
+import chat.simplex.common.model.ServerEnabled
 import chat.simplex.common.ui.theme.DEFAULT_PADDING
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.newchat.QRCodeScanner
@@ -25,7 +26,7 @@ fun ScanProtocolServerLayout(rhId: Long?, onNext: (ServerCfg) -> Unit) {
    QRCodeScanner { text ->
      val res = parseServerAddress(text)
      if (res != null) {
-        onNext(ServerCfg(remoteHostId = rhId, text, false, null, true))
+        onNext(ServerCfg(remoteHostId = rhId, text, false, null, ServerEnabled.Enabled))
      } else {
        AlertManager.shared.showAlertMsg(
          title = generalGetString(MR.strings.smp_servers_invalid_address),
@@ -367,6 +367,7 @@ private suspend fun doRemoveUser(m: ChatModel, user: User, users: List<User>, de
      }
    }
    m.removeUser(user)
+    ntfManager.cancelNotificationsForUser(user.userId)
  } catch (e: Exception) {
    AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_deleting_user), e.stackTraceToString())
  }
@@ -336,7 +336,6 @@
  <string name="welcome">Welcome!</string>
  <string name="this_text_is_available_in_settings">This text is available in settings</string>
  <string name="your_chats">Chats</string>
-  <string name="contacts">Contacts</string>
  <string name="contact_connection_pending">connecting…</string>
  <string name="member_contact_send_direct_message">send direct message</string>
  <string name="group_preview_you_are_invited">you are invited to group</string>
@@ -347,8 +346,6 @@
  <string name="you_have_no_chats">You have no chats</string>
  <string name="loading_chats">Loading chats…</string>
  <string name="no_filtered_chats">No filtered chats</string>
-  <string name="no_contacts">No contacts</string>
-  <string name="no_filtered_contacts">No filtered contacts</string>
  <string name="contact_tap_to_connect">Tap to Connect</string>
  <string name="connect_with_contact_name_question">Connect with %1$s?</string>
  <string name="search_or_paste_simplex_link">Search or paste SimpleX link</string>
@@ -430,28 +427,10 @@
  <string name="notifications">Notifications</string>

  <!-- Chat Info Actions - ChatInfoView.kt -->
-  <string name="info_view_connect_button">connect</string>
-  <string name="info_view_open_button">open</string>
-  <string name="info_view_message_button">message</string>
-  <string name="info_view_call_button">call</string>
-  <string name="info_view_video_button">video</string>
  <string name="delete_contact_question">Delete contact?</string>
  <string name="delete_contact_all_messages_deleted_cannot_undo_warning">Contact and all messages will be deleted - this cannot be undone!</string>
-  <string name="delete_contact_cannot_undo_warning">Contact will be deleted - this cannot be undone!</string>
-  <string name="delete_conversation_question">Delete conversation?</string>
-  <string name="delete_conversation_all_messages_deleted_cannot_undo_warning">Conversation and all messages will be deleted - this cannot be undone!</string>
-  <string name="delete_conversation">Delete conversation</string>
-  <string name="only_delete_conversation">Only delete conversation</string>
-  <string name="delete_contact_keep_conversation">Delete contact, keep conversation</string>
-  <string name="notify_delete_contact_question">Notify contact?</string>
-  <string name="confirm_delete_contact_question">Confirm contact deletion?</string>
  <string name="delete_and_notify_contact">Delete and notify contact</string>
-  <string name="delete_without_notification">Delete without notification</string>
  <string name="button_delete_contact">Delete contact</string>
-  <string name="conversation_deleted">Conversation deleted!</string>
-  <string name="you_can_still_send_messages_to_contact">You can still send messages to %1$s from the Contacts tab.</string>
-  <string name="contact_deleted">Contact deleted!</string>
-  <string name="you_can_still_view_conversation_with_contact">You can still view conversation with %1$s in the Chats tab.</string>
  <string name="text_field_set_contact_placeholder">Set contact name…</string>
  <string name="icon_descr_server_status_connected">Connected</string>
  <string name="icon_descr_server_status_disconnected">Disconnected</string>
@@ -638,7 +617,6 @@
  <!-- NewChatView.kt -->
  <string name="new_chat">New chat</string>
  <string name="add_contact_tab">Add contact</string>
-  <string name="scan_paste_link">Scan / Paste link</string>
  <string name="one_time_link">One-time invitation link</string>
  <string name="one_time_link_short">1-time link</string>
  <string name="simplex_address">SimpleX address</string>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M241.78-244.5 134-136.5q-13.5 13.5-31.25 6.52Q85-136.97 85-156.5V-818q0-22.97 17.27-40.23 17.26-17.27 40.23-17.27h675q22.97 0 40.23 17.27Q875-840.97 875-818v516q0 22.97-17.27 40.23-17.26 17.27-40.23 17.27H241.78Z"/></svg>
@@ -16,7 +16,7 @@ import java.io.File
 import javax.imageio.ImageIO

 object NtfManager {
-  private val prevNtfs = arrayListOf<Pair<ChatId, Slice>>()
+  private val prevNtfs = arrayListOf<Pair<Pair<Long, ChatId>, Slice>>()
  private val prevNtfsMutex: Mutex = Mutex()

  fun notifyCallInvitation(invitation: RcvCallInvitation): Boolean {
@@ -45,14 +45,14 @@ object NtfManager {
      generalGetString(MR.strings.accept) to { ntfManager.acceptCallAction(invitation.contact.id) },
      generalGetString(MR.strings.reject) to { ChatModel.callManager.endCall(invitation = invitation) }
    )
-    displayNotificationViaLib(contactId, title, text, prepareIconPath(largeIcon), actions) {
+    displayNotificationViaLib(invitation.user.userId, contactId, title, text, prepareIconPath(largeIcon), actions) {
      ntfManager.openChatAction(invitation.user.userId, contactId)
    }
    return true
  }

  fun showMessage(title: String, text: String) {
-    displayNotificationViaLib("MESSAGE", title, text, null, emptyList()) {}
+    displayNotificationViaLib(-1, "MESSAGE", title, text, null, emptyList()) {}
  }

  fun hasNotificationsForChat(chatId: ChatId) = false//prevNtfs.any { it.first == chatId }
@@ -60,7 +60,7 @@ object NtfManager {
  fun cancelNotificationsForChat(chatId: ChatId) {
    withBGApi {
      prevNtfsMutex.withLock {
-        val ntf = prevNtfs.firstOrNull { it.first == chatId }
+        val ntf = prevNtfs.firstOrNull { (userChat) -> userChat.second == chatId }
        if (ntf != null) {
          prevNtfs.remove(ntf)
          /*try {
@@ -74,6 +74,16 @@ object NtfManager {
    }
  }

+  fun cancelNotificationsForUser(userId: Long) {
+    withBGApi {
+      prevNtfsMutex.withLock {
+        prevNtfs.filter { (userChat) -> userChat.first == userId }.forEach {
+          prevNtfs.remove(it)
+        }
+      }
+    }
+  }
+
  fun cancelAllNotifications() {
 //    prevNtfs.forEach { try { it.second.close() } catch (e: Exception) { println("Failed to close notification: ${e.stackTraceToString()}") } }
    withBGApi {
@@ -95,12 +105,13 @@ object NtfManager {
      else -> base64ToBitmap(image)
    }

-    displayNotificationViaLib(chatId, title, content, prepareIconPath(largeIcon), actions.map { it.first.name to it.second }) {
+    displayNotificationViaLib(user.userId, chatId, title, content, prepareIconPath(largeIcon), actions.map { it.first.name to it.second }) {
      ntfManager.openChatAction(user.userId, chatId)
    }
  }

  private fun displayNotificationViaLib(
+    userId: Long,
    chatId: String,
    title: String,
    text: String,
@@ -123,7 +134,7 @@ object NtfManager {
    try {
      withBGApi {
        prevNtfsMutex.withLock {
-          prevNtfs.add(chatId to builder.toast())
+          prevNtfs.add(Pair(userId, chatId) to builder.toast())
        }
      }
    } catch (e: Throwable) {
@@ -18,6 +18,7 @@ fun initApp() {
    override fun notifyCallInvitation(invitation: RcvCallInvitation): Boolean = chat.simplex.common.model.NtfManager.notifyCallInvitation(invitation)
    override fun hasNotificationsForChat(chatId: String): Boolean = chat.simplex.common.model.NtfManager.hasNotificationsForChat(chatId)
    override fun cancelNotificationsForChat(chatId: String) = chat.simplex.common.model.NtfManager.cancelNotificationsForChat(chatId)
+    override fun cancelNotificationsForUser(userId: Long) = chat.simplex.common.model.NtfManager.cancelNotificationsForUser(userId)
    override fun displayNotification(user: UserLike, chatId: String, displayName: String, msgText: String, image: String?, actions: List<Pair<NotificationAction, () -> Unit>>) = chat.simplex.common.model.NtfManager.displayNotification(user, chatId, displayName, msgText, image, actions)
    override fun androidCreateNtfChannelsMaybeShowAlert() {}
    override fun cancelCallNotification() {}
@@ -0,0 +1,74 @@
+package chat.simplex.common.views.chatlist
+
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.platform.*
+import chat.simplex.common.ui.theme.*
+import chat.simplex.common.views.call.Call
+import chat.simplex.common.views.call.CallMediaType
+import chat.simplex.common.views.chat.item.ItemAction
+import chat.simplex.common.views.helpers.*
+import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.painterResource
+import dev.icerock.moko.resources.compose.stringResource
+import kotlinx.coroutines.flow.MutableStateFlow
+
+@Composable
+actual fun ActiveCallInteractiveArea(call: Call, newChatSheetState: MutableStateFlow<AnimatedViewState>) {
+  //  if (call.callState == CallState.Connected && !newChatSheetState.collectAsState().value.isVisible()) {
+  if (!newChatSheetState.collectAsState().value.isVisible()) {
+      val showMenu = remember { mutableStateOf(false) }
+      val media = call.peerMedia ?: call.localMedia
+      CompositionLocalProvider(
+        LocalIndication provides NoIndication
+      ) {
+        Box(
+          Modifier
+            .fillMaxSize(),
+          contentAlignment = Alignment.BottomEnd
+        ) {
+          Box(
+            Modifier
+              .padding(end = 71.dp, bottom = 92.dp)
+              .size(67.dp)
+              .combinedClickable(onClick = {
+                val chat = chatModel.getChat(call.contact.id)
+                if (chat != null) {
+                  withBGApi {
+                    openChat(chat.remoteHostId, chat.chatInfo, chatModel)
+                  }
+                }
+              },
+                onLongClick = { showMenu.value = true })
+              .onRightClick { showMenu.value = true },
+            contentAlignment = Alignment.Center
+          ) {
+            Box(Modifier.background(MaterialTheme.colors.background, CircleShape)) {
+              ProfileImageForActiveCall(size = 56.dp, image = call.contact.profile.image)
+            }
+            Box(Modifier.padding().background(SimplexGreen, CircleShape).padding(4.dp).align(Alignment.TopEnd)) {
+              if (media == CallMediaType.Video) {
+                Icon(painterResource(MR.images.ic_videocam_filled), stringResource(MR.strings.icon_descr_video_call), Modifier.size(18.dp), tint = Color.White)
+              } else {
+                Icon(painterResource(MR.images.ic_call_filled), stringResource(MR.strings.icon_descr_audio_call), Modifier.size(18.dp), tint = Color.White)
+              }
+            }
+            DefaultDropdownMenu(showMenu) {
+              ItemAction(stringResource(MR.strings.icon_descr_hang_up), painterResource(MR.images.ic_call_end_filled), color = MaterialTheme.colors.error, onClick = {
+                withBGApi { chatModel.callManager.endCall(call) }
+                showMenu.value = false
+              })
+            }
+          }
+        }
+      }
+    }
+}
@@ -1,76 +0,0 @@
-package chat.simplex.common.views.home
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-import chat.simplex.common.platform.*
-import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.call.Call
-import chat.simplex.common.views.call.CallMediaType
-import chat.simplex.common.views.chat.item.ItemAction
-import chat.simplex.common.views.chatlist.NoIndication
-import chat.simplex.common.views.chatlist.openChat
-import chat.simplex.common.views.helpers.*
-import chat.simplex.res.MR
-import dev.icerock.moko.resources.compose.painterResource
-import dev.icerock.moko.resources.compose.stringResource
-import kotlinx.coroutines.flow.MutableStateFlow
-
-@Composable
-actual fun ActiveCallInteractiveArea(call: Call, newChatSheetState: MutableStateFlow<AnimatedViewState>) {
-  //  if (call.callState == CallState.Connected && !newChatSheetState.collectAsState().value.isVisible()) {
-  if (!newChatSheetState.collectAsState().value.isVisible()) {
-    val showMenu = remember { mutableStateOf(false) }
-    val media = call.peerMedia ?: call.localMedia
-    CompositionLocalProvider(
-      LocalIndication provides NoIndication
-    ) {
-      Box(
-        Modifier
-          .fillMaxSize(),
-        contentAlignment = Alignment.BottomEnd
-      ) {
-        Box(
-          Modifier
-            .padding(end = 71.dp, bottom = 92.dp)
-            .size(67.dp)
-            .combinedClickable(onClick = {
-              val chat = chatModel.getChat(call.contact.id)
-              if (chat != null) {
-                withBGApi {
-                  openChat(chat.remoteHostId, chat.chatInfo, chatModel)
-                }
-              }
-            },
-              onLongClick = { showMenu.value = true })
-            .onRightClick { showMenu.value = true },
-          contentAlignment = Alignment.Center
-        ) {
-          Box(Modifier.background(MaterialTheme.colors.background, CircleShape)) {
-            ProfileImageForActiveCall(size = 56.dp, image = call.contact.profile.image)
-          }
-          Box(Modifier.padding().background(SimplexGreen, CircleShape).padding(4.dp).align(Alignment.TopEnd)) {
-            if (media == CallMediaType.Video) {
-              Icon(painterResource(MR.images.ic_videocam_filled), stringResource(MR.strings.icon_descr_video_call), Modifier.size(18.dp), tint = Color.White)
-            } else {
-              Icon(painterResource(MR.images.ic_call_filled), stringResource(MR.strings.icon_descr_audio_call), Modifier.size(18.dp), tint = Color.White)
-            }
-          }
-          DefaultDropdownMenu(showMenu) {
-            ItemAction(stringResource(MR.strings.icon_descr_hang_up), painterResource(MR.images.ic_call_end_filled), color = MaterialTheme.colors.error, onClick = {
-              withBGApi { chatModel.callManager.endCall(call) }
-              showMenu.value = false
-            })
-          }
-        }
-      }
-    }
-  }
-}
@@ -26,11 +26,11 @@ android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.jvm.target=11

-android.version_name=5.8.1
-android.version_code=221
+android.version_name=5.8.2
+android.version_code=223

-desktop.version_name=5.8.1
-desktop.version_code=54
+desktop.version_name=5.8.2
+desktop.version_code=55

 kotlin.version=1.9.23
 gradle.plugin.version=8.2.0
@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
    type: git
    location: https://github.com/simplex-chat/simplexmq.git
-    tag: 6a54a58a0d47aeca9d5482b0d27e451731b692f1
+    tag: f392ce0a9355cd3883400906ae6c361b77ca46ea

 source-repository-package
    type: git
@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 5.8.1.0
+version: 5.8.2.0
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."6a54a58a0d47aeca9d5482b0d27e451731b692f1" = "1hfbzcirncmmzag2c3gbxnpxl1dwy9gy42d78a5zzf1979rp3yjq";
+  "https://github.com/simplex-chat/simplexmq.git"."f392ce0a9355cd3883400906ae6c361b77ca46ea" = "0id9mg30kmhlfcpnn2np3f0a4bb4smdzvhrbw6km8vv26si1js60";
  "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
  "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
  "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack

 name:           simplex-chat
-version:        5.8.1.0
+version:        5.8.2.0
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat
@@ -47,7 +47,6 @@ import qualified Data.List.NonEmpty as L
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
 import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing, listToMaybe, mapMaybe, maybeToList)
-import Data.Ord (Down (..))
 import qualified Data.Set as S
 import Data.Text (Text)
 import qualified Data.Text as T
@@ -176,12 +175,11 @@ defaultChatConfig =
 _defaultSMPServers :: NonEmpty SMPServerWithAuth
 _defaultSMPServers =
  L.fromList
-    [ "smp://0YuTwO05YJWS8rkjn9eLJDjQhFKvIYd8d4xG8X1blIU=@smp8.simplex.im,beccx4yfxxbvyhqypaavemqurytl6hozr47wfc7uuecacjqdvwpw2xid.onion",
-      "smp://SkIkI6EPd2D63F4xFKfHk7I1UGZVNn6k1QWZ5rcyr6w=@smp9.simplex.im,jssqzccmrcws6bhmn77vgmhfjmhwlyr3u7puw4erkyoosywgl67slqqd.onion",
-      "smp://6iIcWT_dF2zN_w5xzZEY7HI2Prbh3ldP07YTyDexPjE=@smp10.simplex.im,rb2pbttocvnbrngnwziclp2f4ckjq65kebafws6g4hy22cdaiv5dwjqd.onion",
-      "smp://1OwYGt-yqOfe2IyVHhxz3ohqo3aCCMjtB-8wn4X_aoY=@smp11.simplex.im,6ioorbm6i3yxmuoezrhjk6f6qgkc4syabh7m3so74xunb5nzr4pwgfqd.onion",
-      "smp://UkMFNAXLXeAAe0beCa4w6X_zp18PwxSaSjY17BKUGXQ=@smp12.simplex.im,ie42b5weq7zdkghocs3mgxdjeuycheeqqmksntj57rmejagmg4eor5yd.onion",
-      "smp://enEkec4hlR3UtKx2NMpOUK_K4ZuDxjWBO1d9Y4YXVaA=@smp14.simplex.im,aspkyu2sopsnizbyfabtsicikr2s4r3ti35jogbcekhm3fsoeyjvgrid.onion"
+    [ "smp://h--vW7ZSkXPeOUpfxlFGgauQmXNFOzGoizak7Ult7cw=@smp15.simplex.im,oauu4bgijybyhczbnxtlggo6hiubahmeutaqineuyy23aojpih3dajad.onion",
+      "smp://hejn2gVIqNU6xjtGM3OwQeuk8ZEbDXVJXAlnSBJBWUA=@smp16.simplex.im,p3ktngodzi6qrf7w64mmde3syuzrv57y55hxabqcq3l5p6oi7yzze6qd.onion",
+      "smp://ZKe4uxF4Z_aLJJOEsC-Y6hSkXgQS5-oc442JQGkyP8M=@smp17.simplex.im,ogtwfxyi3h2h5weftjjpjmxclhb5ugufa5rcyrmg7j4xlch7qsr5nuqd.onion",
+      "smp://PtsqghzQKU83kYTlQ1VKg996dW4Cw4x_bvpKmiv8uns=@smp18.simplex.im,lyqpnwbs2zqfr45jqkncwpywpbtq7jrhxnib5qddtr6npjyezuwd3nqd.onion",
+      "smp://N_McQS3F9TGoh4ER0QstUf55kGnNSd-wXfNPZ7HukcM=@smp19.simplex.im,i53bbtoqhlc365k6kxzwdp5w3cdt433s7bwh3y32rcbml2vztiyyz5id.onion"
    ]

 _defaultNtfServers :: [NtfServer]
@@ -85,7 +85,7 @@ defaultAppSettings =
      uiDarkColorScheme = Just DCSSimplex,
      uiCurrentThemeIds = Nothing,
      uiThemes = Nothing,
-      oneHandUI = Just False
+      oneHandUI = Just True
    }

 defaultParseAppSettings :: AppSettings
@@ -34,7 +34,8 @@ queue =
    SMPQueueAddress
      { smpServer = srv,
        senderId = "\223\142z\251",
-        dhPublicKey = "MCowBQYDK2VuAyEAjiswwI3O/NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o="
+        dhPublicKey = "MCowBQYDK2VuAyEAjiswwI3O/NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o=",
+        sndSecure = False
      }

 connReqData :: ConnReqUriData
@@ -194,7 +195,7 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
    "{\"v\":\"1\",\"event\":\"x.msg.deleted\",\"params\":{}}"
      #==# XMsgDeleted
  it "x.file" $
-    "{\"v\":\"1\",\"event\":\"x.file\",\"params\":{\"file\":{\"fileConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
+    "{\"v\":\"1\",\"event\":\"x.file\",\"params\":{\"file\":{\"fileConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
      #==# XFile FileInvitation {fileName = "photo.jpg", fileSize = 12345, fileDigest = Nothing, fileConnReq = Just testConnReq, fileInline = Nothing, fileDescr = Nothing}
  it "x.file without file invitation" $
    "{\"v\":\"1\",\"event\":\"x.file\",\"params\":{\"file\":{\"fileSize\":12345,\"fileName\":\"photo.jpg\"}}}"
@@ -203,7 +204,7 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
    "{\"v\":\"1\",\"event\":\"x.file.acpt\",\"params\":{\"fileName\":\"photo.jpg\"}}"
      #==# XFileAcpt "photo.jpg"
  it "x.file.acpt.inv" $
-    "{\"v\":\"1\",\"event\":\"x.file.acpt.inv\",\"params\":{\"msgId\":\"AQIDBA==\",\"fileName\":\"photo.jpg\",\"fileConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}"
+    "{\"v\":\"1\",\"event\":\"x.file.acpt.inv\",\"params\":{\"msgId\":\"AQIDBA==\",\"fileName\":\"photo.jpg\",\"fileConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}"
      #==# XFileAcptInv (SharedMsgId "\1\2\3\4") (Just testConnReq) "photo.jpg"
  it "x.file.acpt.inv" $
    "{\"v\":\"1\",\"event\":\"x.file.acpt.inv\",\"params\":{\"msgId\":\"AQIDBA==\",\"fileName\":\"photo.jpg\"}}"
@@ -230,10 +231,10 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
    "{\"v\":\"1\",\"event\":\"x.contact\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"},\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
      ==# XContact testProfile Nothing
  it "x.grp.inv" $
-    "{\"v\":\"1\",\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}}}}"
      #==# XGrpInv GroupInvitation {fromMember = MemberIdRole (MemberId "\1\2\3\4") GRAdmin, invitedMember = MemberIdRole (MemberId "\5\6\7\8") GRMember, connRequest = testConnReq, groupProfile = testGroupProfile, groupLinkId = Nothing, groupSize = Nothing}
  it "x.grp.inv with group link id" $
-    "{\"v\":\"1\",\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}, \"groupLinkId\":\"AQIDBA==\"}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.inv\",\"params\":{\"groupInvitation\":{\"connRequest\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"invitedMember\":{\"memberRole\":\"member\",\"memberId\":\"BQYHCA==\"},\"groupProfile\":{\"fullName\":\"Team\",\"displayName\":\"team\",\"groupPreferences\":{\"reactions\":{\"enable\":\"on\"},\"voice\":{\"enable\":\"on\"}}},\"fromMember\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\"}, \"groupLinkId\":\"AQIDBA==\"}}}"
      #==# XGrpInv GroupInvitation {fromMember = MemberIdRole (MemberId "\1\2\3\4") GRAdmin, invitedMember = MemberIdRole (MemberId "\5\6\7\8") GRMember, connRequest = testConnReq, groupProfile = testGroupProfile, groupLinkId = Just $ GroupLinkId "\1\2\3\4", groupSize = Nothing}
  it "x.grp.acpt without incognito profile" $
    "{\"v\":\"1\",\"event\":\"x.grp.acpt\",\"params\":{\"memberId\":\"AQIDBA==\"}}"
@@ -254,16 +255,16 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
    "{\"v\":\"1\",\"event\":\"x.grp.mem.intro\",\"params\":{\"memberRestrictions\":{\"restriction\":\"blocked\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
      #==# XGrpMemIntro MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Nothing, profile = testProfile} (Just MemberRestrictions {restriction = MRSBlocked})
  it "x.grp.mem.inv" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"directConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"directConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
      #==# XGrpMemInv (MemberId "\1\2\3\4") IntroInvitation {groupConnReq = testConnReq, directConnReq = Just testConnReq}
  it "x.grp.mem.inv w/t directConnReq" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.mem.inv\",\"params\":{\"memberId\":\"AQIDBA==\",\"memberIntro\":{\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}}"
      #==# XGrpMemInv (MemberId "\1\2\3\4") IntroInvitation {groupConnReq = testConnReq, directConnReq = Nothing}
  it "x.grp.mem.fwd" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"directConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"directConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\",\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
      #==# XGrpMemFwd MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Nothing, profile = testProfile} IntroInvitation {groupConnReq = testConnReq, directConnReq = Just testConnReq}
  it "x.grp.mem.fwd with member chat version range and w/t directConnReq" $
-    "{\"v\":\"1\",\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-8\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.mem.fwd\",\"params\":{\"memberIntro\":{\"groupConnReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"},\"memberInfo\":{\"memberRole\":\"admin\",\"memberId\":\"AQIDBA==\",\"v\":\"1-8\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}}"
      #==# XGrpMemFwd MemberInfo {memberId = MemberId "\1\2\3\4", memberRole = GRAdmin, v = Just $ ChatVersionRange supportedChatVRange, profile = testProfile} IntroInvitation {groupConnReq = testConnReq, directConnReq = Nothing}
  it "x.grp.mem.info" $
    "{\"v\":\"1\",\"event\":\"x.grp.mem.info\",\"params\":{\"memberId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
@@ -284,10 +285,10 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
    "{\"v\":\"1\",\"event\":\"x.grp.del\",\"params\":{}}"
      ==# XGrpDel
  it "x.grp.direct.inv" $
-    "{\"v\":\"1\",\"event\":\"x.grp.direct.inv\",\"params\":{\"connReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\", \"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.direct.inv\",\"params\":{\"connReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\", \"content\":{\"text\":\"hello\",\"type\":\"text\"}}}"
      #==# XGrpDirectInv testConnReq (Just $ MCText "hello")
  it "x.grp.direct.inv without content" $
-    "{\"v\":\"1\",\"event\":\"x.grp.direct.inv\",\"params\":{\"connReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}"
+    "{\"v\":\"1\",\"event\":\"x.grp.direct.inv\",\"params\":{\"connReq\":\"simplex:/invitation#/?v=1&smp=smp%3A%2F%2F1234-w%3D%3D%40smp.simplex.im%3A5223%2F3456-w%3D%3D%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAjiswwI3O_NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o%253D&e2e=v%3D2-3%26x3dh%3DMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D%2CMEIwBQYDK2VvAzkAmKuSYeQ_m0SixPDS8Wq8VBaTS1cW-Lp0n0h4Diu-kUpR-qXx4SDJ32YGEFoGFGSbGPry5Ychr6U%3D\"}}"
      #==# XGrpDirectInv testConnReq Nothing
  -- it "x.grp.msg.forward"
  --   $ "{\"v\":\"1\",\"event\":\"x.grp.msg.forward\",\"params\":{\"msgForward\":{\"memberId\":\"AQIDBA==\",\"msg\":\"{\"v\":\"1\",\"event\":\"x.msg.new\",\"params\":{\"content\":{\"text\":\"hello\",\"type\":\"text\"}}}\",\"msgTs\":\"1970-01-01T00:00:01.000000001Z\"}}}"
Author	SHA1	Message	Date
Evgeny Poberezkin	e22e01acd2	5.8.2: ios 226, android 223, desktop 55	2024-07-02 21:28:34 +01:00
Stanislav Dmitrenko	8e4299afb6	android, desktop: close modals only for desktop (#4390 )	2024-07-02 18:26:23 +01:00
Stanislav Dmitrenko	ecff3c6ee5	android, desktop: notifications improvement (missed call, hidden user) (#4389 ) * android, desktop: notifications improvement (missed call, hidden user) * change * change	2024-07-02 18:19:43 +01:00
Evgeny Poberezkin	85af368371	core: 5.8.2.0, simplexmq: 5.8.2.0	2024-07-02 15:07:46 +01:00
Stanislav Dmitrenko	0d3928bd51	android, desktop: handle situation when not all databases created before shut down (#4294 ) * android, desktop: handle situation when not all databases created before shut down * more logic of choosing whether to delete databases or not * comment * rename * refactoring	2024-07-02 15:02:36 +01:00
Evgeny Poberezkin	ddeaa1c7c3	core: servers	2024-07-02 14:50:25 +01:00
Evgeny Poberezkin	00ba468898	core: update simplexmq (disable fast handshake) (#4388 ) * core: update simplexmq (disable fast handshake) * fix encoding tests * fix * update simplexmq	2024-07-02 14:35:47 +01:00
spaced4ndy	593c7d247c	ui: add ServerEnabled type (#4381 )	2024-07-01 17:10:22 +04:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M241.78-244.5 134-136.5q-13.5 13.5-31.25 6.52Q85-136.97 85-156.5V-818q0-22.97 17.27-40.23 17.26-17.27 40.23-17.27h675q22.97 0 40.23 17.27Q875-840.97 875-818v516q0 22.97-17.27 40.23-17.26 17.27-40.23 17.27H241.78Z"/></svg>`