added vertical scrollbar for chat list for desktop

2023-11-28 18:01:12 -05:00
81 changed files with 881 additions and 1632 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -262,7 +262,7 @@ jobs:
      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing

      - name: 'Setup MSYS2'
-        if: matrix.os == 'windows-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
        uses: msys2/setup-msys2@v2
        with:
          msystem: ucrt64
--- a/apps/ios/Shared/Model/SimpleXAPI.swift
+++ b/apps/ios/Shared/Model/SimpleXAPI.swift
@@ -605,29 +605,27 @@ func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
    throw r
 }

-func apiConnect(incognito: Bool, connReq: String) async -> (ConnReqType, PendingContactConnection)? {
-    let (r, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
+func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
+    let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
    if let alert = alert {
        AlertManager.shared.showAlert(alert)
        return nil
    } else {
-        return r
+        return connReqType
    }
 }

-func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, PendingContactConnection)?, Alert?) {
+func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert?) {
    guard let userId = ChatModel.shared.currentUser?.userId else {
        logger.error("apiConnect: no current user")
        return (nil, nil)
    }
    let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
-    let m = ChatModel.shared
    switch r {
-    case let .sentConfirmation(_, connection):
-        return ((.invitation, connection), nil)
-    case let .sentInvitation(_, connection):
-        return ((.contact, connection), nil)
+    case .sentConfirmation: return (.invitation, nil)
+    case .sentInvitation: return (.contact, nil)
    case let .contactAlreadyExists(_, contact):
+        let m = ChatModel.shared
        if let c = m.getContactChat(contact.contactId) {
            await MainActor.run { m.chatId = c.id }
        }
@@ -1364,6 +1362,18 @@ func processReceivedMsg(_ res: ChatResponse) async {
    let m = ChatModel.shared
    logger.debug("processReceivedMsg: \(res.responseType)")
    switch res {
+    case let .newContactConnection(user, connection):
+        if active(user) {
+            await MainActor.run {
+                m.updateContactConnection(connection)
+            }
+        }
+    case let .contactConnectionDeleted(user, connection):
+        if active(user) {
+            await MainActor.run {
+                m.removeChat(connection.id)
+            }
+        }
    case let .contactDeletedByContact(user, contact):
        if active(user) && contact.directOrUsed {
            await MainActor.run {
--- a/apps/ios/Shared/SimpleXApp.swift
+++ b/apps/ios/Shared/SimpleXApp.swift
@@ -26,10 +26,10 @@ struct SimpleXApp: App {
    @State private var showInitializationView = false

    init() {
-//        DispatchQueue.global(qos: .background).sync {
+        DispatchQueue.global(qos: .background).sync {
            haskell_init()
 //            hs_init(0, nil)
-//        }
+        }
        UserDefaults.standard.register(defaults: appDefaults)
        setGroupDefaults()
        registerGroupDefaults()
--- a/apps/ios/Shared/Views/NewChat/CreateLinkView.swift
+++ b/apps/ios/Shared/Views/NewChat/CreateLinkView.swift
@@ -73,7 +73,6 @@ struct CreateLinkView: View {
        Task {
            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
                await MainActor.run {
-                    m.updateContactConnection(pcc)
                    connReqInvitation = connReq
                    contactConnection = pcc
                    m.connReqInv = connReq
--- a/apps/ios/Shared/Views/NewChat/NewChatButton.swift
+++ b/apps/ios/Shared/Views/NewChat/NewChatButton.swift
@@ -52,9 +52,6 @@ struct NewChatButton: View {
    func addContactAction() {
        Task {
            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
-                await MainActor.run {
-                    ChatModel.shared.updateContactConnection(pcc)
-                }
                actionSheet = .createLink(link: connReq, connection: pcc)
            }
        }
@@ -349,10 +346,7 @@ private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incogn

 private func connectViaLink(_ connectionLink: String, connectionPlan: ConnectionPlan?, dismiss: Bool, incognito: Bool) {
    Task {
-        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connReq: connectionLink) {
-            await MainActor.run {
-                ChatModel.shared.updateContactConnection(pcc)
-            }
+        if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
            let crt: ConnReqType
            if let plan = connectionPlan {
                crt = planToConnReqType(plan)
--- a/apps/ios/Shared/Views/NewChat/QRCode.swift
+++ b/apps/ios/Shared/Views/NewChat/QRCode.swift
@@ -11,12 +11,20 @@ import CoreImage.CIFilterBuiltins

 struct MutableQRCode: View {
    @Binding var uri: String
-    var withLogo: Bool = true
-    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
+    @State private var image: UIImage?

    var body: some View {
-        QRCode(uri: uri, withLogo: withLogo, tintColor: tintColor)
-            .id("simplex-qrcode-view-for-\(uri)")
+        ZStack {
+            if let image = image {
+                qrCodeImage(image)
+            }
+        }
+        .onAppear {
+            image = generateImage(uri)
+        }
+        .onChange(of: uri) { _ in
+            image = generateImage(uri)
+        }
    }
 }

@@ -41,7 +49,7 @@ struct QRCode: View {
    var withLogo: Bool = true
    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
    @State private var image: UIImage? = nil
-    @State private var makeScreenshotFunc: () -> Void = {}
+    @State private var makeScreenshotBinding: () -> Void = {}

    var body: some View {
        ZStack {
@@ -62,18 +70,18 @@ struct QRCode: View {
                    }
                }
                .onAppear {
-                    makeScreenshotFunc = {
+                    makeScreenshotBinding = {
                        let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
-                    }
+                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])}
                }
                .frame(width: geo.size.width, height: geo.size.height)
            }
        }
-        .onTapGesture(perform: makeScreenshotFunc)
+        .onTapGesture(perform: makeScreenshotBinding)
        .onAppear {
-            image = image ?? generateImage(uri, tintColor: tintColor)
+            image = image ?? generateImage(uri)?.replaceColor(UIColor.black, tintColor)
        }
+
    }
 }

@@ -85,13 +93,13 @@ private func qrCodeImage(_ image: UIImage) -> some View {
        .textSelection(.enabled)
 }

-private func generateImage(_ uri: String, tintColor: UIColor) -> UIImage? {
+private func generateImage(_ uri: String) -> UIImage? {
    let context = CIContext()
    let filter = CIFilter.qrCodeGenerator()
    filter.message = Data(uri.utf8)
    if let outputImage = filter.outputImage,
       let cgImage = context.createCGImage(outputImage, from: outputImage.extent) {
-        return UIImage(cgImage: cgImage).replaceColor(UIColor.black, tintColor)
+        return UIImage(cgImage: cgImage)
    }
    return nil
 }
--- a/apps/ios/Shared/Views/UserSettings/UserAddressView.swift
+++ b/apps/ios/Shared/Views/UserSettings/UserAddressView.swift
@@ -190,8 +190,7 @@ struct UserAddressView: View {

    @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
        Section {
-            SimpleXLinkQRCode(uri: userAddress.connReqContact)
-                .id("simplex-contact-address-qrcode-\(userAddress.connReqContact)")
+            MutableQRCode(uri: Binding.constant(simplexChatLink(userAddress.connReqContact)))
            shareQRCodeButton(userAddress)
            if MFMailComposeViewController.canSendMail() {
                shareViaEmailButton(userAddress)
--- a/apps/ios/SimpleX.xcodeproj/project.pbxproj
+++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj
@@ -120,6 +120,11 @@
 		5CCD403727A5F9A200368C90 /* ScanToConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */; };
 		5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD67B8D2B0E858A00C510B1 /* hs_init.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CD67B8E2B0E858A00C510B1 /* hs_init.c */; };
+		5CD67BA02B120ADF00C510B1 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9B2B120ADF00C510B1 /* libgmp.a */; };
+		5CD67BA12B120ADF00C510B1 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */; };
+		5CD67BA22B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */; };
+		5CD67BA32B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */; };
+		5CD67BA42B120ADF00C510B1 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD67B9F2B120ADF00C510B1 /* libffi.a */; };
 		5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDCAD472818589900503DA2 /* NotificationService.swift */; };
 		5CE2BA702845308900EC33A6 /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		5CE2BA712845308900EC33A6 /* SimpleXChat.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -145,11 +150,6 @@
 		5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCEC27DEA495000BD591 /* MsgContentView.swift */; };
 		5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */; };
 		5CEBD7482A5F115D00665FE2 /* SetDeliveryReceiptsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */; };
-		5CF937182B22552700E1D781 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF937132B22552700E1D781 /* libffi.a */; };
-		5CF937192B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF937142B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */; };
-		5CF9371A2B22552700E1D781 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF937152B22552700E1D781 /* libgmp.a */; };
-		5CF9371B2B22552700E1D781 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF937162B22552700E1D781 /* libgmpxx.a */; };
-		5CF9371C2B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF937172B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */; };
 		5CFA59C42860BC6200863A68 /* MigrateToAppGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */; };
 		5CFA59D12864782E00863A68 /* ChatArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59CF286477B400863A68 /* ChatArchiveView.swift */; };
 		5CFE0921282EEAF60002594B /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */; };
@@ -403,6 +403,11 @@
 		5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanToConnectView.swift; sourceTree = "<group>"; };
 		5CD67B8D2B0E858A00C510B1 /* hs_init.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hs_init.h; sourceTree = "<group>"; };
 		5CD67B8E2B0E858A00C510B1 /* hs_init.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = hs_init.c; sourceTree = "<group>"; };
+		5CD67B9B2B120ADF00C510B1 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a"; sourceTree = "<group>"; };
+		5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a"; sourceTree = "<group>"; };
+		5CD67B9F2B120ADF00C510B1 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5CDCAD452818589900503DA2 /* SimpleX NSE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX NSE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5CDCAD472818589900503DA2 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		5CDCAD492818589900503DA2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -429,11 +434,6 @@
 		5CEACCEC27DEA495000BD591 /* MsgContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgContentView.swift; sourceTree = "<group>"; };
 		5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardPadding.swift; sourceTree = "<group>"; };
 		5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetDeliveryReceiptsView.swift; sourceTree = "<group>"; };
-		5CF937132B22552700E1D781 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5CF937142B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a"; sourceTree = "<group>"; };
-		5CF937152B22552700E1D781 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5CF937162B22552700E1D781 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5CF937172B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a"; sourceTree = "<group>"; };
 		5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateToAppGroupView.swift; sourceTree = "<group>"; };
 		5CFA59CF286477B400863A68 /* ChatArchiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatArchiveView.swift; sourceTree = "<group>"; };
 		5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ZoomableScrollView.swift; path = Shared/Views/ZoomableScrollView.swift; sourceTree = SOURCE_ROOT; };
@@ -511,12 +511,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CF9371C2B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a in Frameworks */,
-				5CF9371B2B22552700E1D781 /* libgmpxx.a in Frameworks */,
+				5CD67BA12B120ADF00C510B1 /* libgmpxx.a in Frameworks */,
+				5CD67BA22B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5CF9371A2B22552700E1D781 /* libgmp.a in Frameworks */,
-				5CF937182B22552700E1D781 /* libffi.a in Frameworks */,
-				5CF937192B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a in Frameworks */,
+				5CD67BA02B120ADF00C510B1 /* libgmp.a in Frameworks */,
+				5CD67BA42B120ADF00C510B1 /* libffi.a in Frameworks */,
+				5CD67BA32B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -579,11 +579,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5CF937132B22552700E1D781 /* libffi.a */,
-				5CF937152B22552700E1D781 /* libgmp.a */,
-				5CF937162B22552700E1D781 /* libgmpxx.a */,
-				5CF937142B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4-ghc8.10.7.a */,
-				5CF937172B22552700E1D781 /* libHSsimplex-chat-5.4.0.7-EoJ0xKOyE47DlSpHXf0V4.a */,
+				5CD67B9F2B120ADF00C510B1 /* libffi.a */,
+				5CD67B9B2B120ADF00C510B1 /* libgmp.a */,
+				5CD67B9C2B120ADF00C510B1 /* libgmpxx.a */,
+				5CD67B9E2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u-ghc8.10.7.a */,
+				5CD67B9D2B120ADF00C510B1 /* libHSsimplex-chat-5.4.0.6-9DfazyElTA72omjHp0C93u.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -1502,7 +1502,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1524,7 +1524,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1545,7 +1545,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1567,7 +1567,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1626,7 +1626,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1639,7 +1639,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1658,7 +1658,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1671,7 +1671,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1690,7 +1690,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1714,7 +1714,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1736,7 +1736,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 184;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1760,7 +1760,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4.1;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
--- a/apps/ios/SimpleXChat/APITypes.swift
+++ b/apps/ios/SimpleXChat/APITypes.swift
@@ -505,8 +505,8 @@ public enum ChatResponse: Decodable, Error {
    case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
    case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
    case connectionPlan(user: UserRef, connectionPlan: ConnectionPlan)
-    case sentConfirmation(user: UserRef, connection: PendingContactConnection)
-    case sentInvitation(user: UserRef, connection: PendingContactConnection)
+    case sentConfirmation(user: UserRef)
+    case sentInvitation(user: UserRef)
    case sentInvitationToContact(user: UserRef, contact: Contact, customUserProfile: Profile?)
    case contactAlreadyExists(user: UserRef, contact: Contact)
    case contactRequestAlreadyAccepted(user: UserRef, contact: Contact)
@@ -605,6 +605,7 @@ public enum ChatResponse: Decodable, Error {
    case ntfTokenStatus(status: NtfTknStatus)
    case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode)
    case ntfMessages(user_: User?, connEntity: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
+    case newContactConnection(user: UserRef, connection: PendingContactConnection)
    case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
    // remote desktop responses/events
    case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
@@ -751,6 +752,7 @@ public enum ChatResponse: Decodable, Error {
            case .ntfTokenStatus: return "ntfTokenStatus"
            case .ntfToken: return "ntfToken"
            case .ntfMessages: return "ntfMessages"
+            case .newContactConnection: return "newContactConnection"
            case .contactConnectionDeleted: return "contactConnectionDeleted"
            case .remoteCtrlList: return "remoteCtrlList"
            case .remoteCtrlFound: return "remoteCtrlFound"
@@ -801,11 +803,11 @@ public enum ChatResponse: Decodable, Error {
            case let .contactCode(u, contact, connectionCode): return withUser(u, "contact: \(String(describing: contact))\nconnectionCode: \(connectionCode)")
            case let .groupMemberCode(u, groupInfo, member, connectionCode): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionCode: \(connectionCode)")
            case let .connectionVerified(u, verified, expectedCode): return withUser(u, "verified: \(verified)\nconnectionCode: \(expectedCode)")
-            case let .invitation(u, connReqInvitation, connection): return withUser(u, "connReqInvitation: \(connReqInvitation)\nconnection: \(connection)")
+            case let .invitation(u, connReqInvitation, _): return withUser(u, connReqInvitation)
            case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
            case let .connectionPlan(u, connectionPlan): return withUser(u, String(describing: connectionPlan))
-            case let .sentConfirmation(u, connection): return withUser(u, String(describing: connection))
-            case let .sentInvitation(u, connection): return withUser(u, String(describing: connection))
+            case .sentConfirmation: return noDetails
+            case .sentInvitation: return noDetails
            case let .sentInvitationToContact(u, contact, _): return withUser(u, String(describing: contact))
            case let .contactAlreadyExists(u, contact): return withUser(u, String(describing: contact))
            case let .contactRequestAlreadyAccepted(u, contact): return withUser(u, String(describing: contact))
@@ -898,6 +900,7 @@ public enum ChatResponse: Decodable, Error {
            case let .ntfTokenStatus(status): return String(describing: status)
            case let .ntfToken(token, status, ntfMode): return "token: \(token)\nstatus: \(status.rawValue)\nntfMode: \(ntfMode.rawValue)"
            case let .ntfMessages(u, connEntity, msgTs, ntfMessages): return withUser(u, "connEntity: \(String(describing: connEntity))\nmsgTs: \(String(describing: msgTs))\nntfMessages: \(String(describing: ntfMessages))")
+            case let .newContactConnection(u, connection): return withUser(u, String(describing: connection))
            case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
            case let .remoteCtrlList(remoteCtrls): return String(describing: remoteCtrls)
            case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible): return "remoteCtrl:\n\(String(describing: remoteCtrl))\nctrlAppInfo_:\n\(String(describing: ctrlAppInfo_))\nappVersion: \(appVersion)\ncompatible: \(compatible)"
--- a/apps/multiplatform/android/build.gradle.kts
+++ b/apps/multiplatform/android/build.gradle.kts
@@ -12,7 +12,7 @@ android {

    defaultConfig {
        applicationId = "chat.simplex.app"
-        minSdkVersion(28)
+        minSdkVersion(26)
        targetSdkVersion(33)
        // !!!
        // skip version code after release to F-Droid, as it uses two version codes
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt
@@ -41,7 +41,9 @@ class MainActivity: FragmentActivity() {
      )
    }
    setContent {
-      AppScreen()
+      SimpleXTheme {
+        AppScreen()
+      }
    }
    SimplexApp.context.schedulePeriodicServiceRestartWorker()
    SimplexApp.context.schedulePeriodicWakeUp()
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt
@@ -32,9 +32,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
  override fun onCreate() {
    super.onCreate()
    if (ProcessPhoenix.isPhoenixProcess(this)) {
-      return
-    } else {
-      registerGlobalErrorHandler()
+      return;
    }
    context = this
    initHaskell()
@@ -77,7 +75,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
        }
        Lifecycle.Event.ON_RESUME -> {
          isAppOnForeground = true
-          if (chatModel.controller.appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete && chatModel.currentUser.value != null) {
+          if (chatModel.controller.appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete) {
            SimplexService.showBackgroundServiceNoticeIfNeeded()
          }
          /**
--- a/apps/multiplatform/common/build.gradle.kts
+++ b/apps/multiplatform/common/build.gradle.kts
@@ -110,7 +110,7 @@ android {
  compileSdkVersion(34)
  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
  defaultConfig {
-    minSdkVersion(28)
+    minSdkVersion(26)
    targetSdkVersion(33)
  }
  compileOptions {
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/UI.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/UI.android.kt
@@ -8,14 +8,10 @@ import android.os.Build
 import android.view.*
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
-import androidx.activity.compose.setContent
 import androidx.compose.runtime.*
 import androidx.compose.ui.platform.LocalView
-import chat.simplex.common.AppScreen
-import chat.simplex.common.ui.theme.SimpleXTheme
-import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.helpers.KeyboardState
 import androidx.compose.ui.platform.LocalContext as LocalContext1
-import chat.simplex.res.MR

 actual fun showToast(text: String, timeout: Long) = Toast.makeText(androidAppContext, text, Toast.LENGTH_SHORT).show()

@@ -75,37 +71,3 @@ actual fun hideKeyboard(view: Any?) {
 }

 actual fun androidIsFinishingMainActivity(): Boolean = (mainActivity.get()?.isFinishing == true)
-
-actual class GlobalExceptionsHandler: Thread.UncaughtExceptionHandler {
-  actual override fun uncaughtException(thread: Thread, e: Throwable) {
-    Log.e(TAG, "App crashed, thread name: " + thread.name + ", exception: " + e.stackTraceToString())
-    if (ModalManager.start.hasModalsOpen()) {
-      ModalManager.start.closeModal()
-    } else if (chatModel.chatId.value != null) {
-      // Since no modals are open, the problem is probably in ChatView
-      chatModel.chatId.value = null
-      chatModel.chatItems.clear()
-    } else {
-      // ChatList, nothing to do. Maybe to show other view except ChatList
-    }
-    chatModel.activeCall.value?.let {
-      withBGApi {
-        chatModel.callManager.endCall(it)
-      }
-    }
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(MR.strings.app_was_crashed),
-      text = e.stackTraceToString()
-    )
-    //mainActivity.get()?.recreate()
-    mainActivity.get()?.apply {
-      window
-        ?.decorView
-        ?.findViewById<ViewGroup>(android.R.id.content)
-        ?.removeViewAt(0)
-      setContent {
-        AppScreen()
-      }
-    }
-  }
-}
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.android.kt
@@ -1,15 +0,0 @@
-package chat.simplex.common.views.onboarding
-
-import androidx.compose.runtime.Composable
-import chat.simplex.common.model.SharedPreference
-import chat.simplex.common.model.User
-import chat.simplex.res.MR
-
-@Composable
-actual fun OnboardingActionButton(user: User?, onboardingStage: SharedPreference<OnboardingStage>, onclick: (() -> Unit)?) {
-  if (user == null) {
-    OnboardingActionButton(MR.strings.create_your_profile, onboarding = OnboardingStage.Step2_CreateProfile, true, onclick = onclick)
-  } else {
-    OnboardingActionButton(MR.strings.make_private_connection, onboarding = OnboardingStage.OnboardingComplete, true, onclick = onclick)
-  }
-}
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
@@ -37,16 +37,15 @@ import kotlinx.coroutines.flow.*

 data class SettingsViewState(
  val userPickerState: MutableStateFlow<AnimatedViewState>,
-  val scaffoldState: ScaffoldState
+  val scaffoldState: ScaffoldState,
+  val switchingUsersAndHosts: MutableState<Boolean>
 )

@Composable
 fun AppScreen() {
-  SimpleXTheme {
-    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-      Surface(color = MaterialTheme.colors.background) {
-        MainScreen()
-      }
+  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+    Surface(color = MaterialTheme.colors.background) {
+      MainScreen()
    }
  }
 }
@@ -103,8 +102,11 @@ fun MainScreen() {
  }

  Box {
-    val onboarding by remember { chatModel.controller.appPrefs.onboardingStage.state }
-    val localUserCreated = chatModel.localUserCreated.value
+    var onboarding by remember { mutableStateOf(chatModel.controller.appPrefs.onboardingStage.get()) }
+    LaunchedEffect(Unit) {
+      snapshotFlow { chatModel.controller.appPrefs.onboardingStage.state.value }.distinctUntilChanged().collect { onboarding = it }
+    }
+    val userCreated = chatModel.userCreated.value
    var showInitializationView by remember { mutableStateOf(false) }
    when {
      chatModel.chatDbStatus.value == null && showInitializationView -> InitializationView()
@@ -113,18 +115,14 @@ fun MainScreen() {
          DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
        }
      }
-      remember { chatModel.chatDbEncrypted }.value == null || localUserCreated == null -> SplashView()
-      onboarding == OnboardingStage.OnboardingComplete -> {
+      remember { chatModel.chatDbEncrypted }.value == null || userCreated == null -> SplashView()
+      onboarding == OnboardingStage.OnboardingComplete && userCreated -> {
        Box {
          showAdvertiseLAAlert = true
-          val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(if (chatModel.desktopNoUserNoRemote()) AnimatedViewState.VISIBLE else AnimatedViewState.GONE)) }
-          KeyChangeEffect(chatModel.desktopNoUserNoRemote) {
-            if (chatModel.desktopNoUserNoRemote() && !ModalManager.start.hasModalsOpen()) {
-              userPickerState.value = AnimatedViewState.VISIBLE
-            }
-          }
+          val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
          val scaffoldState = rememberScaffoldState()
-          val settingsState = remember { SettingsViewState(userPickerState, scaffoldState) }
+          val switchingUsersAndHosts = rememberSaveable { mutableStateOf(false) }
+          val settingsState = remember { SettingsViewState(userPickerState, scaffoldState, switchingUsersAndHosts) }
          if (appPlatform.isAndroid) {
            AndroidScreen(settingsState)
          } else {
@@ -139,14 +137,12 @@ fun MainScreen() {
        }
      }
      onboarding == OnboardingStage.Step2_CreateProfile -> CreateFirstProfile(chatModel) {}
-      onboarding == OnboardingStage.LinkAMobile -> LinkAMobile()
      onboarding == OnboardingStage.Step2_5_SetupDatabasePassphrase -> SetupDatabasePassphrase(chatModel)
      onboarding == OnboardingStage.Step3_CreateSimpleXAddress -> CreateSimpleXAddress(chatModel, null)
      onboarding == OnboardingStage.Step4_SetNotificationsMode -> SetNotificationsMode(chatModel)
    }
    if (appPlatform.isAndroid) {
      ModalManager.fullscreen.showInView()
-      SwitchingUsersView()
    }

    val unauthorized = remember { derivedStateOf { AppLock.userAuthorized.value != true } }
@@ -266,7 +262,7 @@ fun CenterPartOfScreen() {
            .background(MaterialTheme.colors.background),
          contentAlignment = Alignment.Center
        ) {
-          Text(stringResource(if (chatModel.desktopNoUserNoRemote) MR.strings.no_connected_mobile else MR.strings.no_selected_chat))
+          Text(stringResource(MR.strings.no_selected_chat))
        }
      } else {
        ModalManager.center.showInView()
@@ -290,7 +286,6 @@ fun DesktopScreen(settingsState: SettingsViewState) {
    }
    Box(Modifier.widthIn(max = DEFAULT_START_MODAL_WIDTH)) {
      ModalManager.start.showInView()
-      SwitchingUsersView()
    }
    Row(Modifier.padding(start = DEFAULT_START_MODAL_WIDTH).clipToBounds()) {
      Box(Modifier.widthIn(min = DEFAULT_MIN_CENTER_MODAL_WIDTH).weight(1f)) {
@@ -303,7 +298,7 @@ fun DesktopScreen(settingsState: SettingsViewState) {
        EndPartOfScreen()
      }
    }
-    val (userPickerState, scaffoldState ) = settingsState
+    val (userPickerState, scaffoldState, switchingUsersAndHosts ) = settingsState
    val scope = rememberCoroutineScope()
    if (scaffoldState.drawerState.isOpen) {
      Box(
@@ -317,7 +312,7 @@ fun DesktopScreen(settingsState: SettingsViewState) {
      )
    }
    VerticalDivider(Modifier.padding(start = DEFAULT_START_MODAL_WIDTH))
-    UserPicker(chatModel, userPickerState) {
+    UserPicker(chatModel, userPickerState, switchingUsersAndHosts) {
      scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
      userPickerState.value = AnimatedViewState.GONE
    }
@@ -340,26 +335,3 @@ fun InitializationView() {
    }
  }
 }
-
-@Composable
-private fun SwitchingUsersView() {
-  if (remember { chatModel.switchingUsersAndHosts }.value) {
-    Box(
-      Modifier.fillMaxSize().clickable(enabled = false, onClick = {}),
-      contentAlignment = Alignment.Center
-    ) {
-      ProgressIndicator()
-    }
-  }
-}
-
-@Composable
-private fun ProgressIndicator() {
-  CircularProgressIndicator(
-    Modifier
-      .padding(horizontal = 2.dp)
-      .size(30.dp),
-    color = MaterialTheme.colors.secondary,
-    strokeWidth = 2.5.dp
-  )
-}
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
@@ -2,6 +2,7 @@ package chat.simplex.common.model

 import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.SpanStyle
@@ -42,7 +43,7 @@ object ChatModel {
  val setDeliveryReceipts = mutableStateOf(false)
  val currentUser = mutableStateOf<User?>(null)
  val users = mutableStateListOf<UserInfo>()
-  val localUserCreated = mutableStateOf<Boolean?>(null)
+  val userCreated = mutableStateOf<Boolean?>(null)
  val chatRunning = mutableStateOf<Boolean?>(null)
  val chatDbChanged = mutableStateOf<Boolean>(false)
  val chatDbEncrypted = mutableStateOf<Boolean?>(false)
@@ -50,7 +51,6 @@ object ChatModel {
  val chats = mutableStateListOf<Chat>()
  // map of connections network statuses, key is agent connection id
  val networkStatuses = mutableStateMapOf<String, NetworkStatus>()
-  val switchingUsersAndHosts = mutableStateOf(false)

  // current chat
  val chatId = mutableStateOf<String?>(null)
@@ -67,9 +67,6 @@ object ChatModel {
  // set when app opened from external intent
  val clearOverlays = mutableStateOf<Boolean>(false)

-  // Only needed during onboarding when user skipped password setup (left as random password)
-  val desktopOnboardingRandomPassword = mutableStateOf(false)
-
  // set when app is opened via contact or invitation URI
  val appOpenUrl = mutableStateOf<URI?>(null)

@@ -111,9 +108,6 @@ object ChatModel {

  var updatingChatsMutex: Mutex = Mutex()

-  val desktopNoUserNoRemote: Boolean @Composable get() = appPlatform.isDesktop && currentUser.value == null && currentRemoteHost.value == null
-  fun desktopNoUserNoRemote(): Boolean = appPlatform.isDesktop && currentUser.value == null && currentRemoteHost.value == null
-
  // remote controller
  val remoteHosts = mutableStateListOf<RemoteHostInfo>()
  val currentRemoteHost = mutableStateOf<RemoteHostInfo?>(null)
@@ -626,7 +620,6 @@ object ChatModel {
    terminalItems.add(item)
  }

-  val connectedToRemote: Boolean @Composable get() = currentRemoteHost.value != null || remoteCtrlSession.value?.active == true
  fun connectedToRemote(): Boolean = currentRemoteHost.value != null || remoteCtrlSession.value?.active == true
 }

--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
@@ -173,8 +173,6 @@ class AppPreferences {
  val connectRemoteViaMulticastAuto = mkBoolPreference(SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST_AUTO, true)
  val offerRemoteMulticast = mkBoolPreference(SHARED_PREFS_OFFER_REMOTE_MULTICAST, true)

-  val desktopWindowState = mkStrPreference(SHARED_PREFS_DESKTOP_WINDOW_STATE, null)
-  
  private fun mkIntPreference(prefName: String, default: Int) =
    SharedPreference(
      get = fun() = settings.getInt(prefName, default),
@@ -319,7 +317,6 @@ class AppPreferences {
    private const val SHARED_PREFS_CONNECT_REMOTE_VIA_MULTICAST = "ConnectRemoteViaMulticast"
    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"
  }
 }

@@ -362,7 +359,7 @@ object ChatController {
      chatModel.users.addAll(users)
      if (justStarted) {
        chatModel.currentUser.value = user
-        chatModel.localUserCreated.value = true
+        chatModel.userCreated.value = true
        getUserChatData(null)
        appPrefs.chatLastStart.set(Clock.System.now())
        chatModel.chatRunning.value = true
@@ -382,31 +379,6 @@ object ChatController {
    }
  }

-  suspend fun startChatWithoutUser() {
-    Log.d(TAG, "user: null")
-    try {
-      if (chatModel.chatRunning.value == true) return
-      apiSetTempFolder(coreTmpDir.absolutePath)
-      apiSetFilesFolder(appFilesDir.absolutePath)
-      if (appPlatform.isDesktop) {
-        apiSetRemoteHostsFolder(remoteHostsDir.absolutePath)
-      }
-      apiSetXFTPConfig(getXFTPCfg())
-      apiSetEncryptLocalFiles(appPrefs.privacyEncryptLocalFiles.get())
-      chatModel.users.clear()
-      chatModel.currentUser.value = null
-      chatModel.localUserCreated.value = false
-      appPrefs.chatLastStart.set(Clock.System.now())
-      chatModel.chatRunning.value = true
-      startReceiver()
-      setLocalDeviceName(appPrefs.deviceNameForRemoteAccess.get()!!)
-      Log.d(TAG, "startChat: started without user")
-    } catch (e: Error) {
-      Log.e(TAG, "failed starting chat without user $e")
-      throw e
-    }
-  }
-
  suspend fun changeActiveUser(rhId: Long?, toUserId: Long, viewPwd: String?) {
    try {
      changeActiveUser_(rhId, toUserId, viewPwd)
@@ -430,9 +402,8 @@ object ChatController {
  }

  suspend fun getUserChatData(rhId: Long?) {
-    val hasUser = chatModel.currentUser.value != null
-    chatModel.userAddress.value = if (hasUser) apiGetUserAddress(rhId) else null
-    chatModel.chatItemTTL.value = if (hasUser) getChatItemTTL(rhId) else ChatItemTTL.None
+    chatModel.userAddress.value = apiGetUserAddress(rhId)
+    chatModel.chatItemTTL.value = getChatItemTTL(rhId)
    updatingChatsMutex.withLock {
      val chats = apiGetChats(rhId)
      chatModel.updateChats(chats)
@@ -501,9 +472,7 @@ object ChatController {
    val r = sendCmd(rh, CC.ShowActiveUser())
    if (r is CR.ActiveUser) return r.user.updateRemoteHostId(rh)
    Log.d(TAG, "apiGetActiveUser: ${r.responseType} ${r.details}")
-    if (rh == null) {
-      chatModel.localUserCreated.value = false
-    }
+    chatModel.userCreated.value = false
    return null
  }

@@ -922,21 +891,20 @@ object ChatController {
    return null
  }

-  suspend fun apiConnect(rh: Long?, incognito: Boolean, connReq: String): PendingContactConnection?  {
+  suspend fun apiConnect(rh: Long?, incognito: Boolean, connReq: String): Boolean  {
    val userId = chatModel.currentUser.value?.userId ?: run {
      Log.e(TAG, "apiConnect: no current user")
-      return null
+      return false
    }
    val r = sendCmd(rh, CC.APIConnect(userId, incognito, connReq))
    when {
-      r is CR.SentConfirmation -> return r.connection
-      r is CR.SentInvitation -> return r.connection
+      r is CR.SentConfirmation || r is CR.SentInvitation -> return true
      r is CR.ContactAlreadyExists -> {
        AlertManager.shared.showAlertMsg(
          generalGetString(MR.strings.contact_already_exists),
          String.format(generalGetString(MR.strings.you_are_already_connected_to_vName_via_this_link), r.contact.displayName)
        )
-        return null
+        return false
      }
      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorChat
          && r.chatError.errorType is ChatErrorType.InvalidConnReq -> {
@@ -944,7 +912,7 @@ object ChatController {
          generalGetString(MR.strings.invalid_connection_link),
          generalGetString(MR.strings.please_check_correct_link_and_maybe_ask_for_a_new_one)
        )
-        return null
+        return false
      }
      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
          && r.chatError.agentError is AgentErrorType.SMP
@@ -953,13 +921,13 @@ object ChatController {
          generalGetString(MR.strings.connection_error_auth),
          generalGetString(MR.strings.connection_error_auth_desc)
        )
-        return null
+        return false
      }
      else -> {
        if (!(networkErrorAlert(r))) {
          apiErrorAlert("apiConnect", generalGetString(MR.strings.connection_error), r)
        }
-        return null
+        return false
      }
    }
  }
@@ -1426,9 +1394,9 @@ object ChatController {
    chatModel.remoteHosts.addAll(hosts)
  }

-  suspend fun startRemoteHost(rhId: Long?, multicast: Boolean = true, address: RemoteCtrlAddress?, port: Int?): CR.RemoteHostStarted? {
-    val r = sendCmd(null, CC.StartRemoteHost(rhId, multicast, address, port))
-    if (r is CR.RemoteHostStarted) return r
+  suspend fun startRemoteHost(rhId: Long?, multicast: Boolean = true): Triple<RemoteHostInfo?, String, String>? {
+    val r = sendCmd(null, CC.StartRemoteHost(rhId, multicast))
+    if (r is CR.RemoteHostStarted) return Triple(r.remoteHost_, r.invitation, r.ctrlPort)
    apiErrorAlert("startRemoteHost", generalGetString(MR.strings.error_alert_title), r)
    return null
  }
@@ -1558,6 +1526,16 @@ object ChatController {
    fun active(user: UserLike): Boolean = activeUser(rhId, user)
    chatModel.addTerminalItem(TerminalItem.resp(rhId, r))
    when (r) {
+      is CR.NewContactConnection -> {
+        if (active(r.user)) {
+          chatModel.updateContactConnection(rhId, r.connection)
+        }
+      }
+      is CR.ContactConnectionDeleted -> {
+        if (active(r.user)) {
+          chatModel.removeChat(rhId, r.connection.id)
+        }
+      }
      is CR.ContactDeletedByContact -> {
        if (active(r.user) && r.contact.directOrUsed) {
          chatModel.updateContact(rhId, r.contact)
@@ -2018,7 +1996,7 @@ object ChatController {
    chatModel.setContactNetworkStatus(contact, NetworkStatus.Error(err))
  }

-  suspend fun switchUIRemoteHost(rhId: Long?) = showProgressIfNeeded {
+  suspend fun switchUIRemoteHost(rhId: Long?) {
    // TODO lock the switch so that two switches can't run concurrently?
    chatModel.chatId.value = null
    ModalManager.center.closeModals()
@@ -2031,10 +2009,7 @@ object ChatController {
    chatModel.users.clear()
    chatModel.users.addAll(users)
    chatModel.currentUser.value = user
-    if (user == null) {
-      chatModel.chatItems.clear()
-      chatModel.chats.clear()
-    }
+    chatModel.userCreated.value = true
    val statuses = apiGetNetworkStatuses(rhId)
    if (statuses != null) {
      chatModel.networkStatuses.clear()
@@ -2044,23 +2019,6 @@ object ChatController {
    getUserChatData(rhId)
  }

-  suspend fun showProgressIfNeeded(block: suspend () -> Unit) {
-    val job = withBGApi {
-      try {
-        delay(500)
-        chatModel.switchingUsersAndHosts.value = true
-      } catch (e: Throwable) {
-        chatModel.switchingUsersAndHosts.value = false
-      }
-    }
-    try {
-      block()
-    } finally {
-      job.cancel()
-      chatModel.switchingUsersAndHosts.value = false
-    }
-  }
-
  fun getXFTPCfg(): XFTPFileConfig {
    return XFTPFileConfig(minFileSize = 0)
  }
@@ -2248,7 +2206,7 @@ sealed class CC {
  // Remote control
  class SetLocalDeviceName(val displayName: String): CC()
  class ListRemoteHosts(): CC()
-  class StartRemoteHost(val remoteHostId: Long?, val multicast: Boolean, val address: RemoteCtrlAddress?, val port: Int?): CC()
+  class StartRemoteHost(val remoteHostId: Long?, val multicast: Boolean): CC()
  class SwitchRemoteHost (val remoteHostId: Long?): CC()
  class StopRemoteHost(val remoteHostKey: Long?): CC()
  class DeleteRemoteHost(val remoteHostId: Long): CC()
@@ -2384,7 +2342,7 @@ sealed class CC {
    is CancelFile -> "/fcancel $fileId"
    is SetLocalDeviceName -> "/set device name $displayName"
    is ListRemoteHosts -> "/list remote hosts"
-    is StartRemoteHost -> "/start remote host " + (if (remoteHostId == null) "new" else "$remoteHostId multicast=${onOff(multicast)}") + (if (address != null) " addr=${address.address} iface=${address.`interface`}" else "") + (if (port != null) " port=$port" else "")
+    is StartRemoteHost -> "/start remote host " + if (remoteHostId == null) "new" else "$remoteHostId multicast=${onOff(multicast)}"
    is SwitchRemoteHost -> "/switch remote host " + if (remoteHostId == null) "local" else "$remoteHostId"
    is StopRemoteHost -> "/stop remote host " + if (remoteHostKey == null) "new" else "$remoteHostKey"
    is DeleteRemoteHost -> "/delete remote host $remoteHostId"
@@ -3606,8 +3564,6 @@ data class RemoteHostInfo(
  val remoteHostId: Long,
  val hostDeviceName: String,
  val storePath: String,
-  val bindAddress_: RemoteCtrlAddress?,
-  val bindPort_: Int?,
  val sessionState: RemoteHostSessionState?
 ) {
  val activeHost: Boolean
@@ -3616,12 +3572,6 @@ data class RemoteHostInfo(
  fun activeHost(): Boolean = chatModel.currentRemoteHost.value?.remoteHostId == remoteHostId
 }

-@Serializable
-data class RemoteCtrlAddress(
-  val address: String,
-  val `interface`: String
-)
-
@Serializable
 sealed class RemoteHostSessionState {
  @Serializable @SerialName("starting") object Starting: RemoteHostSessionState()
@@ -3757,8 +3707,8 @@ sealed class CR {
  @Serializable @SerialName("invitation") class Invitation(val user: UserRef, val connReqInvitation: String, val connection: PendingContactConnection): CR()
  @Serializable @SerialName("connectionIncognitoUpdated") class ConnectionIncognitoUpdated(val user: UserRef, val toConnection: PendingContactConnection): CR()
  @Serializable @SerialName("connectionPlan") class CRConnectionPlan(val user: UserRef, val connectionPlan: ConnectionPlan): CR()
-  @Serializable @SerialName("sentConfirmation") class SentConfirmation(val user: UserRef, val connection: PendingContactConnection): CR()
-  @Serializable @SerialName("sentInvitation") class SentInvitation(val user: UserRef, val connection: PendingContactConnection): CR()
+  @Serializable @SerialName("sentConfirmation") class SentConfirmation(val user: UserRef): CR()
+  @Serializable @SerialName("sentInvitation") class SentInvitation(val user: UserRef): CR()
  @Serializable @SerialName("sentInvitationToContact") class SentInvitationToContact(val user: UserRef, val contact: Contact, val customUserProfile: Profile?): CR()
  @Serializable @SerialName("contactAlreadyExists") class ContactAlreadyExists(val user: UserRef, val contact: Contact): CR()
  @Serializable @SerialName("contactRequestAlreadyAccepted") class ContactRequestAlreadyAccepted(val user: UserRef, val contact: Contact): CR()
@@ -3852,11 +3802,12 @@ sealed class CR {
  @Serializable @SerialName("callAnswer") class CallAnswer(val user: UserRef, val contact: Contact, val answer: WebRTCSession): CR()
  @Serializable @SerialName("callExtraInfo") class CallExtraInfo(val user: UserRef, val contact: Contact, val extraInfo: WebRTCExtraInfo): CR()
  @Serializable @SerialName("callEnded") class CallEnded(val user: UserRef, val contact: Contact): CR()
+  @Serializable @SerialName("newContactConnection") class NewContactConnection(val user: UserRef, val connection: PendingContactConnection): CR()
  @Serializable @SerialName("contactConnectionDeleted") class ContactConnectionDeleted(val user: UserRef, val connection: PendingContactConnection): CR()
  // remote events (desktop)
  @Serializable @SerialName("remoteHostList") class RemoteHostList(val remoteHosts: List<RemoteHostInfo>): CR()
  @Serializable @SerialName("currentRemoteHost") class CurrentRemoteHost(val remoteHost_: RemoteHostInfo?): CR()
-  @Serializable @SerialName("remoteHostStarted") class RemoteHostStarted(val remoteHost_: RemoteHostInfo?, val invitation: String, val localAddrs: List<RemoteCtrlAddress>, val ctrlPort: String): CR()
+  @Serializable @SerialName("remoteHostStarted") class RemoteHostStarted(val remoteHost_: RemoteHostInfo?, val invitation: String, val ctrlPort: String): CR()
  @Serializable @SerialName("remoteHostSessionCode") class RemoteHostSessionCode(val remoteHost_: RemoteHostInfo?, val sessionCode: String): CR()
  @Serializable @SerialName("newRemoteHost") class NewRemoteHost(val remoteHost: RemoteHostInfo): CR()
  @Serializable @SerialName("remoteHostConnected") class RemoteHostConnected(val remoteHost: RemoteHostInfo): CR()
@@ -4000,6 +3951,7 @@ sealed class CR {
    is CallAnswer -> "callAnswer"
    is CallExtraInfo -> "callExtraInfo"
    is CallEnded -> "callEnded"
+    is NewContactConnection -> "newContactConnection"
    is ContactConnectionDeleted -> "contactConnectionDeleted"
    is RemoteHostList -> "remoteHostList"
    is CurrentRemoteHost -> "currentRemoteHost"
@@ -4054,11 +4006,11 @@ sealed class CR {
    is ContactCode -> withUser(user, "contact: ${json.encodeToString(contact)}\nconnectionCode: $connectionCode")
    is GroupMemberCode -> withUser(user, "groupInfo: ${json.encodeToString(groupInfo)}\nmember: ${json.encodeToString(member)}\nconnectionCode: $connectionCode")
    is ConnectionVerified -> withUser(user, "verified: $verified\nconnectionCode: $expectedCode")
-    is Invitation -> withUser(user, "connReqInvitation: $connReqInvitation\nconnection: $connection")
+    is Invitation -> withUser(user, connReqInvitation)
    is ConnectionIncognitoUpdated -> withUser(user, json.encodeToString(toConnection))
    is CRConnectionPlan -> withUser(user, json.encodeToString(connectionPlan))
-    is SentConfirmation -> withUser(user, json.encodeToString(connection))
-    is SentInvitation -> withUser(user, json.encodeToString(connection))
+    is SentConfirmation -> withUser(user, noDetails())
+    is SentInvitation -> withUser(user, noDetails())
    is SentInvitationToContact -> withUser(user, json.encodeToString(contact))
    is ContactAlreadyExists -> withUser(user, json.encodeToString(contact))
    is ContactRequestAlreadyAccepted -> withUser(user, json.encodeToString(contact))
@@ -4146,6 +4098,7 @@ sealed class CR {
    is CallAnswer -> withUser(user, "contact: ${contact.id}\nanswer: ${json.encodeToString(answer)}")
    is CallExtraInfo -> withUser(user, "contact: ${contact.id}\nextraInfo: ${json.encodeToString(extraInfo)}")
    is CallEnded -> withUser(user, "contact: ${contact.id}")
+    is NewContactConnection -> withUser(user, json.encodeToString(connection))
    is ContactConnectionDeleted -> withUser(user, json.encodeToString(connection))
    // remote events (mobile)
    is RemoteHostList -> json.encodeToString(remoteHosts)
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt
@@ -55,22 +55,10 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
    if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)
    val user = chatController.apiGetActiveUser(null)
    if (user == null) {
+      chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
      chatModel.controller.appPrefs.privacyDeliveryReceiptsSet.set(true)
      chatModel.currentUser.value = null
      chatModel.users.clear()
-      if (appPlatform.isDesktop) {
-        /**
-         * Setting it here to null because otherwise the screen will flash in [MainScreen] after the first start
-         * because of default value of [OnboardingStage.OnboardingComplete]
-         * */
-        chatModel.localUserCreated.value = null
-        if (chatController.listRemoteHosts()?.isEmpty() == true) {
-          chatController.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-        }
-        chatController.startChatWithoutUser()
-      } else {
-        chatController.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-      }
    } else {
      val savedOnboardingStage = appPreferences.onboardingStage.get()
      appPreferences.onboardingStage.set(if (listOf(OnboardingStage.Step1_SimpleXInfo, OnboardingStage.Step2_CreateProfile).contains(savedOnboardingStage) && chatModel.users.size == 1) {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/NtfManager.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/NtfManager.kt
@@ -59,9 +59,7 @@ abstract class NtfManager {
      awaitChatStartedIfNeeded(chatModel)
      if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
        // TODO include remote host ID in desktop notifications?
-        chatModel.controller.showProgressIfNeeded {
-          chatModel.controller.changeActiveUser(null, userId, null)
-        }
+        chatModel.controller.changeActiveUser(null, userId, null)
      }
      val cInfo = chatModel.getChat(chatId)?.chatInfo
      chatModel.clearOverlays.value = true
@@ -74,9 +72,7 @@ abstract class NtfManager {
      awaitChatStartedIfNeeded(chatModel)
      if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
        // TODO include remote host ID in desktop notifications?
-        chatModel.controller.showProgressIfNeeded {
-          chatModel.controller.changeActiveUser(null, userId, null)
-        }
+        chatModel.controller.changeActiveUser(null, userId, null)
      }
      chatModel.chatId.value = null
      chatModel.clearOverlays.value = true
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/UI.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/UI.kt
@@ -16,11 +16,3 @@ expect fun getKeyboardState(): State<KeyboardState>
 expect fun hideKeyboard(view: Any?)

 expect fun androidIsFinishingMainActivity(): Boolean
-
-fun registerGlobalErrorHandler() {
-  Thread.setDefaultUncaughtExceptionHandler(GlobalExceptionsHandler())
-}
-
-expect class GlobalExceptionsHandler(): Thread.UncaughtExceptionHandler {
-  override fun uncaughtException(thread: Thread, e: Throwable)
-}
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt
@@ -21,8 +21,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.*
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.controller
+import chat.simplex.common.model.ChatModel
+import chat.simplex.common.model.Profile
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -76,13 +76,7 @@ fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
          disabled = !canCreateProfile(displayName.value),
          textColor = MaterialTheme.colors.primary,
          iconColor = MaterialTheme.colors.primary,
-          click = {
-            if (chatModel.localUserCreated.value == true) {
-              createProfileInProfiles(chatModel, displayName.value, close)
-            } else {
-              createProfileInNoProfileSetup(displayName.value, close)
-            }
-          },
+          click = { createProfileInProfiles(chatModel, displayName.value, close) },
        )
        SectionTextFooter(generalGetString(MR.strings.your_profile_is_stored_on_your_device))
        SectionTextFooter(generalGetString(MR.strings.profile_is_only_shared_with_your_contacts))
@@ -174,17 +168,6 @@ fun CreateFirstProfile(chatModel: ChatModel, close: () -> Unit) {
  }
 }

-fun createProfileInNoProfileSetup(displayName: String, close: () -> Unit) {
-  withApi {
-    val user = controller.apiCreateActiveUser(null, Profile(displayName.trim(), "", null)) ?: return@withApi
-    controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
-    chatModel.chatRunning.value = false
-    controller.startChat(user)
-    controller.switchUIRemoteHost(null)
-    close()
-  }
-}
-
 fun createProfileInProfiles(chatModel: ChatModel, displayName: String, close: () -> Unit) {
  withApi {
    val rhId = chatModel.remoteHostId()
@@ -207,12 +190,12 @@ fun createProfileInProfiles(chatModel: ChatModel, displayName: String, close: ()

 fun createProfileOnboarding(chatModel: ChatModel, displayName: String, close: () -> Unit) {
  withApi {
-    chatModel.currentUser.value = chatModel.controller.apiCreateActiveUser(
+    chatModel.controller.apiCreateActiveUser(
      null, Profile(displayName.trim(), "", null)
    ) ?: return@withApi
    val onboardingStage = chatModel.controller.appPrefs.onboardingStage
    if (chatModel.users.isEmpty()) {
-      onboardingStage.set(if (appPlatform.isDesktop && chatModel.controller.appPrefs.initialRandomDBPassphrase.get() && !chatModel.desktopOnboardingRandomPassword.value) {
+      onboardingStage.set(if (appPlatform.isDesktop && chatModel.controller.appPrefs.initialRandomDBPassphrase.get()) {
        OnboardingStage.Step2_5_SetupDatabasePassphrase
      } else {
        OnboardingStage.Step3_CreateSimpleXAddress
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -1005,6 +1005,14 @@ fun BoxWithConstraintsScope.ChatItemsList(
      }
    }
  }
+  if (appPlatform.isDesktop) {
+    VerticalScrollbar(
+      modifier = Modifier.align(Alignment.CenterEnd)
+        .fillMaxHeight(),
+      adapter = rememberScrollbarAdapter(listState),
+      reverseLayout = true
+    )
+  }
  FloatingButtons(chatItems, unreadCount, chat.chatStats.minUnreadItemId, searchValue, markRead, setFloatingButton, listState)
 }

--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.kt
@@ -164,12 +164,6 @@ fun CIImageView(
          }
        }
      }
-    } else {
-      KeyChangeEffect(file) {
-        if (res.value == null) {
-          res.value = imageAndFilePath(file)
-        }
-      }
    }
    val loaded = res.value
    if (loaded != null) {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
@@ -68,14 +68,14 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
  val endPadding = if (appPlatform.isDesktop) 56.dp else 0.dp
  var searchInList by rememberSaveable { mutableStateOf("") }
  val scope = rememberCoroutineScope()
-  val (userPickerState, scaffoldState ) = settingsState
+  val (userPickerState, scaffoldState, switchingUsersAndHosts ) = settingsState
  Scaffold(topBar = { Box(Modifier.padding(end = endPadding)) { ChatListToolbar(chatModel, scaffoldState.drawerState, userPickerState, stopped) { searchInList = it.trim() } } },
    scaffoldState = scaffoldState,
    drawerContent = { SettingsView(chatModel, setPerformLA, scaffoldState.drawerState) },
    drawerScrimColor = MaterialTheme.colors.onSurface.copy(alpha = if (isInDarkTheme()) 0.16f else 0.32f),
    drawerGesturesEnabled = appPlatform.isAndroid,
    floatingActionButton = {
-      if (searchInList.isEmpty() && !chatModel.desktopNoUserNoRemote) {
+      if (searchInList.isEmpty()) {
        FloatingActionButton(
          onClick = {
            if (!stopped) {
@@ -104,7 +104,7 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
      ) {
        if (chatModel.chats.isNotEmpty()) {
          ChatList(chatModel, search = searchInList)
-        } else if (!chatModel.switchingUsersAndHosts.value && !chatModel.desktopNoUserNoRemote) {
+        } else if (!switchingUsersAndHosts.value) {
          Box(Modifier.fillMaxSize()) {
            if (!stopped && !newChatSheetState.collectAsState().value.isVisible()) {
              OnboardingButtons(showNewChatSheet)
@@ -121,11 +121,19 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
    NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
  }
  if (appPlatform.isAndroid) {
-    UserPicker(chatModel, userPickerState) {
+    UserPicker(chatModel, userPickerState, switchingUsersAndHosts) {
      scope.launch { if (scaffoldState.drawerState.isOpen) scaffoldState.drawerState.close() else scaffoldState.drawerState.open() }
      userPickerState.value = AnimatedViewState.GONE
    }
  }
+  if (switchingUsersAndHosts.value) {
+    Box(
+      Modifier.fillMaxSize().clickable(enabled = false, onClick = {}),
+      contentAlignment = Alignment.Center
+    ) {
+      ProgressIndicator()
+    }
+  }
 }

@Composable
@@ -201,7 +209,7 @@ private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, user
    navigationButton = {
      if (showSearch) {
        NavigationButtonBack(hideSearchOnBack)
-      } else if (chatModel.users.isEmpty() && !chatModel.desktopNoUserNoRemote) {
+      } else if (chatModel.users.isEmpty()) {
        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 } } }
@@ -296,6 +304,17 @@ private fun ToggleFilterButton() {
  }
 }

+@Composable
+private fun ProgressIndicator() {
+  CircularProgressIndicator(
+    Modifier
+      .padding(horizontal = 2.dp)
+      .size(30.dp),
+    color = MaterialTheme.colors.secondary,
+    strokeWidth = 2.5.dp
+  )
+}
+
@Composable
 expect fun DesktopActiveCallOverlayLayout(newChatSheetState: MutableStateFlow<AnimatedViewState>)

--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ShareListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ShareListView.kt
@@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
@Composable
 fun ShareListView(chatModel: ChatModel, settingsState: SettingsViewState, stopped: Boolean) {
  var searchInList by rememberSaveable { mutableStateOf("") }
-  val (userPickerState, scaffoldState) = settingsState
+  val (userPickerState, scaffoldState, switchingUsersAndHosts) = settingsState
  val endPadding = if (appPlatform.isDesktop) 56.dp else 0.dp
  Scaffold(
    Modifier.padding(end = endPadding),
@@ -47,7 +47,7 @@ fun ShareListView(chatModel: ChatModel, settingsState: SettingsViewState, stoppe
    }
  }
  if (appPlatform.isAndroid) {
-    UserPicker(chatModel, userPickerState, showSettings = false, showCancel = true, cancelClicked = {
+    UserPicker(chatModel, userPickerState, switchingUsersAndHosts, showSettings = false, showCancel = true, cancelClicked = {
      chatModel.sharedContent.value = null
      userPickerState.value = AnimatedViewState.GONE
    })
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
@@ -26,9 +26,7 @@ import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.platform.*
-import chat.simplex.common.views.CreateProfile
 import chat.simplex.common.views.remote.*
-import chat.simplex.common.views.usersettings.doWithAuth
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.delay
@@ -40,6 +38,7 @@ import kotlin.math.roundToInt
 fun UserPicker(
  chatModel: ChatModel,
  userPickerState: MutableStateFlow<AnimatedViewState>,
+  switchingUsersAndHosts: MutableState<Boolean>,
  showSettings: Boolean = true,
  showCancel: Boolean = false,
  cancelClicked: () -> Unit = {},
@@ -124,10 +123,14 @@ fun UserPicker(
        userPickerState.value = AnimatedViewState.HIDING
        if (!u.user.activeUser) {
          scope.launch {
-            controller.showProgressIfNeeded {
-              ModalManager.closeAllModalsEverywhere()
-              chatModel.controller.changeActiveUser(u.user.remoteHostId, u.user.userId, null)
+            val job = launch {
+              delay(500)
+              switchingUsersAndHosts.value = true
            }
+            ModalManager.closeAllModalsEverywhere()
+            chatModel.controller.changeActiveUser(u.user.remoteHostId, u.user.userId, null)
+            job.cancel()
+            switchingUsersAndHosts.value = false
          }
        }
      }
@@ -159,13 +162,13 @@ fun UserPicker(
      val currentRemoteHost = remember { chatModel.currentRemoteHost }.value
      Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) {
        if (remoteHosts.isNotEmpty()) {
-          if (currentRemoteHost == null && chatModel.localUserCreated.value == true) {
+          if (currentRemoteHost == null) {
            LocalDevicePickerItem(true) {
              userPickerState.value = AnimatedViewState.HIDING
              switchToLocalDevice()
            }
            Divider(Modifier.requiredHeight(1.dp))
-          } else if (currentRemoteHost != null) {
+          } else {
            val connecting = rememberSaveable { mutableStateOf(false) }
            RemoteHostPickerItem(currentRemoteHost,
              actionButtonClick = {
@@ -173,7 +176,7 @@ fun UserPicker(
                stopRemoteHostAndReloadHosts(currentRemoteHost, true)
              }) {
                userPickerState.value = AnimatedViewState.HIDING
-                switchToRemoteHost(currentRemoteHost, connecting)
+                switchToRemoteHost(currentRemoteHost, switchingUsersAndHosts, connecting)
              }
            Divider(Modifier.requiredHeight(1.dp))
          }
@@ -181,7 +184,7 @@ fun UserPicker(

        UsersView()

-        if (remoteHosts.isNotEmpty() && currentRemoteHost != null && chatModel.localUserCreated.value == true) {
+        if (remoteHosts.isNotEmpty() && currentRemoteHost != null) {
          LocalDevicePickerItem(false) {
            userPickerState.value = AnimatedViewState.HIDING
            switchToLocalDevice()
@@ -196,7 +199,7 @@ fun UserPicker(
              stopRemoteHostAndReloadHosts(h, false)
            }) {
              userPickerState.value = AnimatedViewState.HIDING
-              switchToRemoteHost(h, connecting)
+              switchToRemoteHost(h, switchingUsersAndHosts, connecting)
          }
          Divider(Modifier.requiredHeight(1.dp))
        }
@@ -217,18 +220,6 @@ fun UserPicker(
          userPickerState.value = AnimatedViewState.GONE
        }
        Divider(Modifier.requiredHeight(1.dp))
-      } else if (chatModel.desktopNoUserNoRemote) {
-        CreateInitialProfile {
-          doWithAuth(generalGetString(MR.strings.auth_open_chat_profiles), generalGetString(MR.strings.auth_log_in_using_credential)) {
-            ModalManager.center.showModalCloseable { close ->
-              LaunchedEffect(Unit) {
-                userPickerState.value = AnimatedViewState.HIDING
-              }
-              CreateProfile(chat.simplex.common.platform.chatModel, close)
-            }
-          }
-        }
-        Divider(Modifier.requiredHeight(1.dp))
      }
      if (showSettings) {
        SettingsPickerItem(settingsClicked)
@@ -410,16 +401,6 @@ private fun LinkAMobilePickerItem(onClick: () -> Unit) {
  }
 }

-@Composable
-private fun CreateInitialProfile(onClick: () -> Unit) {
-  SectionItemView(onClick, padding = PaddingValues(start = DEFAULT_PADDING + 7.dp, end = DEFAULT_PADDING), minHeight = 68.dp) {
-    val text = generalGetString(MR.strings.create_chat_profile)
-    Icon(painterResource(MR.images.ic_manage_accounts), text, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
-    Spacer(Modifier.width(DEFAULT_PADDING + 6.dp))
-    Text(text, color = if (isInDarkTheme()) MenuTextColorDark else Color.Black)
-  }
-}
-
@Composable
 private fun SettingsPickerItem(onClick: () -> Unit) {
  SectionItemView(onClick, padding = PaddingValues(start = DEFAULT_PADDING + 7.dp, end = DEFAULT_PADDING), minHeight = 68.dp) {
@@ -460,15 +441,21 @@ private fun switchToLocalDevice() {
  }
 }

-private fun switchToRemoteHost(h: RemoteHostInfo, connecting: MutableState<Boolean>) {
+private fun switchToRemoteHost(h: RemoteHostInfo, switchingUsersAndHosts: MutableState<Boolean>, connecting: MutableState<Boolean>) {
  if (!h.activeHost()) {
    withBGApi {
+      val job = launch {
+        delay(500)
+        switchingUsersAndHosts.value = true
+      }
      ModalManager.closeAllModalsEverywhere()
      if (h.sessionState != null) {
        chatModel.controller.switchUIRemoteHost(h.remoteHostId)
      } else {
        connectMobileDevice(h, connecting)
      }
+      job.cancel()
+      switchingUsersAndHosts.value = false
    }
  } else {
    connectMobileDevice(h, connecting)
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseErrorView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseErrorView.kt
@@ -264,8 +264,7 @@ private fun DatabaseKeyField(text: MutableState<String>, enabled: Boolean, onCli
    text,
    generalGetString(MR.strings.enter_passphrase),
    isValid = ::validKey,
-    // Don't enable this on desktop since it interfere with key event listener
-    keyboardActions = KeyboardActions(onDone = if (enabled && appPlatform.isAndroid) {
+    keyboardActions = KeyboardActions(onDone = if (enabled) {
      { onClick?.invoke() }
    } else null
    ),
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt
@@ -4,7 +4,6 @@ import SectionBottomSpacer
 import SectionDividerSpaced
 import SectionTextFooter
 import SectionItemView
-import SectionSpacer
 import SectionView
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.layout.*
@@ -21,7 +20,6 @@ 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.ChatModel.controller
 import chat.simplex.common.model.ChatModel.updatingChatsMutex
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -61,9 +59,7 @@ fun DatabaseView(
  val appFilesCountAndSize = remember { mutableStateOf(directoryFileCountAndSize(appFilesDir.absolutePath)) }
  val importArchiveLauncher = rememberFileChooserLauncher(true) { to: URI? ->
    if (to != null) {
-      importArchiveAlert(m, to, appFilesCountAndSize, progressIndicator) {
-        startChat(m, chatLastStart, m.chatDbChanged)
-      }
+      importArchiveAlert(m, to, appFilesCountAndSize, progressIndicator)
    }
  }
  val chatItemTTL = remember { mutableStateOf(m.chatItemTTL.value) }
@@ -81,6 +77,7 @@ fun DatabaseView(
      m.chatDbEncrypted.value,
      m.controller.appPrefs.storeDBPassphrase.state.value,
      m.controller.appPrefs.initialRandomDBPassphrase,
+      m.controller.appPrefs.developerTools.state.value,
      importArchiveLauncher,
      chatArchiveName,
      chatArchiveTime,
@@ -103,13 +100,7 @@ fun DatabaseView(
          setCiTTL(m, rhId, chatItemTTL, progressIndicator, appFilesCountAndSize)
        }
      },
-      showSettingsModal,
-      disconnectAllHosts = {
-        val connected = chatModel.remoteHosts.filter { it.sessionState is RemoteHostSessionState.Connected }
-        connected.forEachIndexed { index, h ->
-          controller.stopRemoteHostAndReloadHosts(h, index == connected.lastIndex && chatModel.connectedToRemote())
-        }
-      }
+      showSettingsModal
    )
    if (progressIndicator.value) {
      Box(
@@ -138,6 +129,7 @@ fun DatabaseLayout(
  chatDbEncrypted: Boolean?,
  passphraseSaved: Boolean,
  initialRandomDBPassphrase: SharedPreference<Boolean>,
+  developerTools: Boolean,
  importArchiveLauncher: FileChooserLauncher,
  chatArchiveName: MutableState<String?>,
  chatArchiveTime: MutableState<Instant?>,
@@ -152,43 +144,36 @@ fun DatabaseLayout(
  deleteChatAlert: () -> Unit,
  deleteAppFilesAndMedia: () -> Unit,
  onChatItemTTLSelected: (ChatItemTTL) -> Unit,
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  disconnectAllHosts: () -> Unit,
+  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)
 ) {
  val stopped = !runChat
-  val operationsDisabled = (!stopped || progressIndicator) && !chatModel.desktopNoUserNoRemote
+  val operationsDisabled = !stopped || progressIndicator

  Column(
    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
  ) {
    AppBarTitle(stringResource(MR.strings.your_chat_database))

-    if (!chatModel.desktopNoUserNoRemote) {
-      SectionView(stringResource(MR.strings.messages_section_title).uppercase()) {
-        TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!stopped && !progressIndicator), onChatItemTTLSelected)
-      }
-      SectionTextFooter(
-        remember(currentUser?.displayName) {
-          buildAnnotatedString {
-            append(generalGetString(MR.strings.messages_section_description) + " ")
-            withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
-              append(currentUser?.displayName ?: "")
-            }
-            append(".")
-          }
-        }
-      )
-      SectionDividerSpaced(maxTopPadding = true)
+    SectionView(stringResource(MR.strings.messages_section_title).uppercase()) {
+      TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!stopped && !progressIndicator), onChatItemTTLSelected)
    }
-    val toggleEnabled = remember { chatModel.remoteHosts }.none { it.sessionState is RemoteHostSessionState.Connected }
-    if (chatModel.localUserCreated.value == true) {
-      SectionView(stringResource(MR.strings.run_chat_section)) {
-        if (!toggleEnabled) {
-          SectionItemView(disconnectAllHosts) {
-            Text(generalGetString(MR.strings.disconnect_remote_hosts), Modifier.fillMaxWidth(), color = WarningOrange)
+    SectionTextFooter(
+      remember(currentUser?.displayName) {
+        buildAnnotatedString {
+          append(generalGetString(MR.strings.messages_section_description) + " ")
+          withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
+            append(currentUser?.displayName ?: "")
          }
+          append(".")
        }
-        RunChatSetting(runChat, stopped, toggleEnabled, startChat, stopChatAlert)
+      }
+    )
+
+    if (currentRemoteHost == null) {
+      SectionDividerSpaced(maxTopPadding = true)
+
+      SectionView(stringResource(MR.strings.run_chat_section)) {
+        RunChatSetting(runChat, stopped, startChat, stopChatAlert)
      }
      SectionTextFooter(
        if (stopped) {
@@ -198,96 +183,92 @@ fun DatabaseLayout(
        }
      )
      SectionDividerSpaced()
-    }

-    SectionView(stringResource(MR.strings.chat_database_section)) {
-      if (chatModel.localUserCreated.value != true && !toggleEnabled) {
-        SectionItemView(disconnectAllHosts) {
-          Text(generalGetString(MR.strings.disconnect_remote_hosts), Modifier.fillMaxWidth(), color = WarningOrange)
+      SectionView(stringResource(MR.strings.chat_database_section)) {
+        val unencrypted = chatDbEncrypted == false
+        SettingsActionItem(
+          if (unencrypted) painterResource(MR.images.ic_lock_open_right) else if (useKeyChain) painterResource(MR.images.ic_vpn_key_filled)
+          else painterResource(MR.images.ic_lock),
+          stringResource(MR.strings.database_passphrase),
+          click = showSettingsModal() { DatabaseEncryptionView(it) },
+          iconColor = if (unencrypted || (appPlatform.isDesktop && passphraseSaved)) WarningOrange else MaterialTheme.colors.secondary,
+          disabled = operationsDisabled
+        )
+        if (appPlatform.isDesktop && developerTools) {
+          SettingsActionItem(
+            painterResource(MR.images.ic_folder_open),
+            stringResource(MR.strings.open_database_folder),
+            ::desktopOpenDatabaseDir,
+            disabled = operationsDisabled
+          )
+        }
+        SettingsActionItem(
+          painterResource(MR.images.ic_ios_share),
+          stringResource(MR.strings.export_database),
+          click = {
+            if (initialRandomDBPassphrase.get()) {
+              exportProhibitedAlert()
+            } else {
+              exportArchive()
+            }
+          },
+          textColor = MaterialTheme.colors.primary,
+          iconColor = MaterialTheme.colors.primary,
+          disabled = operationsDisabled
+        )
+        SettingsActionItem(
+          painterResource(MR.images.ic_download),
+          stringResource(MR.strings.import_database),
+          { withApi { importArchiveLauncher.launch("application/zip") } },
+          textColor = Color.Red,
+          iconColor = Color.Red,
+          disabled = operationsDisabled
+        )
+        val chatArchiveNameVal = chatArchiveName.value
+        val chatArchiveTimeVal = chatArchiveTime.value
+        val chatLastStartVal = chatLastStart.value
+        if (chatArchiveNameVal != null && chatArchiveTimeVal != null && chatLastStartVal != null) {
+          val title = chatArchiveTitle(chatArchiveTimeVal, chatLastStartVal)
+          SettingsActionItem(
+            painterResource(MR.images.ic_inventory_2),
+            title,
+            click = showSettingsModal { ChatArchiveView(it, title, chatArchiveNameVal, chatArchiveTimeVal) },
+            disabled = operationsDisabled
+          )
+        }
+        SettingsActionItem(
+          painterResource(MR.images.ic_delete_forever),
+          stringResource(MR.strings.delete_database),
+          deleteChatAlert,
+          textColor = Color.Red,
+          iconColor = Color.Red,
+          disabled = operationsDisabled
+        )
+      }
+      SectionDividerSpaced(maxTopPadding = true)
+
+      SectionView(stringResource(MR.strings.files_and_media_section).uppercase()) {
+        val deleteFilesDisabled = operationsDisabled || appFilesCountAndSize.value.first == 0
+        SectionItemView(
+          deleteAppFilesAndMedia,
+          disabled = deleteFilesDisabled
+        ) {
+          Text(
+            stringResource(if (users.size > 1) MR.strings.delete_files_and_media_for_all_users else MR.strings.delete_files_and_media_all),
+            color = if (deleteFilesDisabled) MaterialTheme.colors.secondary else Color.Red
+          )
        }
      }
-      val unencrypted = chatDbEncrypted == false
-      SettingsActionItem(
-        if (unencrypted) painterResource(MR.images.ic_lock_open_right) else if (useKeyChain) painterResource(MR.images.ic_vpn_key_filled)
-        else painterResource(MR.images.ic_lock),
-        stringResource(MR.strings.database_passphrase),
-        click = showSettingsModal() { DatabaseEncryptionView(it) },
-        iconColor = if (unencrypted || (appPlatform.isDesktop && passphraseSaved)) WarningOrange else MaterialTheme.colors.secondary,
-        disabled = operationsDisabled
-      )
-      if (appPlatform.isDesktop) {
-        SettingsActionItem(
-          painterResource(MR.images.ic_folder_open),
-          stringResource(MR.strings.open_database_folder),
-          ::desktopOpenDatabaseDir,
-          disabled = operationsDisabled
-        )
-      }
-      SettingsActionItem(
-        painterResource(MR.images.ic_ios_share),
-        stringResource(MR.strings.export_database),
-        click = {
-          if (initialRandomDBPassphrase.get()) {
-            exportProhibitedAlert()
-          } else {
-            exportArchive()
-          }
-        },
-        textColor = MaterialTheme.colors.primary,
-        iconColor = MaterialTheme.colors.primary,
-        disabled = operationsDisabled
-      )
-      SettingsActionItem(
-        painterResource(MR.images.ic_download),
-        stringResource(MR.strings.import_database),
-        { withApi { importArchiveLauncher.launch("application/zip") } },
-        textColor = Color.Red,
-        iconColor = Color.Red,
-        disabled = operationsDisabled
-      )
-      val chatArchiveNameVal = chatArchiveName.value
-      val chatArchiveTimeVal = chatArchiveTime.value
-      val chatLastStartVal = chatLastStart.value
-      if (chatArchiveNameVal != null && chatArchiveTimeVal != null && chatLastStartVal != null) {
-        val title = chatArchiveTitle(chatArchiveTimeVal, chatLastStartVal)
-        SettingsActionItem(
-          painterResource(MR.images.ic_inventory_2),
-          title,
-          click = showSettingsModal { ChatArchiveView(it, title, chatArchiveNameVal, chatArchiveTimeVal) },
-          disabled = operationsDisabled
-        )
-      }
-      SettingsActionItem(
-        painterResource(MR.images.ic_delete_forever),
-        stringResource(MR.strings.delete_database),
-        deleteChatAlert,
-        textColor = Color.Red,
-        iconColor = Color.Red,
-        disabled = operationsDisabled
+      val (count, size) = appFilesCountAndSize.value
+      SectionTextFooter(
+        if (count == 0) {
+          stringResource(MR.strings.no_received_app_files)
+        } else {
+          String.format(stringResource(MR.strings.total_files_count_and_size), count, formatBytes(size))
+        }
      )
    }
-    SectionDividerSpaced(maxTopPadding = true)

-    SectionView(stringResource(MR.strings.files_and_media_section).uppercase()) {
-      val deleteFilesDisabled = operationsDisabled || appFilesCountAndSize.value.first == 0
-      SectionItemView(
-        deleteAppFilesAndMedia,
-        disabled = deleteFilesDisabled
-      ) {
-        Text(
-          stringResource(if (users.size > 1) MR.strings.delete_files_and_media_for_all_users else MR.strings.delete_files_and_media_all),
-          color = if (deleteFilesDisabled) MaterialTheme.colors.secondary else Color.Red
-        )
-      }
-    }
-    val (count, size) = appFilesCountAndSize.value
-    SectionTextFooter(
-      if (count == 0) {
-        stringResource(MR.strings.no_received_app_files)
-      } else {
-        String.format(stringResource(MR.strings.total_files_count_and_size), count, formatBytes(size))
-      }
-    )
    SectionBottomSpacer()
  }
 }
@@ -338,7 +319,6 @@ private fun TtlOptions(current: State<ChatItemTTL>, enabled: State<Boolean>, onS
 fun RunChatSetting(
  runChat: Boolean,
  stopped: Boolean,
-  enabled: Boolean,
  startChat: () -> Unit,
  stopChatAlert: () -> Unit
 ) {
@@ -357,7 +337,6 @@ fun RunChatSetting(
          stopChatAlert()
        }
      },
-      enabled = enabled,
    )
  }
 }
@@ -522,14 +501,13 @@ private fun importArchiveAlert(
  m: ChatModel,
  importedArchiveURI: URI,
  appFilesCountAndSize: MutableState<Pair<Int, Long>>,
-  progressIndicator: MutableState<Boolean>,
-  startChat: () -> Unit,
+  progressIndicator: MutableState<Boolean>
 ) {
  AlertManager.shared.showAlertDialog(
    title = generalGetString(MR.strings.import_database_question),
    text = generalGetString(MR.strings.your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one),
    confirmText = generalGetString(MR.strings.import_database_confirmation),
-    onConfirm = { importArchive(m, importedArchiveURI, appFilesCountAndSize, progressIndicator, startChat) },
+    onConfirm = { importArchive(m, importedArchiveURI, appFilesCountAndSize, progressIndicator) },
    destructive = true,
  )
 }
@@ -538,8 +516,7 @@ private fun importArchive(
  m: ChatModel,
  importedArchiveURI: URI,
  appFilesCountAndSize: MutableState<Pair<Int, Long>>,
-  progressIndicator: MutableState<Boolean>,
-  startChat: () -> Unit,
+  progressIndicator: MutableState<Boolean>
 ) {
  progressIndicator.value = true
  val archivePath = saveArchiveFromURI(importedArchiveURI)
@@ -556,10 +533,6 @@ private fun importArchive(
            operationEnded(m, progressIndicator) {
              AlertManager.shared.showAlertMsg(generalGetString(MR.strings.chat_database_imported), text = generalGetString(MR.strings.restart_the_app_to_use_imported_chat_database))
            }
-            if (chatModel.localUserCreated.value == false) {
-              chatModel.chatRunning.value = false
-              startChat()
-            }
          } else {
            operationEnded(m, progressIndicator) {
              AlertManager.shared.showAlertMsg(generalGetString(MR.strings.chat_database_imported), text = generalGetString(MR.strings.restart_the_app_to_use_imported_chat_database) + "\n" + generalGetString(MR.strings.non_fatal_errors_occured_during_import))
@@ -708,6 +681,7 @@ fun PreviewDatabaseLayout() {
      chatDbEncrypted = false,
      passphraseSaved = false,
      initialRandomDBPassphrase = SharedPreference({ true }, {}),
+      developerTools = true,
      importArchiveLauncher = rememberFileChooserLauncher(true) {},
      chatArchiveName = remember { mutableStateOf("dummy_archive") },
      chatArchiveTime = remember { mutableStateOf(Clock.System.now()) },
@@ -723,7 +697,6 @@ fun PreviewDatabaseLayout() {
      deleteAppFilesAndMedia = {},
      showSettingsModal = { {} },
      onChatItemTTLSelected = {},
-      disconnectAllHosts = {},
    )
  }
 }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AlertManager.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AlertManager.kt
@@ -1,11 +1,8 @@
 package chat.simplex.common.views.helpers

 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -236,71 +233,53 @@ private fun alertTitle(title: String): (@Composable () -> Unit)? {

@Composable
 private fun AlertContent(text: String?, hostDevice: Pair<Long?, String>?, extraPadding: Boolean = false, content: @Composable (() -> Unit)) {
-  BoxWithConstraints {
-    Column(
-      Modifier
-        .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
-    ) {
-      if (appPlatform.isDesktop) {
-        HostDeviceTitle(hostDevice, extraPadding = extraPadding)
-      } else {
-        Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-      }
-      CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
-        if (text != null) {
-          Column(Modifier.heightIn(max = this@BoxWithConstraints.maxHeight * 0.7f)
-            .verticalScroll(rememberScrollState())
-          ) {
-            SelectionContainer {
-              Text(
-                escapedHtmlToAnnotatedString(text, LocalDensity.current),
-                Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
-                fontSize = 16.sp,
-                textAlign = TextAlign.Center,
-                color = MaterialTheme.colors.secondary
-              )
-            }
-          }
-        }
-      }
-      content()
+  Column(
+    Modifier
+      .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
+  ) {
+    if (appPlatform.isDesktop) {
+      HostDeviceTitle(hostDevice, extraPadding = extraPadding)
+    } else {
+      Spacer(Modifier.size(DEFAULT_PADDING_HALF))
    }
+    CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
+      if (text != null) {
+        Text(
+          escapedHtmlToAnnotatedString(text, LocalDensity.current),
+          Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
+          fontSize = 16.sp,
+          textAlign = TextAlign.Center,
+          color = MaterialTheme.colors.secondary
+        )
+      }
+    }
+    content()
  }
 }

@Composable
 private fun AlertContent(text: AnnotatedString?, hostDevice: Pair<Long?, String>?, extraPadding: Boolean = false, content: @Composable (() -> Unit)) {
-  BoxWithConstraints {
-    Column(
-      Modifier
-        .verticalScroll(rememberScrollState())
-        .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
-    ) {
-      if (appPlatform.isDesktop) {
-        HostDeviceTitle(hostDevice, extraPadding = extraPadding)
-      } else {
-        Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-      }
-      CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
-        if (text != null) {
-          Column(
-            Modifier.heightIn(max = this@BoxWithConstraints.maxHeight * 0.7f)
-              .verticalScroll(rememberScrollState())
-          ) {
-            SelectionContainer {
-              Text(
-                text,
-                Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
-                fontSize = 16.sp,
-                textAlign = TextAlign.Center,
-                color = MaterialTheme.colors.secondary
-              )
-            }
-          }
-        }
-      }
-      content()
+  Column(
+    Modifier
+      .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
+  ) {
+    if (appPlatform.isDesktop) {
+      HostDeviceTitle(hostDevice, extraPadding = extraPadding)
+    } else {
+      Spacer(Modifier.size(DEFAULT_PADDING_HALF))
    }
+    CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
+      if (text != null) {
+        Text(
+          text,
+          Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f),
+          fontSize = 16.sp,
+          textAlign = TextAlign.Center,
+          color = MaterialTheme.colors.secondary
+        )
+      }
+    }
+    content()
  }
 }

--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultBasicTextField.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultBasicTextField.kt
@@ -19,8 +19,8 @@ import dev.icerock.moko.resources.compose.painterResource
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.*
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.common.views.database.PassphraseStrength
 import chat.simplex.common.views.database.validKey
 import chat.simplex.res.MR
@@ -123,7 +123,6 @@ fun DefaultConfigurableTextField(
  isValid: (String) -> Boolean,
  keyboardActions: KeyboardActions = KeyboardActions(),
  keyboardType: KeyboardType = KeyboardType.Text,
-  fontSize: TextUnit = 16.sp,
  dependsOn: State<Any?>? = null,
 ) {
  var valid by remember { mutableStateOf(isValid(state.value.text)) }
@@ -153,6 +152,7 @@ fun DefaultConfigurableTextField(
  BasicTextField(
    value = state.value,
    modifier = modifier
+      .fillMaxWidth()
      .background(colors.backgroundColor(enabled).value, shape)
      .indicatorLine(enabled, false, interactionSource, colors)
      .defaultMinSize(
@@ -176,14 +176,14 @@ fun DefaultConfigurableTextField(
    textStyle = TextStyle.Default.copy(
      color = color,
      fontWeight = FontWeight.Normal,
-      fontSize = fontSize
+      fontSize = 16.sp
    ),
    interactionSource = interactionSource,
    decorationBox = @Composable { innerTextField ->
      TextFieldDefaults.TextFieldDecorationBox(
        value = state.value.text,
        innerTextField = innerTextField,
-        placeholder = { Text(placeholder, color = MaterialTheme.colors.secondary, fontSize = fontSize, maxLines = 1, overflow = TextOverflow.Ellipsis) },
+        placeholder = { Text(placeholder, color = MaterialTheme.colors.secondary) },
        singleLine = true,
        enabled = enabled,
        isError = !valid,
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ExposedDropDownSettingRow.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ExposedDropDownSettingRow.kt
@@ -10,90 +10,72 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.res.MR
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.usersettings.SettingsActionItemWithContent

-@Composable
-fun <T> ExposedDropDownSetting(
-  values: List<Pair<T, String>>,
-  selection: State<T>,
-  textColor: Color = MaterialTheme.colors.secondary,
-  fontSize: TextUnit = 16.sp,
-  label: String? = null,
-  enabled: State<Boolean> = mutableStateOf(true),
-  minWidth: Dp = 200.dp,
-  maxWidth: Dp = with(LocalDensity.current) { 180.sp.toDp() },
-  onSelected: (T) -> Unit
-) {
-  val expanded = remember { mutableStateOf(false) }
-  ExposedDropdownMenuBox(
-    expanded = expanded.value,
-    onExpandedChange = {
-      expanded.value = !expanded.value && enabled.value
-    }
-  ) {
-    Row(
-      Modifier.padding(start = 10.dp),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.End
-    ) {
-      Text(
-        values.first { it.first == selection.value }.second + (if (label != null) " $label" else ""),
-        Modifier.widthIn(max = maxWidth),
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-        color = textColor,
-        fontSize = fontSize,
-      )
-      Spacer(Modifier.size(12.dp))
-      Icon(
-        if (!expanded.value) painterResource(MR.images.ic_expand_more) else painterResource(MR.images.ic_expand_less),
-        generalGetString(MR.strings.icon_descr_more_button),
-        tint = MaterialTheme.colors.secondary
-      )
-    }
-    DefaultExposedDropdownMenu(
-      modifier = Modifier.widthIn(min = minWidth),
-      expanded = expanded,
-    ) {
-      values.forEach { selectionOption ->
-        DropdownMenuItem(
-          onClick = {
-            onSelected(selectionOption.first)
-            expanded.value = false
-          },
-          contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)
-        ) {
-          Text(
-            selectionOption.second + (if (label != null) " $label" else ""),
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-            color = if (isInDarkTheme()) MenuTextColorDark else Color.Black,
-            fontSize = fontSize,
-          )
-        }
-      }
-    }
-  }
-}
-
@Composable
 fun <T> ExposedDropDownSettingRow(
  title: String,
  values: List<Pair<T, String>>,
  selection: State<T>,
-  textColor: Color = MaterialTheme.colors.secondary,
  label: String? = null,
  icon: Painter? = null,
  iconTint: Color = MaterialTheme.colors.secondary,
  enabled: State<Boolean> = mutableStateOf(true),
-  minWidth: Dp = 200.dp,
-  maxWidth: Dp = with(LocalDensity.current) { 180.sp.toDp() },
  onSelected: (T) -> Unit
 ) {
  SettingsActionItemWithContent(icon, title, iconColor = iconTint, disabled = !enabled.value) {
-    ExposedDropDownSetting(values, selection ,textColor, label = label, enabled = enabled, minWidth = minWidth, maxWidth = maxWidth, onSelected = onSelected)
+    val expanded = remember { mutableStateOf(false) }
+    ExposedDropdownMenuBox(
+      expanded = expanded.value,
+      onExpandedChange = {
+        expanded.value = !expanded.value && enabled.value
+      }
+    ) {
+      Row(
+        Modifier.padding(start = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.End
+      ) {
+        val maxWidth = with(LocalDensity.current) { 180.sp.toDp() }
+        Text(
+          values.first { it.first == selection.value }.second + (if (label != null) " $label" else ""),
+          Modifier.widthIn(max = maxWidth),
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
+          color = MaterialTheme.colors.secondary
+        )
+        Spacer(Modifier.size(12.dp))
+        Icon(
+          if (!expanded.value) painterResource(MR.images.ic_expand_more) else painterResource(MR.images.ic_expand_less),
+          generalGetString(MR.strings.icon_descr_more_button),
+          tint = MaterialTheme.colors.secondary
+        )
+      }
+      DefaultExposedDropdownMenu(
+        modifier = Modifier.widthIn(min = 200.dp),
+        expanded = expanded,
+      ) {
+        values.forEach { selectionOption ->
+          DropdownMenuItem(
+            onClick = {
+              onSelected(selectionOption.first)
+              expanded.value = false
+            },
+            contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)
+          ) {
+            Text(
+              selectionOption.second + (if (label != null) " $label" else ""),
+              maxLines = 1,
+              overflow = TextOverflow.Ellipsis,
+              color = if (isInDarkTheme()) MenuTextColorDark else Color.Black,
+            )
+          }
+        }
+      }
+    }
  }
 }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt
@@ -10,7 +10,6 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalDensity
 import dev.icerock.moko.resources.compose.painterResource
 import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import chat.simplex.common.platform.onRightClick
@@ -203,14 +202,13 @@ fun SectionTextFooter(text: String) {
 }

@Composable
-fun SectionTextFooter(text: AnnotatedString, textAlign: TextAlign = TextAlign.Start) {
+fun SectionTextFooter(text: AnnotatedString) {
  Text(
    text,
    Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF).fillMaxWidth(0.9F),
    color = MaterialTheme.colors.secondary,
    lineHeight = 18.sp,
-    fontSize = 14.sp,
-    textAlign = textAlign
+    fontSize = 14.sp
  )
 }

--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt
@@ -55,7 +55,7 @@ fun annotatedStringResource(id: StringResource): AnnotatedString {
@Composable
 fun annotatedStringResource(id: StringResource, vararg args: Any?): AnnotatedString {
  val density = LocalDensity.current
-  return remember(id, args) {
+  return remember(id) {
    escapedHtmlToAnnotatedString(id.localized().format(args = args), density)
  }
 }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/CreateLinkView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/CreateLinkView.kt
@@ -108,7 +108,6 @@ private fun createInvitation(
  withApi {
    val r = m.controller.apiAddContact(rhId, incognito = m.controller.appPrefs.incognito.get())
    if (r != null) {
-      m.updateContactConnection(rhId, r.second)
      connReqInvitation.value = r.first
      contactConnection.value = r.second
    } else {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ScanToConnectView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ScanToConnectView.kt
@@ -283,11 +283,10 @@ suspend fun connectViaUri(
  incognito: Boolean,
  connectionPlan: ConnectionPlan?,
  close: (() -> Unit)?
-) {
-  val pcc = chatModel.controller.apiConnect(rhId, incognito, uri.toString())
+): Boolean {
+  val r = chatModel.controller.apiConnect(rhId, incognito, uri.toString())
  val connLinkType = if (connectionPlan != null) planToConnectionLinkType(connectionPlan) else ConnectionLinkType.INVITATION
-  if (pcc != null) {
-    chatModel.updateContactConnection(rhId, pcc)
+  if (r) {
    close?.invoke()
    AlertManager.shared.showAlertMsg(
      title = generalGetString(MR.strings.connection_request_sent),
@@ -300,6 +299,7 @@ suspend fun connectViaUri(
      hostDevice = hostDevice(rhId),
    )
  }
+  return r
 }

 fun planToConnectionLinkType(connectionPlan: ConnectionPlan): ConnectionLinkType {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/CreateSimpleXAddress.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/CreateSimpleXAddress.kt
@@ -182,10 +182,6 @@ private fun prepareChatBeforeAddressCreation(rhId: Long?) {
    val user = chatModel.controller.apiGetActiveUser(rhId) ?: return@withApi
    chatModel.currentUser.value = user
    if (chatModel.users.isEmpty()) {
-      if (appPlatform.isDesktop) {
-        // Make possible to use chat after going to remote device linking and returning back to local profile creation
-        chatModel.chatRunning.value = false
-      }
      chatModel.controller.startChat(user)
    } else {
      val users = chatModel.controller.listUsers(rhId)
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/LinkAMobileView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/LinkAMobileView.kt
@@ -1,92 +0,0 @@
-package chat.simplex.common.views.onboarding
-
-import SectionTextFooter
-import SectionView
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.dp
-import chat.simplex.common.model.ChatModel
-import chat.simplex.common.platform.chatModel
-import chat.simplex.common.ui.theme.DEFAULT_PADDING
-import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.remote.AddingMobileDevice
-import chat.simplex.common.views.remote.DeviceNameField
-import chat.simplex.common.views.usersettings.PreferenceToggle
-import chat.simplex.res.MR
-import dev.icerock.moko.resources.compose.painterResource
-import dev.icerock.moko.resources.compose.stringResource
-
-@Composable
-fun LinkAMobile() {
-  val connecting = rememberSaveable { mutableStateOf(false) }
-  val deviceName = chatModel.controller.appPrefs.deviceNameForRemoteAccess
-  var deviceNameInQrCode by remember { mutableStateOf(chatModel.controller.appPrefs.deviceNameForRemoteAccess.get()) }
-  val staleQrCode = remember { mutableStateOf(false) }
-
-  LinkAMobileLayout(
-    deviceName = remember { deviceName.state },
-    connecting,
-    staleQrCode,
-    updateDeviceName = {
-      withBGApi {
-        if (it != "" && it != deviceName.get()) {
-          chatModel.controller.setLocalDeviceName(it)
-          deviceName.set(it)
-          staleQrCode.value = deviceName.get() != deviceNameInQrCode
-        }
-      }
-    }
-  )
-  KeyChangeEffect(staleQrCode.value) {
-    if (!staleQrCode.value) {
-      deviceNameInQrCode = deviceName.get()
-    }
-  }
-}
-
-@Composable
-private fun LinkAMobileLayout(
-  deviceName: State<String?>,
-  connecting: MutableState<Boolean>,
-  staleQrCode: MutableState<Boolean>,
-  updateDeviceName: (String) -> Unit,
-) {
-  Column(Modifier.padding(top = 20.dp)) {
-    AppBarTitle(stringResource(if (remember { chatModel.remoteHosts }.isEmpty()) MR.strings.link_a_mobile else MR.strings.linked_mobiles))
-    Row(Modifier.weight(1f).padding(horizontal = DEFAULT_PADDING * 2), verticalAlignment = Alignment.CenterVertically) {
-      Column(
-        Modifier.weight(0.3f),
-        verticalArrangement = Arrangement.spacedBy(8.dp)
-      ) {
-        SectionView(generalGetString(MR.strings.this_device_name).uppercase()) {
-          DeviceNameField(deviceName.value ?: "") { updateDeviceName(it) }
-          SectionTextFooter(generalGetString(MR.strings.this_device_name_shared_with_mobile))
-          PreferenceToggle(stringResource(MR.strings.multicast_discoverable_via_local_network), remember { ChatModel.controller.appPrefs.offerRemoteMulticast.state }.value) {
-            ChatModel.controller.appPrefs.offerRemoteMulticast.set(it)
-          }
-        }
-      }
-      Box(Modifier.weight(0.7f)) {
-        AddingMobileDevice(false, staleQrCode, connecting) {
-          // currentRemoteHost will be set instantly but remoteHosts may be delayed
-          if (chatModel.remoteHosts.isEmpty() && chatModel.currentRemoteHost.value == null) {
-            chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-          } else {
-            chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.OnboardingComplete)
-          }
-        }
-      }
-    }
-    SimpleButtonDecorated(
-      text = stringResource(MR.strings.about_simplex),
-      icon = painterResource(MR.images.ic_arrow_back_ios_new),
-      textDecoration = TextDecoration.None,
-      fontWeight = FontWeight.Medium
-    ) { chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo) }
-  }
-}
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/OnboardingView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/OnboardingView.kt
@@ -3,7 +3,6 @@ package chat.simplex.common.views.onboarding
 enum class OnboardingStage {
  Step1_SimpleXInfo,
  Step2_CreateProfile,
-  LinkAMobile,
  Step2_5_SetupDatabasePassphrase,
  Step3_CreateSimpleXAddress,
  Step4_SetNotificationsMode,
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SetupDatabasePassphrase.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SetupDatabasePassphrase.kt
@@ -1,7 +1,10 @@
 package chat.simplex.common.views.onboarding

 import SectionBottomSpacer
+import SectionItemView
+import SectionItemViewSpaceBetween
 import SectionTextFooter
+import SectionView
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
@@ -12,12 +15,14 @@ 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.Color
 import androidx.compose.ui.input.key.*
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.input.ImeAction
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
@@ -38,11 +43,7 @@ fun SetupDatabasePassphrase(m: ChatModel) {
  val newKey = rememberSaveable { mutableStateOf("") }
  val confirmNewKey = rememberSaveable { mutableStateOf("") }
  fun nextStep() {
-    if (appPlatform.isAndroid || chatModel.currentUser.value != null) {
-      m.controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
-    } else {
-      m.controller.appPrefs.onboardingStage.set(OnboardingStage.LinkAMobile)
-    }
+    m.controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
  }
  SetupDatabasePassphraseLayout(
    currentKey,
@@ -158,7 +159,10 @@ private fun SetupDatabasePassphraseLayout(
            }
          },
        isValid = { confirmNewKey.value == "" || newKey.value == confirmNewKey.value },
-        keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done) }),
+        keyboardActions = KeyboardActions(onDone = {
+          if (!disabled) onClickUpdate()
+          defaultKeyboardAction(ImeAction.Done)
+        }),
      )

      Box(Modifier.align(Alignment.CenterHorizontally).padding(vertical = DEFAULT_PADDING)) {
@@ -172,10 +176,7 @@ private fun SetupDatabasePassphraseLayout(
    }

    Spacer(Modifier.weight(1f))
-    SkipButton(progressIndicator.value) {
-      chatModel.desktopOnboardingRandomPassword.value = true
-      nextStep()
-    }
+    SkipButton(progressIndicator.value, nextStep)

    SectionBottomSpacer()
  }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.kt
@@ -8,7 +8,6 @@ import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
@@ -100,22 +99,26 @@ private fun InfoRow(icon: Painter, titleId: StringResource, textId: StringResour
 }

@Composable
-expect fun OnboardingActionButton(user: User?, onboardingStage: SharedPreference<OnboardingStage>, onclick: (() -> Unit)? = null)
+fun OnboardingActionButton(user: User?, onboardingStage: SharedPreference<OnboardingStage>, onclick: (() -> Unit)? = null) {
+  if (user == null) {
+    OnboardingActionButton(MR.strings.create_your_profile, onboarding = OnboardingStage.Step2_CreateProfile, true, onclick)
+  } else {
+    OnboardingActionButton(MR.strings.make_private_connection, onboarding = OnboardingStage.OnboardingComplete, true, onclick)
+  }
+}

@Composable
 fun OnboardingActionButton(
  labelId: StringResource,
  onboarding: OnboardingStage?,
  border: Boolean,
-  icon: Painter? = null,
-  iconColor: Color = MaterialTheme.colors.primary,
  onclick: (() -> Unit)?
 ) {
  val modifier = if (border) {
    Modifier
      .border(border = BorderStroke(1.dp, MaterialTheme.colors.primary), shape = RoundedCornerShape(50))
      .padding(
-      horizontal = if (icon == null) DEFAULT_PADDING * 2 else DEFAULT_PADDING_HALF,
+      horizontal = DEFAULT_PADDING * 2,
      vertical = 4.dp
    )
  } else {
@@ -128,9 +131,6 @@ fun OnboardingActionButton(
      ChatController.appPrefs.onboardingStage.set(onboarding)
    }
  }, modifier) {
-    if (icon != null) {
-      Icon(icon, stringResource(labelId), Modifier.padding(end = DEFAULT_PADDING_HALF), tint = iconColor)
-    }
    Text(stringResource(labelId), style = MaterialTheme.typography.h2, color = MaterialTheme.colors.primary, fontSize = 20.sp)
    Icon(
      painterResource(MR.images.ic_arrow_forward_ios), "next stage", tint = MaterialTheme.colors.primary,
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectMobileView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectMobileView.kt
@@ -9,20 +9,16 @@ import SectionView
 import TextIconSpaced
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.selection.SelectionContainer
 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.Color
 import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.input.*
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
@@ -34,11 +30,11 @@ import chat.simplex.common.views.chat.item.ItemAction
 import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.newchat.QRCode
-import chat.simplex.common.views.usersettings.*
+import chat.simplex.common.views.usersettings.PreferenceToggle
+import chat.simplex.common.views.usersettings.SettingsActionItemWithContent
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
-import kotlinx.coroutines.flow.distinctUntilChanged

@Composable
 fun ConnectMobileView() {
@@ -101,11 +97,9 @@ fun ConnectMobileLayout(
      SectionDividerSpaced(maxBottomPadding = false)
    }
    SectionView(stringResource(MR.strings.devices).uppercase()) {
-      if (chatModel.localUserCreated.value == true) {
-        SettingsActionItemWithContent(text = stringResource(MR.strings.this_device), icon = painterResource(MR.images.ic_desktop), click = connectDesktop) {
-          if (connectedHost.value == null) {
-            Icon(painterResource(MR.images.ic_done_filled), null, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
-          }
+      SettingsActionItemWithContent(text = stringResource(MR.strings.this_device), icon = painterResource(MR.images.ic_desktop), click = connectDesktop) {
+        if (connectedHost.value == null) {
+          Icon(painterResource(MR.images.ic_done_filled), null, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
        }
      }

@@ -158,7 +152,7 @@ fun DeviceNameField(
  DefaultConfigurableTextField(
    state = state,
    placeholder = generalGetString(MR.strings.enter_this_device_name),
-    modifier = Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING),
+    modifier = Modifier.padding(start = DEFAULT_PADDING),
    isValid = { true },
  )
  KeyChangeEffect(state.value) {
@@ -168,40 +162,26 @@ fun DeviceNameField(

@Composable
 private fun ConnectMobileViewLayout(
-  title: String?,
+  title: String,
  invitation: String?,
  deviceName: String?,
  sessionCode: String?,
-  port: String?,
-  staleQrCode: Boolean = false,
-  refreshQrCode: () -> Unit = {},
-  UnderQrLayout: @Composable () -> Unit = {},
+  port: String?
 ) {
  Column(
    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
    verticalArrangement = Arrangement.spacedBy(8.dp)
  ) {
-    if (title != null) {
-      AppBarTitle(title)
-    }
+    AppBarTitle(title)
    SectionView {
      if (invitation != null && sessionCode == null && port != null) {
-        Box {
-          QRCode(
-            invitation, Modifier
-              .padding(start = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING_HALF)
-              .aspectRatio(1f)
-          )
-          if (staleQrCode) {
-            Box(Modifier.matchParentSize().background(MaterialTheme.colors.background.copy(alpha = 0.9f)), contentAlignment = Alignment.Center) {
-              SimpleButtonDecorated(stringResource(MR.strings.refresh_qr_code), painterResource(MR.images.ic_refresh), click = refreshQrCode)
-            }
-          }
-        }
-        SectionTextFooter(annotatedStringResource(MR.strings.open_on_mobile_and_scan_qr_code), textAlign = TextAlign.Center)
-        SectionTextFooter(annotatedStringResource(MR.strings.waiting_for_mobile_to_connect), textAlign = TextAlign.Center)
-
-        UnderQrLayout()
+        QRCode(
+          invitation, Modifier
+            .padding(start = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING_HALF)
+            .aspectRatio(1f)
+        )
+        SectionTextFooter(annotatedStringResource(MR.strings.open_on_mobile_and_scan_qr_code))
+        SectionTextFooter(annotatedStringResource(MR.strings.waiting_for_mobile_to_connect_on_port, port))

        if (remember { controller.appPrefs.developerTools.state }.value) {
          val clipboard = LocalClipboardManager.current
@@ -238,9 +218,6 @@ private fun ConnectMobileViewLayout(
        }
      }
    }
-    if (invitation != null) {
-      SectionBottomSpacer()
-    }
  }
 }

@@ -260,105 +237,64 @@ fun connectMobileDevice(rh: RemoteHostInfo, connecting: MutableState<Boolean>) {

 private fun showAddingMobileDevice(connecting: MutableState<Boolean>) {
  ModalManager.start.showModalCloseable { close ->
-    AddingMobileDevice(true, remember { mutableStateOf(false) }, connecting, close)
-  }
-}
-
-@Composable
-fun AddingMobileDevice(showTitle: Boolean, staleQrCode: MutableState<Boolean>, connecting: MutableState<Boolean>, close: () -> Unit) {
-  var cachedR by remember { mutableStateOf<CR.RemoteHostStarted?>(null) }
-  val customAddress = rememberSaveable { mutableStateOf<RemoteCtrlAddress?>(null) }
-  val customPort = rememberSaveable { mutableStateOf<Int?>(null) }
-  val startRemoteHost = suspend {
-    val r = chatModel.controller.startRemoteHost(
-      rhId = null,
-      multicast = controller.appPrefs.offerRemoteMulticast.get(),
-      address = if (customAddress.value?.address != cachedR.address?.address) customAddress.value else cachedR.rh?.bindAddress_,
-      port = if (customPort.value != cachedR.port) customPort.value else cachedR.rh?.bindPort_
+    val invitation = rememberSaveable { mutableStateOf<String?>(null) }
+    val port = rememberSaveable { mutableStateOf<String?>(null) }
+    val pairing = remember { chatModel.remoteHostPairing }
+    val sessionCode = when (val state = pairing.value?.second) {
+      is RemoteHostSessionState.PendingConfirmation -> state.sessionCode
+      else -> null
+    }
+    /** It's needed to prevent screen flashes when [chatModel.newRemoteHostPairing] sets to null in background */
+    var cachedSessionCode by remember { mutableStateOf<String?>(null) }
+    if (cachedSessionCode == null && sessionCode != null) {
+      cachedSessionCode = sessionCode
+    }
+    val remoteDeviceName = pairing.value?.first?.hostDeviceName
+    ConnectMobileViewLayout(
+      title = if (cachedSessionCode == null) stringResource(MR.strings.link_a_mobile) else stringResource(MR.strings.verify_connection),
+      invitation = invitation.value,
+      deviceName = remoteDeviceName,
+      sessionCode = cachedSessionCode,
+      port = port.value
    )
-    if (r != null) {
-      cachedR = r
-      connecting.value = true
-      customAddress.value = cachedR.addresses.firstOrNull()
-      customPort.value = cachedR.port
-      chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
+    val oldRemoteHostId by remember { mutableStateOf(chatModel.currentRemoteHost.value?.remoteHostId) }
+    LaunchedEffect(remember { chatModel.currentRemoteHost }.value) {
+      if (chatModel.currentRemoteHost.value?.remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId != oldRemoteHostId) {
+        close()
+      }
    }
-  }
-  val pairing = remember { chatModel.remoteHostPairing }
-  val sessionCode = when (val state = pairing.value?.second) {
-    is RemoteHostSessionState.PendingConfirmation -> state.sessionCode
-    else -> null
-  }
-  /** It's needed to prevent screen flashes when [chatModel.newRemoteHostPairing] sets to null in background */
-  var cachedSessionCode by remember { mutableStateOf<String?>(null) }
-  if (cachedSessionCode == null && sessionCode != null) {
-    cachedSessionCode = sessionCode
-  }
-  val remoteDeviceName = pairing.value?.first?.hostDeviceName
-  ConnectMobileViewLayout(
-    title = if (!showTitle) null else if (cachedSessionCode == null) stringResource(MR.strings.link_a_mobile) else stringResource(MR.strings.verify_connection),
-    invitation = cachedR?.invitation,
-    deviceName = remoteDeviceName,
-    sessionCode = cachedSessionCode,
-    port = cachedR?.ctrlPort,
-    staleQrCode = staleQrCode.value || (cachedR.address != customAddress.value && customAddress.value != null) || cachedR.port != customPort.value,
-    refreshQrCode = {
+    KeyChangeEffect(pairing.value) {
+      if (pairing.value == null) {
+        close()
+      }
+    }
+    DisposableEffect(Unit) {
      withBGApi {
-        if (chatController.stopRemoteHost(null)) {
-          startRemoteHost()
-          staleQrCode.value = false
+        val r = chatModel.controller.startRemoteHost(null, controller.appPrefs.offerRemoteMulticast.get())
+        if (r != null) {
+          connecting.value = true
+          invitation.value = r.second
+          port.value = r.third
+          chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
        }
      }
-    },
-    UnderQrLayout = { UnderQrLayout(cachedR, customAddress, customPort) }
-  )
-  val oldRemoteHostId by remember { mutableStateOf(chatModel.currentRemoteHost.value?.remoteHostId) }
-  LaunchedEffect(remember { chatModel.currentRemoteHost }.value) {
-    if (chatModel.currentRemoteHost.value?.remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId != oldRemoteHostId) {
-      close()
-    }
-  }
-  KeyChangeEffect(pairing.value) {
-    if (pairing.value == null) {
-      close()
-    }
-  }
-  DisposableEffect(Unit) {
-    withBGApi {
-      startRemoteHost()
-    }
-    onDispose {
-      if (chatModel.currentRemoteHost.value?.remoteHostId == oldRemoteHostId) {
-        withBGApi {
-          chatController.stopRemoteHost(null)
+      onDispose {
+        if (chatModel.currentRemoteHost.value?.remoteHostId == oldRemoteHostId) {
+          withBGApi {
+            chatController.stopRemoteHost(null)
+          }
        }
+        chatModel.remoteHostPairing.value = null
      }
-      chatModel.remoteHostPairing.value = null
    }
  }
 }

 private fun showConnectMobileDevice(rh: RemoteHostInfo, connecting: MutableState<Boolean>) {
  ModalManager.start.showModalCloseable { close ->
-    var cachedR by remember { mutableStateOf<CR.RemoteHostStarted?>(null) }
-    val customAddress = rememberSaveable { mutableStateOf<RemoteCtrlAddress?>(null) }
-    val customPort = rememberSaveable { mutableStateOf<Int?>(null) }
-    val startRemoteHost = suspend {
-      val r = chatModel.controller.startRemoteHost(
-        rhId = rh.remoteHostId,
-        multicast = controller.appPrefs.offerRemoteMulticast.get(),
-        address = if (customAddress.value?.address != cachedR.address?.address) customAddress.value else cachedR.rh?.bindAddress_ ?: rh.bindAddress_,
-        port = if (customPort.value != cachedR.port) customPort.value else cachedR.rh?.bindPort_ ?: rh.bindPort_
-      )
-      if (r != null) {
-        cachedR = r
-        connecting.value = true
-        customAddress.value = cachedR.addresses.firstOrNull()
-        customPort.value = cachedR.port
-        chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
-      }
-    }
    val pairing = remember { chatModel.remoteHostPairing }
+    val invitation = rememberSaveable { mutableStateOf<String?>(null) }
+    val port = rememberSaveable { mutableStateOf<String?>(null) }
    val sessionCode = when (val state = pairing.value?.second) {
      is RemoteHostSessionState.PendingConfirmation -> state.sessionCode
      else -> null
@@ -370,22 +306,25 @@ private fun showConnectMobileDevice(rh: RemoteHostInfo, connecting: MutableState
    }
    ConnectMobileViewLayout(
      title = if (cachedSessionCode == null) stringResource(MR.strings.scan_from_mobile) else stringResource(MR.strings.verify_connection),
-      invitation = cachedR?.invitation,
+      invitation = invitation.value,
      deviceName = pairing.value?.first?.hostDeviceName ?: rh.hostDeviceName,
      sessionCode = cachedSessionCode,
-      port = cachedR?.ctrlPort,
-      staleQrCode = (cachedR.address != customAddress.value && customAddress.value != null) || cachedR.port != customPort.value,
-      refreshQrCode = {
-        withBGApi {
-          if (chatController.stopRemoteHost(rh.remoteHostId)) {
-            startRemoteHost()
-          }
-        }
-      },
-      UnderQrLayout = { UnderQrLayout(cachedR, customAddress, customPort) }
+      port = port.value
    )
+    var remoteHostId by rememberSaveable { mutableStateOf<Long?>(null) }
+    LaunchedEffect(Unit) {
+      val r = chatModel.controller.startRemoteHost(rh.remoteHostId, controller.appPrefs.offerRemoteMulticast.get())
+      if (r != null) {
+        val (rh_, inv) = r
+        connecting.value = true
+        remoteHostId = rh_?.remoteHostId
+        invitation.value = inv
+        port.value = r.third
+        chatModel.remoteHostPairing.value = null to RemoteHostSessionState.Starting
+      }
+    }
    LaunchedEffect(remember { chatModel.currentRemoteHost }.value) {
-      if (cachedR.remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId == cachedR.remoteHostId) {
+      if (remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId == remoteHostId) {
        close()
      }
    }
@@ -395,13 +334,10 @@ private fun showConnectMobileDevice(rh: RemoteHostInfo, connecting: MutableState
      }
    }
    DisposableEffect(Unit) {
-      withBGApi {
-        startRemoteHost()
-      }
      onDispose {
-        if (cachedR.remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId != cachedR.remoteHostId) {
+        if (remoteHostId != null && chatModel.currentRemoteHost.value?.remoteHostId != remoteHostId) {
          withBGApi {
-            chatController.stopRemoteHost(cachedR.remoteHostId)
+            chatController.stopRemoteHost(remoteHostId)
          }
        }
        chatModel.remoteHostPairing.value = null
@@ -434,77 +370,3 @@ private fun showConnectedMobileDevice(rh: RemoteHostInfo, disconnectHost: () ->
    }
  }
 }
-
-@Composable
-private fun UnderQrLayout(cachedR: CR.RemoteHostStarted?, customAddress: MutableState<RemoteCtrlAddress?>, customPort: MutableState<Int?>) {
-  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center) {
-    if (cachedR.addresses.size > 1) {
-      ExposedDropDownSetting(
-        cachedR.addresses.map { it to it.address + " (${it.`interface`})" },
-        customAddress,
-        textColor = MaterialTheme.colors.onBackground,
-        fontSize = 14.sp,
-        minWidth = 250.dp,
-        maxWidth = with(LocalDensity.current) { 250.sp.toDp() },
-        enabled = remember { mutableStateOf(cachedR.addresses.size > 1) },
-        onSelected = {
-          customAddress.value = it
-        }
-      )
-    } else {
-      Spacer(Modifier.width(10.dp))
-      Text(customAddress.value?.address + " (${customAddress.value?.`interface`})", fontSize = 14.sp, color = MaterialTheme.colors.onBackground)
-    }
-    val portUnsaved = rememberSaveable(stateSaver = TextFieldValue.Saver) {
-      mutableStateOf(TextFieldValue((customPort.value ?: cachedR.port!!).toString()))
-    }
-    Spacer(Modifier.width(DEFAULT_PADDING))
-    Box {
-      DefaultConfigurableTextField(
-        portUnsaved,
-        stringResource(MR.strings.random_port),
-        modifier = Modifier.widthIn(max = 132.dp),
-        isValid = { (validPort(it) && it.toInt() > 1023) || it.isBlank() },
-        keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done) }),
-        keyboardType = KeyboardType.Number,
-        fontSize = 14.sp,
-      )
-      if (validPort(portUnsaved.value.text) && portUnsaved.value.text.toInt() > 1023) {
-        Icon(painterResource(MR.images.ic_edit), stringResource(MR.strings.edit_verb), Modifier.padding(end = 56.dp).size(16.dp).align(Alignment.CenterEnd), tint = MaterialTheme.colors.secondary)
-        IconButton(::showOpenPortAlert, Modifier.align(Alignment.TopEnd).padding(top = 2.dp)) {
-          Icon(painterResource(MR.images.ic_info), null, tint = MaterialTheme.colors.primary)
-        }
-      }
-    }
-    LaunchedEffect(Unit) {
-      snapshotFlow { portUnsaved.value.text }
-        .distinctUntilChanged()
-        .collect {
-          if (validPort(it) && it.toInt() > 1023) {
-            customPort.value = it.toInt()
-          } else {
-            customPort.value = null
-          }
-        }
-    }
-    KeyChangeEffect(customPort.value) {
-      if (customPort.value != null) {
-        portUnsaved.value = portUnsaved.value.copy(text = customPort.value.toString())
-      }
-    }
-  }
-}
-
-private fun showOpenPortAlert() {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(MR.strings.open_port_in_firewall_title),
-    text = generalGetString(MR.strings.open_port_in_firewall_desc),
-  )
-}
-
-private val CR.RemoteHostStarted?.rh: RemoteHostInfo? get() = this?.remoteHost_
-private val CR.RemoteHostStarted?.remoteHostId: Long? get() = this?.remoteHost_?.remoteHostId
-private val CR.RemoteHostStarted?.address: RemoteCtrlAddress? get() = this?.localAddrs?.firstOrNull()
-private val CR.RemoteHostStarted?.addresses: List<RemoteCtrlAddress> get() =
-  (if (controller.appPrefs.developerTools.get() || this?.localAddrs?.indexOfFirst { it.address == "127.0.0.1" } == 0) this?.localAddrs else this?.localAddrs?.filterNot { it.address == "127.0.0.1" }) ?: emptyList()
-private val CR.RemoteHostStarted?.port: Int? get() = this?.ctrlPort?.toIntOrNull()
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt
@@ -25,7 +25,6 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
-import chat.simplex.common.platform.chatModel
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.item.ClickableText
 import chat.simplex.common.views.helpers.*
@@ -170,20 +169,18 @@ fun NetworkAndServersView(
    verticalArrangement = Arrangement.spacedBy(8.dp)
  ) {
    AppBarTitle(stringResource(MR.strings.network_and_servers))
-    if (!chatModel.desktopNoUserNoRemote) {
-      SectionView(generalGetString(MR.strings.settings_section_title_messages)) {
-        SettingsActionItem(painterResource(MR.images.ic_dns), stringResource(MR.strings.smp_servers), showCustomModal { m, close -> ProtocolServersView(m, m.remoteHostId, ServerProtocol.SMP, close) })
+    SectionView(generalGetString(MR.strings.settings_section_title_messages)) {
+      SettingsActionItem(painterResource(MR.images.ic_dns), stringResource(MR.strings.smp_servers), showCustomModal { m, close -> ProtocolServersView(m, m.remoteHostId, ServerProtocol.SMP, close) })

-        SettingsActionItem(painterResource(MR.images.ic_dns), stringResource(MR.strings.xftp_servers), showCustomModal { m, close -> ProtocolServersView(m, m.remoteHostId, ServerProtocol.XFTP, close) })
+      SettingsActionItem(painterResource(MR.images.ic_dns), stringResource(MR.strings.xftp_servers), showCustomModal { m, close -> ProtocolServersView(m, m.remoteHostId, ServerProtocol.XFTP, close) })

-        if (currentRemoteHost == null) {
-          UseSocksProxySwitch(networkUseSocksProxy, proxyPort, toggleSocksProxy, showSettingsModal)
-          UseOnionHosts(onionHosts, networkUseSocksProxy, showSettingsModal, useOnion)
-          if (developerTools) {
-            SessionModePicker(sessionMode, showSettingsModal, updateSessionMode)
-          }
-          SettingsActionItem(painterResource(MR.images.ic_cable), stringResource(MR.strings.network_settings), showSettingsModal { AdvancedNetworkSettingsView(it) })
+      if (currentRemoteHost == null) {
+        UseSocksProxySwitch(networkUseSocksProxy, proxyPort, toggleSocksProxy, showSettingsModal)
+        UseOnionHosts(onionHosts, networkUseSocksProxy, showSettingsModal, useOnion)
+        if (developerTools) {
+          SessionModePicker(sessionMode, showSettingsModal, updateSessionMode)
        }
+        SettingsActionItem(painterResource(MR.images.ic_cable), stringResource(MR.strings.network_settings), showSettingsModal { AdvancedNetworkSettingsView(it) })
      }
    }
    if (currentRemoteHost == null && networkUseSocksProxy.value) {
@@ -195,7 +192,7 @@ fun NetworkAndServersView(
        }
      }
      Divider(Modifier.padding(start = DEFAULT_PADDING_HALF, top = 32.dp, end = DEFAULT_PADDING_HALF, bottom = 30.dp))
-    } else if (!chatModel.desktopNoUserNoRemote) {
+    } else {
      Divider(Modifier.padding(start = DEFAULT_PADDING_HALF, top = 24.dp, end = DEFAULT_PADDING_HALF, bottom = 30.dp))
    }

@@ -305,7 +302,7 @@ fun SockProxySettings(m: ChatModel) {
        DefaultConfigurableTextField(
          hostUnsaved,
          stringResource(MR.strings.host_verb),
-          modifier = Modifier.fillMaxWidth(),
+          modifier = Modifier,
          isValid = ::validHost,
          keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
          keyboardType = KeyboardType.Text,
@@ -315,7 +312,7 @@ fun SockProxySettings(m: ChatModel) {
        DefaultConfigurableTextField(
          portUnsaved,
          stringResource(MR.strings.port_verb),
-          modifier = Modifier.fillMaxWidth(),
+          modifier = Modifier,
          isValid = ::validPort,
          keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done); save() }),
          keyboardType = KeyboardType.Number,
@@ -428,7 +425,7 @@ private fun validHost(s: String): Boolean {
 }

 // https://ihateregex.io/expr/port/
-fun validPort(s: String): Boolean {
+private fun validPort(s: String): Boolean {
  val validPort = Regex("^(6553[0-5])|(655[0-2][0-9])|(65[0-4][0-9]{2})|(6[0-4][0-9]{3})|([1-5][0-9]{4})|([0-5]{0,5})|([0-9]{1,4})$")
  return s.isNotBlank() && s.matches(validPort)
 }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt
@@ -92,6 +92,7 @@ fun PrivacySettingsView(
        chatModel.simplexLinkMode.value = it
      })
    }
+    SectionDividerSpaced()

    val currentUser = chatModel.currentUser.value
    if (currentUser != null) {
@@ -141,42 +142,39 @@ fun PrivacySettingsView(
        }
      }

-      if (!chatModel.desktopNoUserNoRemote) {
-        SectionDividerSpaced()
-        DeliveryReceiptsSection(
-          currentUser = currentUser,
-          setOrAskSendReceiptsContacts = { enable ->
-            val contactReceiptsOverrides = chatModel.chats.fold(0) { count, chat ->
-              if (chat.chatInfo is ChatInfo.Direct) {
-                val sendRcpts = chat.chatInfo.contact.chatSettings.sendRcpts
-                count + (if (sendRcpts == null || sendRcpts == enable) 0 else 1)
-              } else {
-                count
-              }
-            }
-            if (contactReceiptsOverrides == 0) {
-              setSendReceiptsContacts(enable, clearOverrides = false)
+      DeliveryReceiptsSection(
+        currentUser = currentUser,
+        setOrAskSendReceiptsContacts = { enable ->
+          val contactReceiptsOverrides = chatModel.chats.fold(0) { count, chat ->
+            if (chat.chatInfo is ChatInfo.Direct) {
+              val sendRcpts = chat.chatInfo.contact.chatSettings.sendRcpts
+              count + (if (sendRcpts == null || sendRcpts == enable) 0 else 1)
            } else {
-              showUserContactsReceiptsAlert(enable, contactReceiptsOverrides, ::setSendReceiptsContacts)
-            }
-          },
-          setOrAskSendReceiptsGroups = { enable ->
-            val groupReceiptsOverrides = chatModel.chats.fold(0) { count, chat ->
-              if (chat.chatInfo is ChatInfo.Group) {
-                val sendRcpts = chat.chatInfo.groupInfo.chatSettings.sendRcpts
-                count + (if (sendRcpts == null || sendRcpts == enable) 0 else 1)
-              } else {
-                count
-              }
-            }
-            if (groupReceiptsOverrides == 0) {
-              setSendReceiptsGroups(enable, clearOverrides = false)
-            } else {
-              showUserGroupsReceiptsAlert(enable, groupReceiptsOverrides, ::setSendReceiptsGroups)
+              count
            }
          }
-        )
-      }
+          if (contactReceiptsOverrides == 0) {
+            setSendReceiptsContacts(enable, clearOverrides = false)
+          } else {
+            showUserContactsReceiptsAlert(enable, contactReceiptsOverrides, ::setSendReceiptsContacts)
+          }
+        },
+        setOrAskSendReceiptsGroups = { enable ->
+          val groupReceiptsOverrides = chatModel.chats.fold(0) { count, chat ->
+            if (chat.chatInfo is ChatInfo.Group) {
+              val sendRcpts = chat.chatInfo.groupInfo.chatSettings.sendRcpts
+              count + (if (sendRcpts == null || sendRcpts == enable) 0 else 1)
+            } else {
+              count
+            }
+          }
+          if (groupReceiptsOverrides == 0) {
+            setSendReceiptsGroups(enable, clearOverrides = false)
+          } else {
+            showUserGroupsReceiptsAlert(enable, groupReceiptsOverrides, ::setSendReceiptsGroups)
+          }
+        }
+      )
    }
    SectionBottomSpacer()
  }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SettingsView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SettingsView.kt
@@ -25,7 +25,6 @@ import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.CreateProfile
 import chat.simplex.common.views.database.DatabaseView
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.SimpleXInfo
@@ -39,39 +38,76 @@ import kotlinx.coroutines.launch
 fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit, drawerState: DrawerState) {
  val user = chatModel.currentUser.value
  val stopped = chatModel.chatRunning.value == false
-  SettingsLayout(
-    profile = user?.profile,
-    stopped,
-    chatModel.chatDbEncrypted.value == true,
-    remember { chatModel.controller.appPrefs.storeDBPassphrase.state }.value,
-    remember { chatModel.controller.appPrefs.notificationsMode.state },
-    user?.displayName,
-    setPerformLA = setPerformLA,
-    showModal = { modalView -> { ModalManager.start.showModal { modalView(chatModel) } } },
-    showSettingsModal = { modalView -> { ModalManager.start.showModal(true) { modalView(chatModel) } } },
-    showSettingsModalWithSearch = { modalView ->
-      ModalManager.start.showCustomModal { close ->
-        val search = rememberSaveable { mutableStateOf("") }
-        ModalView(
-          { close() },
-          endButtons = {
-            SearchTextField(Modifier.fillMaxWidth(), placeholder = stringResource(MR.strings.search_verb), alwaysVisible = true) { search.value = it }
-          },
-          content = { modalView(chatModel, search) })
-      }
-    },
-    showCustomModal = { modalView -> { ModalManager.start.showCustomModal { close -> modalView(chatModel, close) } } },
-    showVersion = {
-      withApi {
-        val info = chatModel.controller.apiGetVersion()
-        if (info != null) {
-          ModalManager.start.showModal { VersionInfoView(info) }
+
+  if (user != null) {
+    val requireAuth = remember { chatModel.controller.appPrefs.performLA.state }
+    SettingsLayout(
+      profile = user.profile,
+      stopped,
+      chatModel.chatDbEncrypted.value == true,
+      remember { chatModel.controller.appPrefs.storeDBPassphrase.state }.value,
+      remember { chatModel.controller.appPrefs.notificationsMode.state },
+      user.displayName,
+      setPerformLA = setPerformLA,
+      showModal = { modalView -> { ModalManager.start.showModal { modalView(chatModel) } } },
+      showSettingsModal = { modalView -> { ModalManager.start.showModal(true) { modalView(chatModel) } } },
+      showSettingsModalWithSearch = { modalView ->
+        ModalManager.start.showCustomModal { close ->
+          val search = rememberSaveable { mutableStateOf("") }
+          ModalView(
+            { close() },
+            endButtons = {
+              SearchTextField(Modifier.fillMaxWidth(), placeholder = stringResource(MR.strings.search_verb), alwaysVisible = true) { search.value = it }
+            },
+            content = { modalView(chatModel, search) })
        }
-      }
-    },
-    withAuth = ::doWithAuth,
-    drawerState = drawerState,
-  )
+      },
+      showCustomModal = { modalView -> { ModalManager.start.showCustomModal { close -> modalView(chatModel, close) } } },
+      showVersion = {
+        withApi {
+          val info = chatModel.controller.apiGetVersion()
+          if (info != null) {
+            ModalManager.start.showModal { VersionInfoView(info) }
+          }
+        }
+      },
+      withAuth = { title, desc, block ->
+        if (!requireAuth.value) {
+          block()
+        } else {
+          var autoShow = true
+          ModalManager.fullscreen.showModalCloseable { close ->
+            val onFinishAuth = { success: Boolean ->
+              if (success) {
+                close()
+                block()
+              }
+            }
+
+            LaunchedEffect(Unit) {
+              if (autoShow) {
+                autoShow = false
+                runAuth(title, desc, onFinishAuth)
+              }
+            }
+            Box(
+              Modifier.fillMaxSize().background(MaterialTheme.colors.background),
+              contentAlignment = Alignment.Center
+            ) {
+              SimpleButton(
+                stringResource(MR.strings.auth_unlock),
+                icon = painterResource(MR.images.ic_lock),
+                click = {
+                  runAuth(title, desc, onFinishAuth)
+                }
+              )
+            }
+          }
+        }
+      },
+      drawerState = drawerState,
+    )
+  }
 }

 val simplexTeamUri =
@@ -79,12 +115,12 @@ val simplexTeamUri =

@Composable
 fun SettingsLayout(
-  profile: LocalProfile?,
+  profile: LocalProfile,
  stopped: Boolean,
  encrypted: Boolean,
  passphraseSaved: Boolean,
  notificationsMode: State<NotificationsMode>,
-  userDisplayName: String?,
+  userDisplayName: String,
  setPerformLA: (Boolean) -> Unit,
  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
@@ -114,22 +150,13 @@ fun SettingsLayout(
      AppBarTitle(stringResource(MR.strings.your_settings))

      SectionView(stringResource(MR.strings.settings_section_title_you)) {
-        val profileHidden = rememberSaveable { mutableStateOf(false) }
-        if (profile != null) {
-          SectionItemView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp, padding = PaddingValues(start = 16.dp, end = DEFAULT_PADDING), disabled = stopped) {
-            ProfilePreview(profile, stopped = stopped)
-          }
-          SettingsActionItem(painterResource(MR.images.ic_manage_accounts), stringResource(MR.strings.your_chat_profiles), { withAuth(generalGetString(MR.strings.auth_open_chat_profiles), generalGetString(MR.strings.auth_log_in_using_credential)) { showSettingsModalWithSearch { it, search -> UserProfilesView(it, search, profileHidden) } } }, disabled = stopped, extraPadding = true)
-          SettingsActionItem(painterResource(MR.images.ic_qr_code), stringResource(MR.strings.your_simplex_contact_address), showCustomModal { it, close -> UserAddressView(it, shareViaProfile = it.currentUser.value!!.addressShared, close = close) }, disabled = stopped, extraPadding = true)
-          ChatPreferencesItem(showCustomModal, stopped = stopped)
-        } else if (chatModel.localUserCreated.value == false) {
-          SettingsActionItem(painterResource(MR.images.ic_manage_accounts), stringResource(MR.strings.create_chat_profile), { withAuth(generalGetString(MR.strings.auth_open_chat_profiles), generalGetString(MR.strings.auth_log_in_using_credential)) { ModalManager.center.showModalCloseable { close ->
-            LaunchedEffect(Unit) {
-              closeSettings()
-            }
-            CreateProfile(chatModel, close)
-          } } }, disabled = stopped, extraPadding = true)
+        SectionItemView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp, padding = PaddingValues(start = 16.dp, end = DEFAULT_PADDING), disabled = stopped) {
+          ProfilePreview(profile, stopped = stopped)
        }
+        val profileHidden = rememberSaveable { mutableStateOf(false) }
+        SettingsActionItem(painterResource(MR.images.ic_manage_accounts), stringResource(MR.strings.your_chat_profiles), { withAuth(generalGetString(MR.strings.auth_open_chat_profiles), generalGetString(MR.strings.auth_log_in_using_credential)) { showSettingsModalWithSearch { it, search -> UserProfilesView(it, search, profileHidden) } } }, disabled = stopped, extraPadding = true)
+        SettingsActionItem(painterResource(MR.images.ic_qr_code), stringResource(MR.strings.your_simplex_contact_address), showCustomModal { it, close -> UserAddressView(it, shareViaProfile = it.currentUser.value!!.addressShared, close = close) }, disabled = stopped, extraPadding = true)
+        ChatPreferencesItem(showCustomModal, stopped = stopped)
        if (appPlatform.isDesktop) {
          SettingsActionItem(painterResource(MR.images.ic_smartphone), stringResource(if (remember { chatModel.remoteHosts }.isEmpty()) MR.strings.link_a_mobile else MR.strings.linked_mobiles), showModal { ConnectMobileView() }, disabled = stopped, extraPadding = true)
        } else {
@@ -149,12 +176,10 @@ fun SettingsLayout(
      SectionDividerSpaced()

      SectionView(stringResource(MR.strings.settings_section_title_help)) {
-        SettingsActionItem(painterResource(MR.images.ic_help), stringResource(MR.strings.how_to_use_simplex_chat), showModal { HelpView(userDisplayName ?: "") }, disabled = stopped, extraPadding = true)
+        SettingsActionItem(painterResource(MR.images.ic_help), stringResource(MR.strings.how_to_use_simplex_chat), showModal { HelpView(userDisplayName) }, disabled = stopped, extraPadding = true)
        SettingsActionItem(painterResource(MR.images.ic_add), stringResource(MR.strings.whats_new), showCustomModal { _, close -> WhatsNewView(viaSettings = true, close) }, disabled = stopped, extraPadding = true)
        SettingsActionItem(painterResource(MR.images.ic_info), stringResource(MR.strings.about_simplex_chat), showModal { SimpleXInfo(it, onboarding = false) }, extraPadding = true)
-        if (!chatModel.desktopNoUserNoRemote) {
-          SettingsActionItem(painterResource(MR.images.ic_tag), stringResource(MR.strings.chat_with_the_founder), { uriHandler.openVerifiedSimplexUri(simplexTeamUri) }, textColor = MaterialTheme.colors.primary, disabled = stopped, extraPadding = true)
-        }
+        SettingsActionItem(painterResource(MR.images.ic_tag), stringResource(MR.strings.chat_with_the_founder), { uriHandler.openVerifiedSimplexUri(simplexTeamUri) }, textColor = MaterialTheme.colors.primary, disabled = stopped, extraPadding = true)
        SettingsActionItem(painterResource(MR.images.ic_mail), stringResource(MR.strings.send_us_an_email), { uriHandler.openUriCatching("mailto:chat@simplex.chat") }, textColor = MaterialTheme.colors.primary, extraPadding = true)
      }
      SectionDividerSpaced()
@@ -444,42 +469,6 @@ fun PreferenceToggleWithIcon(
  }
 }

-fun doWithAuth(title: String, desc: String, block: () -> Unit) {
-  val requireAuth = chatModel.controller.appPrefs.performLA.get()
-  if (!requireAuth) {
-    block()
-  } else {
-    var autoShow = true
-    ModalManager.fullscreen.showModalCloseable { close ->
-      val onFinishAuth = { success: Boolean ->
-        if (success) {
-          close()
-          block()
-        }
-      }
-
-      LaunchedEffect(Unit) {
-        if (autoShow) {
-          autoShow = false
-          runAuth(title, desc, onFinishAuth)
-        }
-      }
-      Box(
-        Modifier.fillMaxSize().background(MaterialTheme.colors.background),
-        contentAlignment = Alignment.Center
-      ) {
-        SimpleButton(
-          stringResource(MR.strings.auth_unlock),
-          icon = painterResource(MR.images.ic_lock),
-          click = {
-            runAuth(title, desc, onFinishAuth)
-          }
-        )
-      }
-    }
-  }
-}
-
 private fun runAuth(title: String, desc: String, onFinish: (success: Boolean) -> Unit) {
  authenticate(
    title,
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt
@@ -21,7 +21,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.item.ItemAction
@@ -57,9 +56,7 @@ fun UserProfilesView(m: ChatModel, search: MutableState<String>, profileHidden:
        ModalManager.end.closeModals()
      }
      withBGApi {
-        controller.showProgressIfNeeded {
-          m.controller.changeActiveUser(user.remoteHostId, user.userId, userViewPassword(user, searchTextOrPassword.value.trim()))
-        }
+        m.controller.changeActiveUser(user.remoteHostId, user.userId, userViewPassword(user, searchTextOrPassword.value.trim()))
      }
    },
    removeUser = { user ->
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -18,7 +18,6 @@
  <string name="opening_database">Opening database…</string>
  <string name="non_content_uri_alert_title">Invalid file path</string>
  <string name="non_content_uri_alert_text">You shared an invalid file path. Report the issue to the app developers.</string>
-  <string name="app_was_crashed">View crashed</string>

  <!-- Server info - ChatModel.kt -->
  <string name="server_connected">connected</string>
@@ -566,7 +565,6 @@
  <string name="your_settings">Your settings</string>
  <string name="your_simplex_contact_address">Your SimpleX address</string>
  <string name="your_chat_profiles">Your chat profiles</string>
-  <string name="create_chat_profile">Create chat profile</string>
  <string name="database_passphrase_and_export">Database passphrase &amp; export</string>
  <string name="about_simplex_chat">About SimpleX Chat</string>
  <string name="how_to_use_simplex_chat">How to use it</string>
@@ -1661,12 +1659,11 @@
  <string name="unlink_desktop_question">Unlink desktop?</string>
  <string name="unlink_desktop">Unlink</string>
  <string name="disconnect_remote_host">Disconnect</string>
-  <string name="disconnect_remote_hosts">Disconnect mobiles</string>
  <string name="remote_host_was_disconnected_toast"><![CDATA[Mobile <b>%s</b> was disconnected]]></string>
  <string name="disconnect_desktop_question">Disconnect desktop?</string>
  <string name="only_one_device_can_work_at_the_same_time">Only one device can work at the same time</string>
  <string name="open_on_mobile_and_scan_qr_code"><![CDATA[Open <i>Use from desktop</i> in mobile app and scan QR code.]]></string>
-  <string name="waiting_for_mobile_to_connect">Waiting for mobile to connect:</string>
+  <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Waiting for mobile to connect on port <i>%s</i>]]></string>
  <string name="bad_desktop_address">Bad desktop address</string>
  <string name="desktop_incompatible_version">Incompatible version</string>
  <string name="desktop_app_version_is_incompatible">Desktop app version %s is not compatible with this app.</string>
@@ -1692,11 +1689,6 @@
  <string name="paste_desktop_address">Paste desktop address</string>
  <string name="desktop_device">Desktop</string>
  <string name="not_compatible">Not compatible!</string>
-  <string name="refresh_qr_code">Refresh</string>
-  <string name="no_connected_mobile">No connected mobile</string>
-  <string name="random_port">Random</string>
-  <string name="open_port_in_firewall_title">Open port in firewall</string>
-  <string name="open_port_in_firewall_desc">To allow a mobile app to connect to the desktop, open this port in your firewall, if you have it enabled</string>

  <!-- Under development -->
  <string name="in_developing_title">Coming soon!</string>
--- a/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml
@@ -1581,7 +1581,7 @@
    <string name="v5_4_better_groups_descr">Schnellerer Gruppenbeitritt und zuverlässigere Nachrichtenzustellung.</string>
    <string name="linked_mobiles">Verknüpfte Mobiltelefone</string>
    <string name="this_device_name">Dieser Gerätename</string>
-    <string name="waiting_for_mobile_to_connect">Auf die Mobiltelefonverbindung warten:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Auf die Mobiltelefonverbindung über Port <i>%s</i> warten]]></string>
    <string name="loading_remote_file_title">Laden der Datei</string>
    <string name="link_a_mobile">Zu einem Mobiltelefon verbinden</string>
    <string name="settings_section_title_use_from_desktop">Vom Desktop aus nutzen</string>
--- a/apps/multiplatform/common/src/commonMain/resources/MR/fr/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/fr/strings.xml
@@ -1486,7 +1486,7 @@
    <string name="desktop_device">Bureau</string>
    <string name="connected_to_desktop">Connecté au bureau</string>
    <string name="this_device_name">Ce nom d\'appareil</string>
-    <string name="waiting_for_mobile_to_connect">En attente d\'une connexion mobile:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[En attente d\'une connexion mobile sur le port <i>%s</i>]]></string>
    <string name="loading_remote_file_title">Chargement du fichier</string>
    <string name="connecting_to_desktop">Connexion au bureau</string>
    <string name="desktop_devices">Appareils de bureau</string>
--- a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_refresh.svg
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_refresh.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480.433-164.5q-131.583 0-223.758-92.216Q164.5-348.932 164.5-480.082q0-131.149 92.175-223.284Q348.85-795.5 480.5-795.5q84 0 147.75 34.25T738.5-666.5v-129H796V-547H547.5v-57.5H713q-38.032-60.033-96.537-96.767Q557.959-738 480.539-738 372-738 297-663.015q-75 74.986-75 183.25 0 108.265 74.875 183.015Q371.75-222 480.331-222q82.298 0 150.734-47 68.435-47 95.623-124.5H786q-28.5 103-113.49 166-84.991 63-192.077 63Z"/></svg>
--- a/apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml
@@ -1517,6 +1517,6 @@
    <string name="v5_4_more_things_descr">- avvisa facoltativamente i contatti eliminati.
 \n- nomi del profilo con spazi.
 \n- e molto altro!</string>
-    <string name="waiting_for_mobile_to_connect">In attesa che il cellulare si connette:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[In attesa che il cellulare si connetta alla porta <i>%s</i>]]></string>
    <string name="group_member_role_author">autore</string>
 </resources>
--- a/apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml
@@ -1516,7 +1516,7 @@
 \n- en meer!</string>
    <string name="remote_host_was_disconnected_toast"><![CDATA[Mobiele verbinding <b>%s</b> is verbroken]]></string>
    <string name="group_member_role_author">auteur</string>
-    <string name="waiting_for_mobile_to_connect">Wachten tot mobiel verbinding maakt:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Wachten tot mobiel verbinding maakt op poort <i>%s</i>]]></string>
    <string name="multicast_connect_automatically">Automatisch verbinden</string>
    <string name="waiting_for_desktop">Wachten op desktop…</string>
    <string name="found_desktop">Desktop gevonden</string>
--- a/apps/multiplatform/common/src/commonMain/resources/MR/pl/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/pl/strings.xml
@@ -1496,7 +1496,7 @@
    <string name="v5_4_better_groups_descr">Szybsze dołączenie i bardziej niezawodne wiadomości.</string>
    <string name="linked_mobiles">Połączone telefony</string>
    <string name="this_device_name">Nazwa tego urządzenia</string>
-    <string name="waiting_for_mobile_to_connect">Oczekiwanie na połączenie telefonu:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Oczekiwanie na połączenie telefonu na port <i>%s</i>]]></string>
    <string name="loading_remote_file_title">Ładowanie pliku</string>
    <string name="found_desktop">Znaleziono komputer</string>
    <string name="desktop_devices">Urządzenia komputerowe</string>
--- a/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml
@@ -1601,7 +1601,7 @@
    <string name="verify_connection">Проверить соединение</string>
    <string name="multicast_connect_automatically">Соединяться автоматически</string>
    <string name="waiting_for_desktop">Ожидается подключение…</string>
-    <string name="waiting_for_mobile_to_connect">Ожидается подключение мобильного:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[Ожидается подключение мобильного через порт <i>%s</i>]]></string>
    <string name="found_desktop">Компьютер найден</string>
    <string name="not_compatible">Несовместимая версия!</string>
    <string name="group_member_role_author">автор</string>
--- a/apps/multiplatform/common/src/commonMain/resources/MR/zh-rCN/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/zh-rCN/strings.xml
@@ -1517,7 +1517,7 @@
    <string name="v5_4_more_things_descr">- 可选择通知已删除的联系人。
 \n- 带空格的个人资料名称。
 \n- 以及更多！</string>
-    <string name="waiting_for_mobile_to_connect">正等待移动设备 进行连接:</string>
+    <string name="waiting_for_mobile_to_connect_on_port"><![CDATA[正等待移动设备在端口 <i>%s</i> 进行连接]]></string>
    <string name="group_member_role_author">作者</string>
    <string name="multicast_connect_automatically">自动连接</string>
    <string name="waiting_for_desktop">等待桌面中…</string>
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt
@@ -9,142 +9,77 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.awt.ComposeWindow
 import androidx.compose.ui.input.key.*
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.*
 import chat.simplex.common.model.ChatController
 import chat.simplex.common.model.ChatModel
-import chat.simplex.common.platform.*
+import chat.simplex.common.platform.desktopPlatform
 import chat.simplex.common.ui.theme.DEFAULT_START_MODAL_WIDTH
 import chat.simplex.common.ui.theme.SimpleXTheme
 import chat.simplex.common.views.TerminalView
-import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.helpers.FileDialogChooser
+import chat.simplex.common.views.helpers.escapedHtmlToAnnotatedString
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.*
 import java.awt.event.WindowEvent
 import java.awt.event.WindowFocusListener
 import java.io.File
-import kotlin.system.exitProcess

 val simplexWindowState = SimplexWindowState()

-fun showApp() {
-  val closedByError = mutableStateOf(true)
-  while (closedByError.value) {
-    application(exitProcessOnExit = false) {
-      CompositionLocalProvider(
-        LocalWindowExceptionHandlerFactory provides WindowExceptionHandlerFactory { window ->
-          WindowExceptionHandler { e ->
-            AlertManager.shared.showAlertMsg(
-              title = generalGetString(MR.strings.app_was_crashed),
-              text = e.stackTraceToString()
-            )
-            Log.e(TAG, "App crashed, thread name: " + Thread.currentThread().name + ", exception: " + e.stackTraceToString())
-            window.dispatchEvent(WindowEvent(window, WindowEvent.WINDOW_CLOSING))
-            closedByError.value = true
-            // If the left side of screen has open modal, it's probably caused the crash
-            if (ModalManager.start.hasModalsOpen()) {
-              ModalManager.start.closeModal()
-            } else if (ModalManager.center.hasModalsOpen() || ModalManager.end.hasModalsOpen()) {
-              ModalManager.center.closeModal()
-              ModalManager.end.closeModal()
-              // Better to not close fullscreen since it can contain passcode
-            } else {
-              // The last possible cause that can be closed
-              chatModel.chatId.value = null
-              chatModel.chatItems.clear()
-            }
-            chatModel.activeCall.value?.let {
-              withBGApi {
-                chatModel.callManager.endCall(it)
-              }
-            }
-          }
-        }
-      ) {
-        AppWindow(closedByError)
-      }
-    }
-  }
-  exitProcess(0)
-}
-
-@Composable
-private fun ApplicationScope.AppWindow(closedByError: MutableState<Boolean>) {
-  // Creates file if not exists; comes with proper defaults
-  val state = getStoredWindowState()
-  val windowState: WindowState = rememberWindowState(
-    placement = WindowPlacement.Floating,
-    width = state.width.dp,
-    height = state.height.dp,
-    position = WindowPosition(state.x.dp, state.y.dp)
-  )
-
-  LaunchedEffect(
-    windowState.position.x.value,
-    windowState.position.y.value,
-    windowState.size.width.value,
-    windowState.size.height.value
-  ) {
-    storeWindowState(
-      WindowPositionSize(
-        x = windowState.position.x.value.toInt(),
-        y = windowState.position.y.value.toInt(),
-        width = windowState.size.width.value.toInt(),
-        height = windowState.size.height.value.toInt()
-      )
-    )
-  }
-
+fun showApp() = application {
+  // For some reason on Linux actual width will be 10.dp less after specifying it here. If we specify 1366,
+  // it will show 1356. But after that we can still update it to 1366 by changing window state. Just making it +10 now here
+  val width = if (desktopPlatform.isLinux()) 1376.dp else 1366.dp
+  val windowState = rememberWindowState(placement = WindowPlacement.Floating, width = width, height = 768.dp)
  simplexWindowState.windowState = windowState
  // Reload all strings in all @Composable's after language change at runtime
  if (remember { ChatController.appPrefs.appLanguage.state }.value != "") {
-    Window(state = windowState, onCloseRequest = { closedByError.value = false; exitApplication() }, onKeyEvent = {
+    Window(state = windowState, onCloseRequest = ::exitApplication, onKeyEvent = {
      if (it.key == Key.Escape && it.type == KeyEventType.KeyUp) {
        simplexWindowState.backstack.lastOrNull()?.invoke() != null
      } else {
        false
      }
    }, title = "SimpleX") {
-      simplexWindowState.window = window
-      AppScreen()
-      if (simplexWindowState.openDialog.isAwaiting) {
-        FileDialogChooser(
-          title = "SimpleX",
-          isLoad = true,
-          params = simplexWindowState.openDialog.params,
-          onResult = {
-            simplexWindowState.openDialog.onResult(it.firstOrNull())
-          }
-        )
-      }
+      SimpleXTheme {
+        AppScreen()
+        if (simplexWindowState.openDialog.isAwaiting) {
+          FileDialogChooser(
+            title = "SimpleX",
+            isLoad = true,
+            params = simplexWindowState.openDialog.params,
+            onResult = {
+              simplexWindowState.openDialog.onResult(it.firstOrNull())
+            }
+          )
+        }

-      if (simplexWindowState.openMultipleDialog.isAwaiting) {
-        FileDialogChooser(
-          title = "SimpleX",
-          isLoad = true,
-          params = simplexWindowState.openMultipleDialog.params,
-          onResult = {
-            simplexWindowState.openMultipleDialog.onResult(it)
-          }
-        )
-      }
+        if (simplexWindowState.openMultipleDialog.isAwaiting) {
+          FileDialogChooser(
+            title = "SimpleX",
+            isLoad = true,
+            params = simplexWindowState.openMultipleDialog.params,
+            onResult = {
+              simplexWindowState.openMultipleDialog.onResult(it)
+            }
+          )
+        }

-      if (simplexWindowState.saveDialog.isAwaiting) {
-        FileDialogChooser(
-          title = "SimpleX",
-          isLoad = false,
-          params = simplexWindowState.saveDialog.params,
-          onResult = { simplexWindowState.saveDialog.onResult(it.firstOrNull()) }
-        )
-      }
-      val toasts = remember { simplexWindowState.toasts }
-      val toast = toasts.firstOrNull()
-      if (toast != null) {
-        SimpleXTheme {
+        if (simplexWindowState.saveDialog.isAwaiting) {
+          FileDialogChooser(
+            title = "SimpleX",
+            isLoad = false,
+            params = simplexWindowState.saveDialog.params,
+            onResult = { simplexWindowState.saveDialog.onResult(it.firstOrNull()) }
+          )
+        }
+        val toasts = remember { simplexWindowState.toasts }
+        val toast = toasts.firstOrNull()
+        if (toast != null) {
          Box(Modifier.fillMaxSize().padding(bottom = 20.dp), contentAlignment = Alignment.BottomCenter) {
            Text(
              escapedHtmlToAnnotatedString(toast.first, LocalDensity.current),
@@ -153,11 +88,11 @@ private fun ApplicationScope.AppWindow(closedByError: MutableState<Boolean>) {
              style = MaterialTheme.typography.body1
            )
          }
-        }
-        // Shows toast in insertion order with preferred delay per toast. New one will be shown once previous one expires
-        LaunchedEffect(toast, toasts.size) {
-          delay(toast.second)
-          simplexWindowState.toasts.removeFirst()
+          // Shows toast in insertion order with preferred delay per toast. New one will be shown once previous one expires
+          LaunchedEffect(toast, toasts.size) {
+            delay(toast.second)
+            simplexWindowState.toasts.removeFirst()
+          }
        }
      }
      var windowFocused by remember { simplexWindowState.windowFocused }
@@ -206,7 +141,6 @@ class SimplexWindowState {
  val saveDialog = DialogState<File?>()
  val toasts = mutableStateListOf<Pair<String, Long>>()
  var windowFocused = mutableStateOf(true)
-  var window: ComposeWindow? = null
 }

 data class DialogParams(
@@ -235,5 +169,7 @@ class DialogState<T> {
@Preview
@Composable
 fun AppPreview() {
-  AppScreen()
+  SimpleXTheme {
+    AppScreen()
+  }
 }
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/StoreWindowState.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/StoreWindowState.kt
@@ -1,36 +0,0 @@
-package chat.simplex.common
-
-import chat.simplex.common.model.json
-import chat.simplex.common.platform.appPreferences
-import chat.simplex.common.platform.desktopPlatform
-import kotlinx.serialization.*
-
-@Serializable
-data class WindowPositionSize(
-  val width: Int = 1366,
-  val height: Int = 768,
-  val x: Int = 0,
-  val y: Int = 0,
-)
-
-fun getStoredWindowState(): WindowPositionSize =
-  try {
-    val str = appPreferences.desktopWindowState.get()
-    var state = if (str == null) {
-      WindowPositionSize()
-    } else {
-      json.decodeFromString(str)
-    }
-
-    // For some reason on Linux actual width will be 10.dp less after specifying it here. If we specify 1366,
-    // it will show 1356. But after that we can still update it to 1366 by changing window state. Just making it +10 now here
-    if (desktopPlatform.isLinux() && state.width == 1366) {
-      state = state.copy(width = 1376)
-    }
-    state
-  } catch (e: Throwable) {
-    WindowPositionSize()
-  }
-
-fun storeWindowState(state: WindowPositionSize) =
-  appPreferences.desktopWindowState.set(json.encodeToString(state))
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/UI.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/UI.desktop.kt
@@ -19,9 +19,3 @@ actual fun getKeyboardState(): State<KeyboardState> = remember { mutableStateOf(
 actual fun hideKeyboard(view: Any?) {}

 actual fun androidIsFinishingMainActivity(): Boolean = false
-
-actual class GlobalExceptionsHandler: Thread.UncaughtExceptionHandler {
-  actual override fun uncaughtException(thread: Thread, e: Throwable) {
-    Log.e(TAG, "App crashed, thread name: " + thread.name + ", exception: " + e.stackTraceToString())
-  }
-}
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/onboarding/SimpleXInfo.desktop.kt
@@ -1,24 +0,0 @@
-package chat.simplex.common.views.onboarding
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.runtime.Composable
-import chat.simplex.common.model.ChatModel.controller
-import chat.simplex.common.model.SharedPreference
-import chat.simplex.common.model.User
-import chat.simplex.common.platform.chatModel
-import chat.simplex.common.ui.theme.DEFAULT_PADDING
-import chat.simplex.res.MR
-import dev.icerock.moko.resources.compose.painterResource
-
-@Composable
-actual fun OnboardingActionButton(user: User?, onboardingStage: SharedPreference<OnboardingStage>, onclick: (() -> Unit)?) {
-  if (user == null) {
-    Row(horizontalArrangement = Arrangement.spacedBy(DEFAULT_PADDING * 2.5f)) {
-      OnboardingActionButton(MR.strings.link_a_mobile, onboarding = if (controller.appPrefs.initialRandomDBPassphrase.get() && !chatModel.desktopOnboardingRandomPassword.value) OnboardingStage.Step2_5_SetupDatabasePassphrase else OnboardingStage.LinkAMobile, true, icon = painterResource(MR.images.ic_smartphone_300), onclick = onclick)
-      OnboardingActionButton(MR.strings.create_your_profile, onboarding = OnboardingStage.Step2_CreateProfile, true, icon = painterResource(MR.images.ic_desktop), onclick = onclick)
-    }
-  } else {
-    OnboardingActionButton(MR.strings.make_private_connection, onboarding = OnboardingStage.OnboardingComplete, true, onclick = onclick)
-  }
-}
--- a/apps/multiplatform/desktop/src/jvmMain/kotlin/chat/simplex/desktop/Main.kt
+++ b/apps/multiplatform/desktop/src/jvmMain/kotlin/chat/simplex/desktop/Main.kt
@@ -3,6 +3,10 @@ package chat.simplex.desktop
 import chat.simplex.common.platform.*
 import chat.simplex.common.showApp
 import java.io.File
+import java.nio.file.*
+import java.nio.file.attribute.BasicFileAttributes
+import java.nio.file.attribute.FileTime
+import kotlin.io.path.setLastModifiedTime

 fun main() {
  initHaskell()
--- a/apps/multiplatform/gradle.properties
+++ b/apps/multiplatform/gradle.properties
@@ -25,11 +25,11 @@ android.nonTransitiveRClass=true
 android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2

-android.version_name=5.4.1
-android.version_code=164
+android.version_name=5.4
+android.version_code=162

-desktop.version_name=5.4.1
-desktop.version_code=19
+desktop.version_name=5.4
+desktop.version_code=18

 kotlin.version=1.8.20
 gradle.plugin.version=7.4.2
--- a/apps/simplex-broadcast-bot/src/Broadcast/Options.hs
+++ b/apps/simplex-broadcast-bot/src/Broadcast/Options.hs
@@ -83,6 +83,5 @@ mkChatOpts BroadcastBotOpts {coreOptions} =
      allowInstantFiles = True,
      autoAcceptFileSize = 0,
      muteNotifications = True,
-      markRead = False,
      maintenance = False
    }
--- a/apps/simplex-directory-service/src/Directory/Options.hs
+++ b/apps/simplex-directory-service/src/Directory/Options.hs
@@ -5,10 +5,10 @@
 {-# LANGUAGE ScopedTypeVariables #-}

 module Directory.Options
-  ( DirectoryOpts (..),
-    getDirectoryOpts,
-    mkChatOpts,
-  )
+ ( DirectoryOpts (..),
+   getDirectoryOpts,
+   mkChatOpts,
+ )
 where

 import Options.Applicative
@@ -35,8 +35,8 @@ directoryOpts appDir defaultDbFileName = do
          <> help "Comma-separated list of super-users in the format CONTACT_ID:DISPLAY_NAME who will be allowed to manage the directory"
      )
  directoryLog <-
-    Just
-      <$> strOption
+    Just <$>
+      strOption
        ( long "directory-file"
            <> metavar "DIRECTORY_FILE"
            <> help "Append only log for directory state"
@@ -81,6 +81,5 @@ mkChatOpts DirectoryOpts {coreOptions} =
      allowInstantFiles = True,
      autoAcceptFileSize = 0,
      muteNotifications = True,
-      markRead = False,
      maintenance = False
    }
--- a/cabal.project
+++ b/cabal.project
@@ -4,14 +4,12 @@ packages: .

 with-compiler: ghc-9.6.3

-index-state: 2023-10-20T00:00:00Z
-
 constraints: zip +disable-bzip2 +disable-zstd

 source-repository-package
    type: git
    location: https://github.com/simplex-chat/simplexmq.git
-    tag: a860936072172e261480fa6bdd95203976e366b2
+    tag: febf9019e25e3de35f1b005da59e8434e12ae54b

 source-repository-package
    type: git
@@ -48,8 +46,7 @@ source-repository-package
    location: https://github.com/simplex-chat/android-support.git
    tag: 9aa09f148089d6752ce563b14c2df1895718d806

-- TODO this fork is only needed to compile with GHC 8.10.7 - it allows previous base version
 source-repository-package
    type: git
-    location: https://github.com/simplex-chat/zip.git
-    tag: bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc
+    location: https://github.com/simplex-chat/network-transport.git
+    tag: 0013798272a683e35ca38d2fdaf480942311fba8
--- a/docs/guide/app-settings.md
+++ b/docs/guide/app-settings.md
@@ -45,8 +45,6 @@ When people connect to you via this address, you will receive a connection reque

 If you start receiving too many requests via this address it is always safe to remove it – all the connections you created via this address will remain active, as this address is not used to deliver the messages.

-See the comparison with [1-time invitation links](./making-connections.md#comparison-of-1-time-invitation-links-and-simplex-contact-addresses).
-
 Read more in [this post](../../blog/20221108-simplex-chat-v4.2-security-audit-new-website.md#auto-accept-contact-requests).

 ### Chat preferences
--- a/docs/guide/making-connections.md
+++ b/docs/guide/making-connections.md
@@ -13,71 +13,6 @@ Private Connection — connect using an invitation link or QR code via video or

 Group Chat — Users have the option to create a secret group, share their contact link [which can be deleted later on], or generate a one-time invitation link.

-## Your SimpleX contact address
-
-You can [create an optional long term address](./app-settings.md#your-simplex-contact-address) for other people to connect with you. Unlike 1-time invitation links, these addresses can be used many times, that makes them good to share online, e.g. on social media platforms, or in email signatures. That helps more people discover SimpleX Chat, so please do it!
-
-When people connect to you via this address, you will receive a connection request that you can accept or reject. You can configure an automatic acceptance of connection request and an automatic welcome message that will be sent to the new contacts. You can also share this address as part of your SimpleX profile, so group members can connect to you, and your contacts can share it with others - if this is something that you want.
-
-If you start receiving too many requests via this address it is always safe to remove it – all the connections you created via this address will remain active, as this address is not used to deliver the messages.
-
-### Comparison of 1-time invitation links and SimpleX Contact addresses
-
-<table>
-  <tr>
-    <th></th>
-    <th>1-time invitation link</th>
-    <th>SimpleX contact address</th>
-  </tr>
-  <tr>
-    <td>Can be used many times?</td>
-    <td>No</td>
-    <td>Yes</td>
-  </tr>
-  <tr>
-    <td>Can be included in user profile?</td>
-    <td>No, as it can only be used once.</td>
-    <td>Yes, to allow group members to connect directly, and your contacts to pass it on to their contacts.</td>
-  </tr>
-  <tr>
-    <td>When to use it?</td>
-    <td>With somebody you know, via another communication channel or QR code (in person or during a video call)</td>
-    <td>Where many people can see and connect via it, e.g. in email signature, website, social media or group chat.</td>
-  </tr>
-  <tr>
-    <td>Security</td>
-    <td>More secure, as can only be used once, and the initial connection request (including profile) is encrypted with double ratchet.</td>
-    <td>Initial connection request is also e2e encrypted, but without double ratchet (it is initialized when request is accepted).</td>
-  </tr>
-  <tr>
-    <td>Identification</td>
-    <td>Both sides know who they connect to, as they know with whom and by who the link was shared. You can attach alias to this invitation as soon as you share it or use it, to identify the other person when connection is established.</td>
-    <td>Only the person using the address knows who they connect to, via the channel where they found the address (email, social media, etc.). The address owner can only see the user profile of the request, and has no proof of identity from the person sending the request<sup>*</sup>.</td>
-  </tr>
-  <tr>
-    <td>Advantages over other platforms</td>
-    <td>There is no direct analogy, other platforms don’t offer one-time invitations without any fixed part identifying the user.</td>
-    <td>Unlike addresses in other platforms, SimpleX addresses are not used to deliver the messages &mdash; only the initial connection requests.<br>It means that removing this address will not break the contacts made via it (like changing an email address would), it would only prevent new connections, which makes it a good solution against spam and abuse.</td>
-  </tr>
-  <tr>
-    <td>Vulnerability to attacks</td>
-    <td>Until the connection is established, anybody who intercepts this link can connect to it, so it has to be verified with the original contact that the connection succeeded.</td>
-    <td>These addresses are vulnerable to connection request spam. Unlike other platforms, you can delete or change the address, without losing any contacts (see above).</td>
-  </tr>
-  <tr>
-    <td>Passive attacks on connection links</td>
-    <td colspan="2">Both types of links are not vulnerable if simply observed &mdash; they only contain public keys. So they can be safely shared via insecure or public channels, as long as you can confirm that you connected to the intended person.</td>
-  </tr>
-  <tr>
-    <td>Active attacks on connection links</td>
-    <td colspan="2">If the link is substituted via the attack on the channel used to share it, the connection security can be compromised, and the original messages monitored (man-in-the-middle attack). If it is a real risk then security code should be verified to mitigate it - doing so proves<sup>**</sup> that the link and keys were not substituted, and that the end-to-end encryption is secure.</td>
-  </tr>
-</table>
-
-<sup>*</sup> Adding optional verified identities that we plan in the future will change it &mdash; the address owner will have an option to request identity verification before accepting the connection.
-
-<sup>**</sup> Connection security code is the cryptographic hash (SHA256) of combined public keys of both sides &mdash; there are 2<sup>256</sup> possible security codes (1 with 77 zeros – about [1000 times smaller](https://www.wolframalpha.com/input?i=2%5E256) than the estimated number of atoms in the visible universe).
-
 ## Conversation preferences

 Tap on one of your conversations to open conversation preferences.
--- a/docs/rfcs/2023-11-21-inactive-group-members.md
+++ b/docs/rfcs/2023-11-21-inactive-group-members.md
@@ -1,110 +0,0 @@
-# Inactive group members
-
-## Problem
-
-Group traffic is higher than necessary due to lack of diagnosis of inactive group members. By inactive we understand group members who went offline for indefinitely long time, uninstalled application without leaving group, failed to send x.grp.leave message before deleting connection, or in any other way failed to explicitly communicate further inactivity.
-
-Currently other group members continue to identify such members as active and to send messages to their connections until exceeding receiving SMP queues quotas, with pending messages being slowly retried even after that.
-
-## Solution
-
-Identify inactive members and don't send messages to their connections. Silent periodically online members should continue to receive messages, so decision to mark member as inactive should be made conservatively.
-
-Agent:
- on SMP.QUOTA error notify client with ERR CONN QUOTA (new ConnectionErrorType QUOTA).
- on receiving QCONT notify client (new event).
-
-Chat, on sending side, per member:
- unanswered_snd_msg_count - number of messages that were sent consecutively without receiving a message from member.
- last_rcv_ts - timestamp of last received message.
- inactive flag.
- set inactive if:
-  - agent reports QUOTA error.
-  - on sending message: (unanswered_snd_msg_count > K) && (last_rcv_ts earlier than Ddiff days ago), Ddiff = 1/2/3 days?
- reset inactive:
-  - on receiving QCONT.
-  - on receiving message or receipt. Also reset unanswered_snd_msg_count, last_rcv_ts.
- don't send to member if inactive.
-  - don't send only content messages (x.msg.new, etc.) and always send messages altering group state?
- unanswered_snd_msg_count, last_rcv_ts to be tracked, checked, reset only for members with compatible version.
-
-Chat, on receiving side, per member:
- unanswered_rcv_msg_count - number of messages that were received consecutively without sending a message to member.
- send non-optional receipt / another (new) protocol message if:
-  - on receiving message: unanswered_rcv_msg_count > M, M < K.
- on sending a message or receipt to member reset unanswered_rcv_msg_count.
- unanswered_rcv_msg_count to be tracked, checked, reset only for members with compatible version.
-
-\***
-
-Consider above condition:
-
-> (unanswered_snd_msg_count > K) && (last_rcv_ts earlier than Ddiff days ago)
-
-It still doesn't account for following situation:
-
-1. Sending member sends a few (N1, N1 < M) messages to silent member on day D1.
-2. Sending member doesn't send messages for several days.
-3. Sending member sends more messages (N2, N1 + N2 > K) to silent member on day DI (DI - D1 > diff in days in above condition), while silent member is offline.
-  - Sending member checks above condition and evaluates it to be true, marks silent member as inactive.
-  - Simply remembering last_snd_ts on sending side and adding check for it not being from several days ago to above condition is not enough, as it will be overwritten by current day sends and will only evaluate false for the first send. What could work is remembering prev_session_last_snd_ts or prev_day_last_snd_ts, but it further complicates logic, and still probably wouldn't account for some time zone differences.
-4. Sending member sends yet more messages, which will not be queued for silent member marked inactive.
-5. Silent member comes online, sends receipt upon receiving message fulfilling above condition: `unanswered_rcv_msg_count > M`, and will lose following messages.
-  - If sending member created messages from 4 as pending, and sent them upon receiving receipt from silent member, silent member would only receive them after sending member coming online. If they are in different time zones it may happen on next day.
-
-Same situation can occur even without step 1, simply by sending many messages while other member is offline.
-
-The problem is less acute the greater the difference between K and M, but making K >> M renders this whole mechanism obsolete, as we could then simply rely on QUOTA errors to mark group members inactive (and don't slow retry in agent?).
-
-Perhaps an acceptable way to solve this problem is to add a task to cleanup manager that would send receipts to all members on condition: (unanswered_rcv_msg_count > 0) && (last_reply_ts earlier than 1 day ago). (Adds last_reply_ts to tracking on receiving side). Perhaps it should be a task separate from cleanup manager that only occurs once per start, or with longer interval.
-
-\***
-
-Additionally we could consider group member connection as disabled with smaller AUTH error count. Currently it's 10 messages, could be 1.
-
-### Delivery suspension notice
-
-When receiving side comes back online, replies and continues to receive messages, it has no way of knowing there was a gap in messages from sending member. To notify receiving member about delivery suspension, sending member should send notice containing shared message id of the last sent message (new protocol event) to them:
-
-```haskell
-XGrpMemSuspended :: SharedMsgId -> ChatMsgEvent 'Json
-```
-
-Sending side additionally tracks:
- xgrpmemsuspended_sent flag - to only send it once.
-
-When processing it, receiving member creates a "gap" chat item (e.g. event saying "member x suspended delivery to you due to your inactivity, there may be a gap in messages").
-
-After receiving member signals activity by sending any reply, sending member may send message history before continuing normal delivery.
-
-Starting point for message history: either receiving member could request history starting from specific shared message id (received in XGrpMemSuspended) with another new protocol event, or sending member can remember it instead of just flag.
-
-### Sending message history
-
-New protocol event:
-
-```haskell
-XGrpMsgHistory :: [ChatMessage 'Json] -> ChatMsgEvent 'Json
-```
-
-Sending member builds messages history starting starting from requested/remembered shared message id:
- `messages` table is periodically cleaned up, so messages would be retrieved from `chat_items`.
- if chat item for starting shared message id is not found (it may have been deleted manually or as a disappearing message), abort?
-  - sending member could track number of skipped messages per member, but again if any chat items were deleted, older (previously successfully sent) chat items would be retrieved, resulting in duplicate messages. If receiving member has also cleaned up records in `messages` table, they wouldn't be deduplicated.
-  - sending member could track timestamp of first unsent message instead of shared msg id.
- sending member should probably limit maximum number of messages sent as history (100?).
- only XMsgNew events should be sent in XGrpMsgHistory (chat items to be transformed back into text messages).
-  - updates, deletions would be reflected in chat item list.
-  - reactions would be omitted.
-  - files would be likely expired by the time of sending history, so only file name and size may be sent in FileInvitation, with invitation being practically not acceptable.
-    - add new flag to CIFile "expired" for receiving member to mark chat items created based on such invitations.
-    - FileInvitation in MsgContainer could also contain this flag as optional to explicitly communicate that only file metadata is sent.
-    - alternatively sending member could re-upload files, but this seems excessive.
-  - XMsgNew events don't include message timestamps (instead usually broker ts is retrieved from agent message meta), so receiving member wouldn't be able to restore them from history. Perhaps history should include XGrpMsgForward events containing XMsgNew events instead.
- XGrpMsgHistory is likely to exceed message block limit.
-  - either multiple messages comprising a history can be batched as a single message on chat level until the block size is exceeded.
-  - or large history messages could be batched on agent level.
-
-\***
-
-Same XGrpMsgHistory protocol event could be sent by host to new members, after sending introductions.
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 5.4.0.7
+version: 5.4.0.6
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme
@@ -19,6 +19,7 @@ dependencies:
  - attoparsec == 0.14.*
  - base >= 4.7 && < 5
  - base64-bytestring >= 1.0 && < 1.3
+  - bytestring == 0.11.*
  - composition == 1.0.*
  - constraints >= 0.12 && < 0.14
  - containers == 0.6.*
@@ -32,7 +33,7 @@ dependencies:
  - http-types == 0.12.*
  - http2 >= 4.2.2 && < 4.3
  - memory == 0.18.*
-  - mtl >= 2.3.1 && < 3.0
+  - mtl == 2.3.*
  - network >= 3.1.2.7 && < 3.2
  - network-transport == 0.5.6
  - optparse-applicative >= 0.15 && < 0.17
@@ -44,7 +45,9 @@ dependencies:
  - socks == 0.6.*
  - sqlcipher-simple == 0.4.*
  - stm == 2.5.*
+  - template-haskell == 2.20.*
  - terminal == 0.2.*
+  - text == 2.0.*
  - time == 1.9.*
  - tls >= 1.6.0 && < 1.7
  - unliftio == 0.2.*
@@ -61,16 +64,6 @@ when:
  - condition: flag(swift)
    cpp-options:
      - -DswiftJSON
-  - condition: impl(ghc >= 9.6.2)
-    dependencies:
-      - bytestring == 0.11.*
-      - template-haskell == 2.20.*
-      - text >= 2.0.1 && < 2.2
-  - condition: impl(ghc < 9.6.2)
-    dependencies:
-      - bytestring == 0.10.*
-      - template-haskell == 2.16.*
-      - text >= 1.2.3.0 && < 1.3

 library:
  source-dirs: src
--- a/packages/simplex-chat-client/typescript/src/response.ts
+++ b/packages/simplex-chat-client/typescript/src/response.ts
@@ -86,6 +86,7 @@ export type ChatResponse =
  | CRGroupUpdated
  | CRUserContactLinkSubscribed
  | CRUserContactLinkSubError
+  | CRNewContactConnection
  | CRContactConnectionDeleted
  | CRMessageError
  | CRChatCmdError
@@ -730,6 +731,12 @@ export interface CRUserContactLinkSubError extends CR {
  chatError: ChatError
 }

+export interface CRNewContactConnection extends CR {
+  type: "newContactConnection"
+  user: User
+  connection: PendingContactConnection
+}
+
 export interface CRContactConnectionDeleted extends CR {
  type: "contactConnectionDeleted"
  user: User
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."a860936072172e261480fa6bdd95203976e366b2" = "16rwnh5zzphmw8d8ypvps6xjvzbmf5ljr6zzy15gz2g0jyh7hd91";
+  "https://github.com/simplex-chat/simplexmq.git"."febf9019e25e3de35f1b005da59e8434e12ae54b" = "0rd6cf600978l7xp1sajn9lswml72ms0f55h5q7rxbwpbgx9c3if";
  "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
  "https://github.com/kazu-yamamoto/http2.git"."f5525b755ff2418e6e6ecc69e877363b0d0bcaeb" = "0fyx0047gvhm99ilp212mmz37j84cwrfnpmssib5dw363fyb88b6";
  "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
@@ -7,5 +7,5 @@
  "https://github.com/simplex-chat/aeson.git"."aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b" = "0jz7kda8gai893vyvj96fy962ncv8dcsx71fbddyy8zrvc88jfrr";
  "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj";
  "https://github.com/simplex-chat/android-support.git"."9aa09f148089d6752ce563b14c2df1895718d806" = "0pbf2pf13v2kjzi397nr13f1h3jv0imvsq8rpiyy2qyx5vd50pqn";
-  "https://github.com/simplex-chat/zip.git"."bd421c6b19cc4c465cd7af1f6f26169fb8ee1ebc" = "1csqfjhvc8wb5h4kxxndmb6iw7b4ib9ff2n81hrizsmnf45a6gg0";
+  "https://github.com/simplex-chat/network-transport.git"."0013798272a683e35ca38d2fdaf480942311fba8" = "0dnn62apgvc248df0m8ib7phrzn63wm0xs71xvlypv52j6cgwzkb";
 }
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack

 name:           simplex-chat
-version:        5.4.0.7
+version:        5.4.0.6
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat
@@ -171,6 +171,7 @@ library
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -184,7 +185,7 @@ library
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , mtl ==2.3.*
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
@@ -196,7 +197,9 @@ library
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell ==2.20.*
    , terminal ==0.2.*
+    , text ==2.0.*
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
@@ -205,16 +208,6 @@ library
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable simplex-bot
  main-is: Main.hs
@@ -230,6 +223,7 @@ executable simplex-bot
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -243,7 +237,7 @@ executable simplex-bot
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , mtl ==2.3.*
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
@@ -256,7 +250,9 @@ executable simplex-bot
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell ==2.20.*
    , terminal ==0.2.*
+    , text ==2.0.*
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
@@ -265,16 +261,6 @@ executable simplex-bot
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable simplex-bot-advanced
  main-is: Main.hs
@@ -290,6 +276,7 @@ executable simplex-bot-advanced
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -303,7 +290,7 @@ executable simplex-bot-advanced
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , mtl ==2.3.*
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
@@ -316,7 +303,9 @@ executable simplex-bot-advanced
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell ==2.20.*
    , terminal ==0.2.*
+    , text ==2.0.*
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
@@ -325,16 +314,6 @@ executable simplex-bot-advanced
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable simplex-broadcast-bot
  main-is: ../Main.hs
@@ -352,6 +331,7 @@ executable simplex-broadcast-bot
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -365,7 +345,7 @@ executable simplex-broadcast-bot
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , mtl ==2.3.*
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
@@ -378,7 +358,9 @@ executable simplex-broadcast-bot
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell ==2.20.*
    , terminal ==0.2.*
+    , text ==2.0.*
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
@@ -387,16 +369,6 @@ executable simplex-broadcast-bot
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable simplex-chat
  main-is: Main.hs
@@ -413,6 +385,7 @@ executable simplex-chat
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -426,7 +399,7 @@ executable simplex-chat
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , mtl ==2.3.*
    , network ==3.1.*
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
@@ -439,7 +412,9 @@ executable simplex-chat
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell ==2.20.*
    , terminal ==0.2.*
+    , text ==2.0.*
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
@@ -449,16 +424,6 @@ executable simplex-chat
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable simplex-directory-service
  main-is: ../Main.hs
@@ -478,6 +443,7 @@ executable simplex-directory-service
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -491,7 +457,7 @@ executable simplex-directory-service
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , mtl ==2.3.*
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
@@ -504,7 +470,9 @@ executable simplex-directory-service
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell ==2.20.*
    , terminal ==0.2.*
+    , text ==2.0.*
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
@@ -513,16 +481,6 @@ executable simplex-directory-service
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 test-suite simplex-chat-test
  type: exitcode-stdio-1.0
@@ -566,6 +524,7 @@ test-suite simplex-chat-test
    , attoparsec ==0.14.*
    , base >=4.7 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.11.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
@@ -582,7 +541,7 @@ test-suite simplex-chat-test
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , mtl ==2.3.*
    , network ==3.1.*
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
@@ -596,7 +555,9 @@ test-suite simplex-chat-test
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell ==2.20.*
    , terminal ==0.2.*
+    , text ==2.0.*
    , time ==1.9.*
    , tls >=1.6.0 && <1.7
    , unliftio ==0.2.*
@@ -605,13 +566,3 @@ test-suite simplex-chat-test
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -1403,6 +1403,7 @@ processChatCommand = \case
    subMode <- chatReadVar subscriptionMode
    (connId, cReq) <- withAgent $ \a -> createConnection a (aUserId user) True SCMInvitation Nothing subMode
    conn <- withStore' $ \db -> createDirectConnection db user connId cReq ConnNew incognitoProfile subMode
+    toView $ CRNewContactConnection user conn
    pure $ CRInvitation user cReq conn
  AddContact incognito -> withUser $ \User {userId} ->
    processChatCommand $ APIAddContact userId incognito
@@ -1432,7 +1433,8 @@ processChatCommand = \case
    dm <- directMessage $ XInfo profileToSend
    connId <- withAgent $ \a -> joinConnection a (aUserId user) True cReq dm subMode
    conn <- withStore' $ \db -> createDirectConnection db user connId cReq ConnJoined (incognitoProfile $> profileToSend) subMode
-    pure $ CRSentConfirmation user conn
+    toView $ CRNewContactConnection user conn
+    pure $ CRSentConfirmation user
  APIConnect userId incognito (Just (ACR SCMContact cReq)) -> withUserId userId $ \user -> connectViaContact user incognito cReq
  APIConnect _ _ Nothing -> throwChatError CEInvalidConnReq
  Connect incognito aCReqUri@(Just cReqUri) -> withUser $ \user@User {userId} -> do
@@ -2104,7 +2106,8 @@ processChatCommand = \case
        connect' groupLinkId cReqHash xContactId = do
          (connId, incognitoProfile, subMode) <- requestContact user incognito cReq xContactId
          conn <- withStore' $ \db -> createConnReqConnection db userId connId cReqHash xContactId incognitoProfile groupLinkId subMode
-          pure $ CRSentInvitation user conn incognitoProfile
+          toView $ CRNewContactConnection user conn
+          pure $ CRSentInvitation user incognitoProfile
    connectContactViaAddress :: User -> IncognitoEnabled -> Contact -> ConnectionRequestUri 'CMContact -> m ChatResponse
    connectContactViaAddress user incognito ct cReq =
      withChatLock "connectViaContact" $ do
--- a/src/Simplex/Chat/Controller.hs
+++ b/src/Simplex/Chat/Controller.hs
@@ -557,8 +557,8 @@ data ChatResponse
  | CRInvitation {user :: User, connReqInvitation :: ConnReqInvitation, connection :: PendingContactConnection}
  | CRConnectionIncognitoUpdated {user :: User, toConnection :: PendingContactConnection}
  | CRConnectionPlan {user :: User, connectionPlan :: ConnectionPlan}
-  | CRSentConfirmation {user :: User, connection :: PendingContactConnection}
-  | CRSentInvitation {user :: User, connection :: PendingContactConnection, customUserProfile :: Maybe Profile}
+  | CRSentConfirmation {user :: User}
+  | CRSentInvitation {user :: User, customUserProfile :: Maybe Profile}
  | CRSentInvitationToContact {user :: User, contact :: Contact, customUserProfile :: Maybe Profile}
  | CRContactUpdated {user :: User, fromContact :: Contact, toContact :: Contact}
  | CRGroupMemberUpdated {user :: User, groupInfo :: GroupInfo, fromMember :: GroupMember, toMember :: GroupMember}
@@ -655,6 +655,7 @@ data ChatResponse
  | CRNtfTokenStatus {status :: NtfTknStatus}
  | CRNtfToken {token :: DeviceToken, status :: NtfTknStatus, ntfMode :: NotificationsMode}
  | CRNtfMessages {user_ :: Maybe User, connEntity :: Maybe ConnectionEntity, msgTs :: Maybe UTCTime, ntfMessages :: [NtfMsgInfo]}
+  | CRNewContactConnection {user :: User, connection :: PendingContactConnection}
  | CRContactConnectionDeleted {user :: User, connection :: PendingContactConnection}
  | CRRemoteHostList {remoteHosts :: [RemoteHostInfo]}
  | CRCurrentRemoteHost {remoteHost_ :: Maybe RemoteHostInfo}
--- a/src/Simplex/Chat/Mobile.hs
+++ b/src/Simplex/Chat/Mobile.hs
@@ -189,7 +189,6 @@ mobileChatOpts dbFilePrefix dbKey =
      allowInstantFiles = True,
      autoAcceptFileSize = 0,
      muteNotifications = True,
-      markRead = False,
      maintenance = True
    }

--- a/src/Simplex/Chat/Options.hs
+++ b/src/Simplex/Chat/Options.hs
@@ -42,7 +42,6 @@ data ChatOpts = ChatOpts
    allowInstantFiles :: Bool,
    autoAcceptFileSize :: Integer,
    muteNotifications :: Bool,
-    markRead :: Bool,
    maintenance :: Bool
  }

@@ -269,12 +268,6 @@ chatOptsP appDir defaultDbFileName = do
      ( long "mute"
          <> help "Mute notifications"
      )
-  markRead <-
-    switch
-      ( long "mark-read"
-          <> short 'r'
-          <> help "Mark shown messages as read"
-      )
  maintenance <-
    switch
      ( long "maintenance"
@@ -293,7 +286,6 @@ chatOptsP appDir defaultDbFileName = do
        allowInstantFiles,
        autoAcceptFileSize,
        muteNotifications,
-        markRead,
        maintenance
      }

--- a/src/Simplex/Chat/Terminal.hs
+++ b/src/Simplex/Chat/Terminal.hs
@@ -44,7 +44,7 @@ simplexChatTerminal cfg opts t =
  handle checkDBKeyError . simplexChatCore cfg opts $ \u cc -> do
    ct <- newChatTerminal t opts
    when (firstTime cc) . printToTerminal ct $ chatWelcome u
-    runChatTerminal ct cc opts
+    runChatTerminal ct cc

 checkDBKeyError :: SQLError -> IO ()
 checkDBKeyError e = case sqlError e of
@@ -53,5 +53,5 @@ checkDBKeyError e = case sqlError e of
    exitFailure
  _ -> throwIO e

-runChatTerminal :: ChatTerminal -> ChatController -> ChatOpts -> IO ()
-runChatTerminal ct cc opts = raceAny_ [runTerminalInput ct cc, runTerminalOutput ct cc opts, runInputLoop ct cc]
+runChatTerminal :: ChatTerminal -> ChatController -> IO ()
+runChatTerminal ct cc = raceAny_ [runTerminalInput ct cc, runTerminalOutput ct cc, runInputLoop ct cc]
--- a/src/Simplex/Chat/Terminal/Output.hs
+++ b/src/Simplex/Chat/Terminal/Output.hs
@@ -142,13 +142,13 @@ withTermLock ChatTerminal {termLock} action = do
  action
  atomically $ putTMVar termLock ()

-runTerminalOutput :: ChatTerminal -> ChatController -> ChatOpts -> IO ()
-runTerminalOutput ct cc@ChatController {outputQ, showLiveItems, logFilePath} ChatOpts {markRead} = do
+runTerminalOutput :: ChatTerminal -> ChatController -> IO ()
+runTerminalOutput ct cc@ChatController {outputQ, showLiveItems, logFilePath} = do
  forever $ do
    (_, outputRH, r) <- atomically $ readTBQueue outputQ
    case r of
-      CRNewChatItem u ci -> when markRead $ markChatItemRead u ci
-      CRChatItemUpdated u ci -> when markRead $ markChatItemRead u ci
+      CRNewChatItem u ci -> markChatItemRead u ci
+      CRChatItemUpdated u ci -> markChatItemRead u ci
      CRRemoteHostConnected {remoteHost = RemoteHostInfo {remoteHostId}} -> getRemoteUser remoteHostId
      CRRemoteHostStopped {remoteHostId_} -> mapM_ removeRemoteUser remoteHostId_
      _ -> pure ()
--- a/src/Simplex/Chat/View.hs
+++ b/src/Simplex/Chat/View.hs
@@ -164,8 +164,8 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
  CRInvitation u cReq _ -> ttyUser u $ viewConnReqInvitation cReq
  CRConnectionIncognitoUpdated u c -> ttyUser u $ viewConnectionIncognitoUpdated c
  CRConnectionPlan u connectionPlan -> ttyUser u $ viewConnectionPlan connectionPlan
-  CRSentConfirmation u _ -> ttyUser u ["confirmation sent!"]
-  CRSentInvitation u _ customUserProfile -> ttyUser u $ viewSentInvitation customUserProfile testView
+  CRSentConfirmation u -> ttyUser u ["confirmation sent!"]
+  CRSentInvitation u customUserProfile -> ttyUser u $ viewSentInvitation customUserProfile testView
  CRSentInvitationToContact u _c customUserProfile -> ttyUser u $ viewSentInvitation customUserProfile testView
  CRContactDeleted u c -> ttyUser u [ttyContact' c <> ": contact is deleted"]
  CRContactDeletedByContact u c -> ttyUser u [ttyFullContact c <> " deleted contact with you"]
@@ -275,6 +275,7 @@ responseToView hu@(currentRH, user_) ChatConfig {logLevel, showReactions, showRe
  CRCallInvitations _ -> []
  CRUserContactLinkSubscribed -> ["Your address is active! To show: " <> highlight' "/sa"]
  CRUserContactLinkSubError e -> ["user address error: " <> sShow e, "to delete your address: " <> highlight' "/da"]
+  CRNewContactConnection u _ -> ttyUser u []
  CRContactConnectionDeleted u PendingContactConnection {pccConnId} -> ttyUser u ["connection :" <> sShow pccConnId <> " deleted"]
  CRNtfTokenStatus status -> ["device token status: " <> plain (smpEncode status)]
  CRNtfToken _ status mode -> ["device token status: " <> plain (smpEncode status) <> ", notifications mode: " <> plain (strEncode mode)]
--- a/stack.yaml
+++ b/stack.yaml
@@ -0,0 +1,98 @@
+# This file was automatically generated by 'stack init'
+#
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# https://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+#
+# resolver: lts-3.5
+# resolver: nightly-2015-09-21
+# resolver: ghc-7.10.2
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# resolver: ./custom-snapshot.yaml
+# resolver: https://example.com/snapshots/2018-01-01.yaml
+resolver: lts-18.21
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+#
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+#   subdirs:
+#   - auto-update
+#   - wai
+packages:
+  - .
+# Dependency packages to be pulled from upstream that are not in the resolver.
+# These entries can reference officially published versions as well as
+# forks / in-progress versions pinned to a git hash. For example:
+#
+extra-deps:
+  - cryptostore-0.2.1.0@sha256:9896e2984f36a1c8790f057fd5ce3da4cbcaf8aa73eb2d9277916886978c5b19,3881
+  - network-3.1.2.7@sha256:e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568,4888
+  - simple-logger-0.1.0@sha256:be8ede4bd251a9cac776533bae7fb643369ebd826eb948a9a18df1a8dd252ff8,1079
+  - tls-1.6.0@sha256:7ae39373fd2de27fb80e90f76d22aeeb9a074a0ddd120cbd02c9c52f516a9e55,6987
+  # below hackage dependencies are to update Aeson to 2.0.3
+  - OneTuple-0.3.1@sha256:a848c096c9d29e82ffdd30a9998aa2931cbccb3a1bc137539d80f6174d31603e,2262
+  - attoparsec-0.14.4@sha256:79584bdada8b730cb5138fca8c35c76fbef75fc1d1e01e6b1d815a5ee9843191,5810
+  - hashable-1.4.0.2@sha256:0cddd0229d1aac305ea0404409c0bbfab81f075817bd74b8b2929eff58333e55,5005
+  - semialign-1.2.0.1@sha256:0e179b4d3a8eff79001d374d6c91917c6221696b9620f0a4d86852fc6a9b9501,2836
+  - text-short-0.1.5@sha256:962c6228555debdc46f758d0317dea16e5240d01419b42966674b08a5c3d8fa6,3498
+  - time-compat-1.9.6.1@sha256:42d8f2e08e965e1718917d54ad69e1d06bd4b87d66c41dc7410f59313dba4ed1,5033
+  # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561
+  # - ../simplexmq
+  - github: simplex-chat/simplexmq
+    commit: febf9019e25e3de35f1b005da59e8434e12ae54b
+  - github: kazu-yamamoto/http2
+    commit: f5525b755ff2418e6e6ecc69e877363b0d0bcaeb
+  # - ../direct-sqlcipher
+  - github: simplex-chat/direct-sqlcipher
+    commit: f814ee68b16a9447fbb467ccc8f29bdd3546bfd9
+  # - ../sqlcipher-simple
+  - github: simplex-chat/sqlcipher-simple
+    commit: a46bd361a19376c5211f1058908fc0ae6bf42446
+  # - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
+  - github: simplex-chat/aeson
+    commit: aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b
+  - github: simplex-chat/haskell-terminal
+    commit: f708b00009b54890172068f168bf98508ffcd495
+  - github: simplex-chat/android-support
+    commit: 9aa09f148089d6752ce563b14c2df1895718d806
+  - github: simplex-chat/network-transport
+    commit: 0013798272a683e35ca38d2fdaf480942311fba8
+#
+# extra-deps: []
+
+# Override default flag values for local packages and extra-deps
+flags:
+  zip:
+    disable-bzip2: true
+    disable-zstd: true
+  direct-sqlcipher:
+    openssl: true
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+#
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=2.1"
+#
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+#
+# Extra directories used by stack for building
+# extra-lib-dirs: [/path/to/dir]
+#
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor
--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -82,7 +82,6 @@ testOpts =
      allowInstantFiles = True,
      autoAcceptFileSize = 0,
      muteNotifications = True,
-      markRead = True,
      maintenance = False
    }

@@ -175,7 +174,7 @@ startTestChat_ db cfg opts user = do
  t <- withVirtualTerminal termSettings pure
  ct <- newChatTerminal t opts
  cc <- newChatController db (Just user) cfg opts
-  chatAsync <- async . runSimplexChat opts user cc $ \_u cc' -> runChatTerminal ct cc' opts
+  chatAsync <- async . runSimplexChat opts user cc . const $ runChatTerminal ct
  atomically . unless (maintenance opts) $ readTVar (agentAsync cc) >>= \a -> when (isNothing a) retry
  termQ <- newTQueueIO
  termAsync <- async $ readTerminalOutput t termQ
--- a/tests/RemoteTests.hs
+++ b/tests/RemoteTests.hs
@@ -162,13 +162,13 @@ storedBindingsTest = testChat2 aliceProfile aliceDesktopProfile $ \mobile deskto

  desktop ##> "/list remote hosts"
  desktop <## "Remote hosts:"
-  desktop <##. "1. Mobile (connected) ["
+  desktop <## "1. Mobile (connected) [lo 127.0.0.1:52230]"
  stopDesktop mobile desktop
  desktop ##> "/list remote hosts"
  desktop <## "Remote hosts:"
-  desktop <##. "1. Mobile ["
+  desktop <## "1. Mobile [lo 127.0.0.1:52230]"

-- TODO: more parser tests
+  -- TODO: more parser tests

 remoteMessageTest :: HasCallStack => FilePath -> IO ()
 remoteMessageTest = testChat3 aliceProfile aliceDesktopProfile bobProfile $ \mobile desktop bob -> do
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480.433-164.5q-131.583 0-223.758-92.216Q164.5-348.932 164.5-480.082q0-131.149 92.175-223.284Q348.85-795.5 480.5-795.5q84 0 147.75 34.25T738.5-666.5v-129H796V-547H547.5v-57.5H713q-38.032-60.033-96.537-96.767Q557.959-738 480.539-738 372-738 297-663.015q-75 74.986-75 183.25 0 108.265 74.875 183.015Q371.75-222 480.331-222q82.298 0 150.734-47 68.435-47 95.623-124.5H786q-28.5 103-113.49 166-84.991 63-192.077 63Z"/></svg>