Merge tag 'v6.0.5' into stable-fdroid

* android, desktop: proxy configuration includes credentials

* migration

* changes for disabled socks

* migration

* port

* new logic

* migration

* check validity of fields

* validity of host

* import changes proxy just in case

* send port always

* non-nullable

* Revert "send port always"

This reverts commit 14dd066d80.

* string

---------

Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>

.github/workflows/build.yml

@@ -5,12 +5,22 @@ on:
     branches:
       - master
       - stable
-      - users
     tags:
       - "v*"
       - "!*-fdroid"
       - "!*-armv7a"
   pull_request:
+    paths-ignore:
+      - "apps/ios"
+      - "apps/multiplatform"
+      - "blog"
+      - "docs"
+      - "fastlane"
+      - "images"
+      - "packages"
+      - "website"
+      - "README.md"
+      - "PRIVACY.md"
 
 jobs:
   prepare-release:

README.md

@@ -300,25 +300,27 @@ What is already implemented:
 1. Instead of user profile identifiers used by all other platforms, even the most private ones, SimpleX uses [pairwise per-queue identifiers](./docs/GLOSSARY.md#pairwise-pseudonymous-identifier) (2 addresses for each unidirectional message queue, with an optional 3rd address for push notifications on iOS, 2 queues in each connection between the users). It makes observing the network graph on the application level more difficult, as for `n` users there can be up to `n * (n-1)` message queues.
 2. [End-to-end encryption](./docs/GLOSSARY.md#end-to-end-encryption) in each message queue using [NaCl cryptobox](https://nacl.cr.yp.to/box.html). This is added to allow redundancy in the future (passing each message via several servers), to avoid having the same ciphertext in different queues (that would only be visible to the attacker if TLS is compromised). The encryption keys used for this encryption are not rotated, instead we are planning to rotate the queues. Curve25519 keys are used for key negotiation.
 3. [Double ratchet](./docs/GLOSSARY.md#double-ratchet-algorithm) end-to-end encryption in each conversation between two users (or group members). This is the same algorithm that is used in Signal and many other messaging apps; it provides OTR messaging with [forward secrecy](./docs/GLOSSARY.md#forward-secrecy) (each message is encrypted by its own ephemeral key) and [break-in recovery](./docs/GLOSSARY.md#post-compromise-security) (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial [key agreement](./docs/GLOSSARY.md#key-agreement-protocol), initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
-4. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
-5. Several levels of [content padding](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
-6. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
-7. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
-8. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
-9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
-10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
-11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
-12. Manual messaging queue rotations to move conversation to another SMP relay.
-13. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
-14. Local files encryption.
+4. [Post-quantum resistant key exchange](./docs/GLOSSARY.md#post-quantum-cryptography) in double ratchet protocol *on every ratchet step*. Read more in [this post](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md) and also see this [publication by Apple]( https://security.apple.com/blog/imessage-pq3/) explaining the need for post-quantum key rotation.
+5. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
+6. Several levels of [content padding](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
+7. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
+8. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
+9. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
+10. To protect your IP address from unknown messaging relays, and for per-message transport anonymity (compared with Tor/VPN per-connection anonymity), from v6.0 all SimpleX Chat clients use private message routing by default. Read more in [this post](./blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.md#private-message-routing).
+11. To protect your IP address from unknown file relays, when SOCKS proxy is not enabled SimpleX Chat clients ask for a confirmation before downloading the files from unknown servers.
+12. To protect your IP address from known servers all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
+13. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
+14. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
+15. Manual messaging queue rotations to move conversation to another SMP relay.
+16. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
+17. Local files encryption.
 
 We plan to add:
 
-1. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
-2. Post-quantum resistant key exchange in double ratchet protocol.
-3. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
-4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
-5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
+1. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+2. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
+3. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
+4. Recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
 
 ## For developers
 

apps/ios/Shared/AppDelegate.swift

@@ -15,16 +15,11 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         logger.debug("AppDelegate: didFinishLaunchingWithOptions")
         application.registerForRemoteNotifications()
-        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
         removePasscodesIfReinstalled()
         prepareForLaunch()
         return true
     }
 
-    @objc func pasteboardChanged() {
-        ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
-    }
-
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         let token = deviceToken.map { String(format: "%02hhx", $0) }.joined()
         logger.debug("AppDelegate: didRegisterForRemoteNotificationsWithDeviceToken \(token)")

apps/ios/Shared/Model/ChatModel.swift

@@ -123,14 +123,6 @@ class NetworkModel: ObservableObject {
     }
 }
 
-/// ChatItemWithMenu can depend on previous or next item for it's appearance
-/// This dummy model is used to force an update of all chat items,
-/// when they might have changed appearance.
-class ChatItemDummyModel: ObservableObject {
-    static let shared = ChatItemDummyModel()
-    func sendUpdate() { objectWillChange.send() }
-}
-
 final class ChatModel: ObservableObject {
     @Published var onboardingStage: OnboardingStage?
     @Published var setDeliveryReceipts = false
@@ -191,7 +183,6 @@ final class ChatModel: ObservableObject {
     @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
     @Published var draft: ComposeState?
     @Published var draftChatId: String?
-    @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
     @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)
 
     var messageDelivery: Dictionary<Int64, () -> Void> = [:]
@@ -436,17 +427,19 @@ final class ChatModel: ObservableObject {
 
     private func _upsertChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
         if let i = getChatItemIndex(cItem) {
-            _updateChatItem(at: i, with: cItem)
-            ChatItemDummyModel.shared.sendUpdate()
+            withConditionalAnimation {
+                _updateChatItem(at: i, with: cItem)
+            }
             return false
         } else {
-            var ci = cItem
-            if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
-                ci.meta.itemStatus = status
+            withConditionalAnimation(itemAnimation()) {
+                var ci = cItem
+                if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
+                    ci.meta.itemStatus = status
+                }
+                im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
+                im.itemAdded = true
             }
-            im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
-            im.itemAdded = true
-            ChatItemDummyModel.shared.sendUpdate()
             return true
         }
 

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -357,17 +357,17 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
     throw r
 }
 
-func apiForwardChatItems(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemIds: [Int64], ttl: Int?) async -> [ChatItem]? {
-    let cmd: ChatCommand = .apiForwardChatItems(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemIds: itemIds, ttl: ttl)
+func apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64, ttl: Int?) async -> ChatItem? {
+    let cmd: ChatCommand = .apiForwardChatItem(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemId: itemId, ttl: ttl)
     return await processSendMessageCmd(toChatType: toChatType, cmd: cmd)
 }
 
-func apiSendMessages(type: ChatType, id: Int64, live: Bool = false, ttl: Int? = nil, composedMessages: [ComposedMessage]) async -> [ChatItem]? {
-    let cmd: ChatCommand = .apiSendMessages(type: type, id: id, live: live, ttl: ttl, composedMessages: composedMessages)
+func apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
+    let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live, ttl: ttl)
     return await processSendMessageCmd(toChatType: type, cmd: cmd)
 }
 
-private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async -> [ChatItem]? {
+private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async -> ChatItem? {
     let chatModel = ChatModel.shared
     let r: ChatResponse
     if toChatType == .direct {
@@ -380,13 +380,10 @@ private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async
             }
         })
         r = await chatSendCmd(cmd, bgTask: false)
-        if case let .newChatItems(_, aChatItems) = r {
-            let cItems = aChatItems.map { $0.chatItem }
-            if let cItemLast = cItems.last {
-                cItem = cItemLast
-                chatModel.messageDelivery[cItemLast.id] = endTask
-            }
-            return cItems
+        if case let .newChatItem(_, aChatItem) = r {
+            cItem = aChatItem.chatItem
+            chatModel.messageDelivery[aChatItem.chatItem.id] = endTask
+            return cItem
         }
         if let networkErrorAlert = networkErrorAlert(r) {
             AlertManager.shared.showAlert(networkErrorAlert)
@@ -397,18 +394,18 @@ private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async
         return nil
     } else {
         r = await chatSendCmd(cmd, bgDelay: msgDelay)
-        if case let .newChatItems(_, aChatItems) = r {
-            return aChatItems.map { $0.chatItem }
+        if case let .newChatItem(_, aChatItem) = r {
+            return aChatItem.chatItem
         }
         sendMessageErrorAlert(r)
         return nil
     }
 }
 
-func apiCreateChatItems(noteFolderId: Int64, composedMessages: [ComposedMessage]) async -> [ChatItem]? {
-    let r = await chatSendCmd(.apiCreateChatItems(noteFolderId: noteFolderId, composedMessages: composedMessages))
-    if case let .newChatItems(_, aChatItems) = r { return aChatItems.map { $0.chatItem } }
-    createChatItemsErrorAlert(r)
+func apiCreateChatItem(noteFolderId: Int64, file: CryptoFile?, msg: MsgContent) async -> ChatItem? {
+    let r = await chatSendCmd(.apiCreateChatItem(noteFolderId: noteFolderId, file: file, msg: msg))
+    if case let .newChatItem(_, aChatItem) = r { return aChatItem.chatItem }
+    createChatItemErrorAlert(r)
     return nil
 }
 
@@ -420,8 +417,8 @@ private func sendMessageErrorAlert(_ r: ChatResponse) {
     )
 }
 
-private func createChatItemsErrorAlert(_ r: ChatResponse) {
-    logger.error("apiCreateChatItems error: \(String(describing: r))")
+private func createChatItemErrorAlert(_ r: ChatResponse) {
+    logger.error("apiCreateChatItem error: \(String(describing: r))")
     AlertManager.shared.showAlertMsg(
         title: "Error creating message",
         message: "Error: \(responseError(r))"
@@ -676,13 +673,6 @@ func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> P
     throw r
 }
 
-func apiChangeConnectionUser(connId: Int64, userId: Int64) async throws -> PendingContactConnection? {
-    let r = await chatSendCmd(.apiChangeConnectionUser(connId: connId, userId: userId))
-    
-    if case let .connectionUserChanged(_, _, toConnection, _) = r {return toConnection}
-    throw r
-}
-
 func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
     let userId = try currentUserId("apiConnectPlan")
     let r = await chatSendCmd(.apiConnectPlan(userId: userId, connReq: connReq))
@@ -1785,26 +1775,24 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 n.networkStatuses = ns
             }
         }
-    case let .newChatItems(user, chatItems):
-        for chatItem in chatItems {
-            let cInfo = chatItem.chatInfo
-            let cItem = chatItem.chatItem
-            await MainActor.run {
-                if active(user) {
-                    m.addChatItem(cInfo, cItem)
-                } else if cItem.isRcvNew && cInfo.ntfsEnabled {
-                    m.increaseUnreadCounter(user: user)
-                }
+    case let .newChatItem(user, aChatItem):
+        let cInfo = aChatItem.chatInfo
+        let cItem = aChatItem.chatItem
+        await MainActor.run {
+            if active(user) {
+                m.addChatItem(cInfo, cItem)
+            } else if cItem.isRcvNew && cInfo.ntfsEnabled {
+                m.increaseUnreadCounter(user: user)
             }
-            if let file = cItem.autoReceiveFile() {
-                Task {
-                    await receiveFile(user: user, fileId: file.fileId, auto: true)
-                }
-            }
-            if cItem.showNotification {
-                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+        }
+        if let file = cItem.autoReceiveFile() {
+            Task {
+                await receiveFile(user: user, fileId: file.fileId, auto: true)
             }
         }
+        if cItem.showNotification {
+            NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+        }
     case let .chatItemStatusUpdated(user, aChatItem):
         let cInfo = aChatItem.chatInfo
         let cItem = aChatItem.chatItem
@@ -1813,15 +1801,10 @@ func processReceivedMsg(_ res: ChatResponse) async {
         }
         if let endTask = m.messageDelivery[cItem.id] {
             switch cItem.meta.itemStatus {
-            case .sndNew: ()
             case .sndSent: endTask()
-            case .sndRcvd: endTask()
             case .sndErrorAuth: endTask()
             case .sndError: endTask()
-            case .sndWarning: endTask()
-            case .rcvNew: ()
-            case .rcvRead: ()
-            case .invalid: ()
+            default: ()
             }
         }
     case let .chatItemUpdated(user, aChatItem):
@@ -2199,9 +2182,11 @@ func refreshCallInvitations() async throws {
     }
 }
 
-func justRefreshCallInvitations() throws {
+func justRefreshCallInvitations() async throws {
     let callInvitations = try apiGetCallInvitationsSync()
-    ChatModel.shared.callInvitations = callsByChat(callInvitations)
+    await MainActor.run {
+        ChatModel.shared.callInvitations = callsByChat(callInvitations)
+    }
 }
 
 private func callsByChat(_ callInvitations: [RcvCallInvitation]) -> [ChatId: RcvCallInvitation] {
@@ -2211,12 +2196,13 @@ private func callsByChat(_ callInvitations: [RcvCallInvitation]) -> [ChatId: Rcv
 }
 
 func activateCall(_ callInvitation: RcvCallInvitation) {
-    if !callInvitation.user.showNotifications { return }
     let m = ChatModel.shared
+    logger.debug("reportNewIncomingCall activeCallUUID \(String(describing: m.activeCall?.callUUID)) invitationUUID \(String(describing: callInvitation.callUUID))")
+    if !callInvitation.user.showNotifications || m.activeCall?.callUUID == callInvitation.callUUID { return }
     CallController.shared.reportNewIncomingCall(invitation: callInvitation) { error in
         if let error = error {
             DispatchQueue.main.async {
-                m.callInvitations[callInvitation.contact.id]?.callkitUUID = nil
+                m.callInvitations[callInvitation.contact.id]?.callUUID = nil
             }
             logger.error("reportNewIncomingCall error: \(error.localizedDescription)")
         } else {

apps/ios/Shared/Views/Call/ActiveCallView.swift

@@ -185,7 +185,7 @@ struct ActiveCallView: View {
             case .ended:
                 closeCallView(client)
                 call.callState = .ended
-                if let uuid = call.callkitUUID {
+                if let uuid = call.callUUID {
                     CallController.shared.endCall(callUUID: uuid)
                 }
             case .ok:
@@ -382,7 +382,7 @@ struct ActiveCallOverlay: View {
     private func endCallButton() -> some View {
         let cc = CallController.shared
         return callButton("phone.down.fill", width: 60, height: 60) {
-            if let uuid = call.callkitUUID {
+            if let uuid = call.callUUID {
                 cc.endCall(callUUID: uuid)
             } else {
                 cc.endCall(call: call) {}
@@ -462,9 +462,9 @@ struct ActiveCallOverlay: View {
 struct ActiveCallOverlay_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .video), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, localMedia: .video), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
                 .background(.black)
-            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .audio), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, localMedia: .audio), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
                 .background(.black)
         }
     }

apps/ios/Shared/Views/Call/CallController.swift

@@ -51,7 +51,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
         logger.debug("CallController.provider CXStartCallAction")
-        if callManager.startOutgoingCall(callUUID: action.callUUID) {
+        if callManager.startOutgoingCall(callUUID: action.callUUID.uuidString.lowercased()) {
             action.fulfill()
             provider.reportOutgoingCall(with: action.callUUID, startedConnectingAt: nil)
         } else {
@@ -61,12 +61,30 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
         logger.debug("CallController.provider CXAnswerCallAction")
-        if callManager.answerIncomingCall(callUUID: action.callUUID) {
-            // WebRTC call should be in connected state to fulfill.
-            // Otherwise no audio and mic working on lockscreen
-            fulfillOnConnect = action
-        } else {
-            action.fail()
+        Task {
+            let chatIsReady = await waitUntilChatStarted(timeoutMs: 30_000, stepMs: 500)
+            logger.debug("CallController chat started \(chatIsReady) \(ChatModel.shared.chatInitialized) \(ChatModel.shared.chatRunning == true) \(String(describing: AppChatState.shared.value))")
+            if !chatIsReady {
+                action.fail()
+                return
+            }
+            if !ChatModel.shared.callInvitations.values.contains(where: { inv in inv.callUUID == action.callUUID.uuidString.lowercased() }) {
+                try? await justRefreshCallInvitations()
+                logger.debug("CallController: updated call invitations chat")
+            }
+            await MainActor.run {
+                logger.debug("CallController.provider will answer on call")
+
+                if callManager.answerIncomingCall(callUUID: action.callUUID.uuidString.lowercased()) {
+                    logger.debug("CallController.provider answered on call")
+                    // WebRTC call should be in connected state to fulfill.
+                    // Otherwise no audio and mic working on lockscreen
+                    fulfillOnConnect = action
+                } else {
+                    logger.debug("CallController.provider will fail the call")
+                    action.fail()
+                }
+            }
         }
     }
 
@@ -75,7 +93,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         // Should be nil here if connection was in connected state
         fulfillOnConnect?.fail()
         fulfillOnConnect = nil
-        callManager.endCall(callUUID: action.callUUID) { ok in
+        callManager.endCall(callUUID: action.callUUID.uuidString.lowercased()) { ok in
             if ok {
                 action.fulfill()
             } else {
@@ -86,7 +104,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     }
 
     func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
-        if callManager.enableMedia(media: .audio, enable: !action.isMuted, callUUID:  action.callUUID) {
+        if callManager.enableMedia(media: .audio, enable: !action.isMuted, callUUID:  action.callUUID.uuidString.lowercased()) {
             action.fulfill()
         } else {
             action.fail()
@@ -156,6 +174,19 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         }
     }
 
+    private func waitUntilChatStarted(timeoutMs: UInt64, stepMs: UInt64) async -> Bool {
+        logger.debug("CallController waiting until chat started")
+        var t: UInt64 = 0
+        repeat {
+            if ChatModel.shared.chatInitialized, ChatModel.shared.chatRunning == true, case .active = AppChatState.shared.value {
+                return true
+            }
+            _ = try? await Task.sleep(nanoseconds: stepMs * 1000000)
+            t += stepMs
+        } while t < timeoutMs
+        return false
+    }
+
     @objc(pushRegistry:didUpdatePushCredentials:forType:)
     func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
         logger.debug("CallController: didUpdate push credentials for type \(type.rawValue)")
@@ -171,32 +202,19 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             self.reportExpiredCall(payload: payload, completion)
             return
         }
-        if (!ChatModel.shared.chatInitialized) {
-            logger.debug("CallController: initializing chat")
-            do {
-                try initializeChat(start: true, refreshInvitations: false)
-            } catch let error {
-                logger.error("CallController: initializing chat error: \(error)")
-                self.reportExpiredCall(payload: payload, completion)
-                return
-            }
-        }
-        logger.debug("CallController: initialized chat")
-        startChatForCall()
-        logger.debug("CallController: started chat")
-        self.shouldSuspendChat = true
-        // There are no invitations in the model, as it was processed by NSE
-        try? justRefreshCallInvitations()
-        logger.debug("CallController: updated call invitations chat")
-        // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
         // Extract the call information from the push notification payload
         let m = ChatModel.shared
         if let contactId = payload.dictionaryPayload["contactId"] as? String,
-           let invitation = m.callInvitations[contactId] {
-            let update = self.cxCallUpdate(invitation: invitation)
-            if let uuid = invitation.callkitUUID {
+           let displayName = payload.dictionaryPayload["displayName"] as? String,
+           let callUUID = payload.dictionaryPayload["callUUID"] as? String,
+           let uuid = UUID(uuidString: callUUID),
+           let callTsInterval = payload.dictionaryPayload["callTs"] as? TimeInterval,
+           let mediaStr = payload.dictionaryPayload["media"] as? String,
+           let media = CallMediaType(rawValue: mediaStr) {
+            let update = self.cxCallUpdate(contactId, displayName, media)
+            let callTs = Date(timeIntervalSince1970: callTsInterval)
+            if callTs.timeIntervalSinceNow >= -180 {
                 logger.debug("CallController: report pushkit call via CallKit")
-                let update = self.cxCallUpdate(invitation: invitation)
                 self.provider.reportNewIncomingCall(with: uuid, update: update) { error in
                     if error != nil {
                         m.callInvitations.removeValue(forKey: contactId)
@@ -205,11 +223,31 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                     completion()
                 }
             } else {
+                logger.debug("CallController will expire call 1")
                 self.reportExpiredCall(update: update, completion)
             }
         } else {
+            logger.debug("CallController will expire call 2")
             self.reportExpiredCall(payload: payload, completion)
         }
+
+        //DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
+        if (!ChatModel.shared.chatInitialized) {
+            logger.debug("CallController: initializing chat")
+            do {
+                try initializeChat(start: true, refreshInvitations: false)
+            } catch let error {
+                logger.error("CallController: initializing chat error: \(error)")
+                if let call = ChatModel.shared.activeCall {
+                    self.endCall(call: call, completed: completion)
+                }
+                return
+            }
+        }
+        logger.debug("CallController: initialized chat")
+        startChatForCall()
+        logger.debug("CallController: started chat")
+        self.shouldSuspendChat = true
     }
 
     // This function fulfils the requirement to always report a call when PushKit notification is received,
@@ -239,8 +277,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     }
 
     func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID))")
-        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callUUID))")
+        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
             if invitation.callTs.timeIntervalSinceNow >= -180 {
                 let update = cxCallUpdate(invitation: invitation)
                 provider.reportNewIncomingCall(with: uuid, update: update, completion: completion)
@@ -261,6 +299,14 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         return update
     }
 
+    private func cxCallUpdate(_ contactId: String, _ displayName: String, _ media: CallMediaType) -> CXCallUpdate {
+        let update = CXCallUpdate()
+        update.remoteHandle = CXHandle(type: .generic, value: contactId)
+        update.hasVideo = media == .video
+        update.localizedCallerName = displayName
+        return update
+    }
+
     func reportIncomingCall(call: Call, connectedAt dateConnected: Date?) {
         logger.debug("CallController: reporting incoming call connected")
         if CallController.useCallKit() {
@@ -272,14 +318,14 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func reportOutgoingCall(call: Call, connectedAt dateConnected: Date?) {
         logger.debug("CallController: reporting outgoing call connected")
-        if CallController.useCallKit(), let uuid = call.callkitUUID {
+        if CallController.useCallKit(), let callUUID = call.callUUID, let uuid = UUID(uuidString: callUUID) {
             provider.reportOutgoingCall(with: uuid, connectedAt: dateConnected)
         }
     }
 
     func reportCallRemoteEnded(invitation: RcvCallInvitation) {
         logger.debug("CallController: reporting remote ended")
-        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
+        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
             provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
         } else if invitation.contact.id == activeCallInvitation?.contact.id {
             activeCallInvitation = nil
@@ -288,14 +334,17 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func reportCallRemoteEnded(call: Call) {
         logger.debug("CallController: reporting remote ended")
-        if CallController.useCallKit(), let uuid = call.callkitUUID {
+        if CallController.useCallKit(), let callUUID = call.callUUID, let uuid = UUID(uuidString: callUUID) {
             provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
         }
     }
 
     func startCall(_ contact: Contact, _ media: CallMediaType) {
         logger.debug("CallController.startCall")
-        let uuid = callManager.newOutgoingCall(contact, media)
+        let callUUID = callManager.newOutgoingCall(contact, media)
+        guard let uuid = UUID(uuidString: callUUID) else {
+            return
+        }
         if CallController.useCallKit() {
             let handle = CXHandle(type: .generic, value: contact.id)
             let action = CXStartCallAction(call: uuid, handle: handle)
@@ -307,8 +356,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                 update.localizedCallerName = contact.displayName
                 self.provider.reportCall(with: uuid, updated: update)
             }
-        } else if callManager.startOutgoingCall(callUUID: uuid) {
-            if callManager.startOutgoingCall(callUUID: uuid) {
+        } else if callManager.startOutgoingCall(callUUID: callUUID) {
+            if callManager.startOutgoingCall(callUUID: callUUID) {
                 logger.debug("CallController.startCall: call started")
             } else {
                 logger.error("CallController.startCall: no active call")
@@ -318,8 +367,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func answerCall(invitation: RcvCallInvitation) {
         logger.debug("CallController: answering a call")
-        if CallController.useCallKit(), let callUUID = invitation.callkitUUID {
-            requestTransaction(with: CXAnswerCallAction(call: callUUID))
+        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
+            requestTransaction(with: CXAnswerCallAction(call: uuid))
         } else {
             callManager.answerIncomingCall(invitation: invitation)
         }
@@ -328,10 +377,13 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         }
     }
 
-    func endCall(callUUID: UUID) {
-        logger.debug("CallController: ending the call with UUID \(callUUID.uuidString)")
+    func endCall(callUUID: String) {
+        let uuid = UUID(uuidString: callUUID)
+        logger.debug("CallController: ending the call with UUID \(callUUID)")
         if CallController.useCallKit() {
-            requestTransaction(with: CXEndCallAction(call: callUUID))
+            if let uuid {
+                requestTransaction(with: CXEndCallAction(call: uuid))
+            }
         } else {
             callManager.endCall(callUUID: callUUID) { ok in
                 if ok {

apps/ios/Shared/Views/Call/CallManager.swift

@@ -10,17 +10,17 @@ import Foundation
 import SimpleXChat
 
 class CallManager {
-    func newOutgoingCall(_ contact: Contact, _ media: CallMediaType) -> UUID {
-        let uuid = UUID()
-        let call = Call(direction: .outgoing, contact: contact, callkitUUID: uuid, callState: .waitCapabilities, localMedia: media)
+    func newOutgoingCall(_ contact: Contact, _ media: CallMediaType) -> String {
+        let uuid = UUID().uuidString.lowercased()
+        let call = Call(direction: .outgoing, contact: contact, callUUID: uuid, callState: .waitCapabilities, localMedia: media)
         call.speakerEnabled = media == .video
         ChatModel.shared.activeCall = call
         return uuid
     }
 
-    func startOutgoingCall(callUUID: UUID) -> Bool {
+    func startOutgoingCall(callUUID: String) -> Bool {
         let m = ChatModel.shared
-        if let call = m.activeCall, call.callkitUUID == callUUID {
+        if let call = m.activeCall, call.callUUID == callUUID {
             m.showCallView = true
             Task { await m.callCommand.processCommand(.capabilities(media: call.localMedia)) }
             return true
@@ -28,7 +28,7 @@ class CallManager {
         return false
     }
 
-    func answerIncomingCall(callUUID: UUID) -> Bool {
+    func answerIncomingCall(callUUID: String) -> Bool {
         if let invitation = getCallInvitation(callUUID) {
             answerIncomingCall(invitation: invitation)
             return true
@@ -42,7 +42,7 @@ class CallManager {
         let call = Call(
             direction: .incoming,
             contact: invitation.contact,
-            callkitUUID: invitation.callkitUUID,
+            callUUID: invitation.callUUID,
             callState: .invitationAccepted,
             localMedia: invitation.callType.media,
             sharedKey: invitation.sharedKey
@@ -68,8 +68,8 @@ class CallManager {
         }
     }
 
-    func enableMedia(media: CallMediaType, enable: Bool, callUUID: UUID) -> Bool {
-        if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
+    func enableMedia(media: CallMediaType, enable: Bool, callUUID: String) -> Bool {
+        if let call = ChatModel.shared.activeCall, call.callUUID == callUUID {
             let m = ChatModel.shared
             Task { await m.callCommand.processCommand(.media(media: media, enable: enable)) }
             return true
@@ -77,8 +77,8 @@ class CallManager {
         return false
     }
 
-    func endCall(callUUID: UUID, completed: @escaping (Bool) -> Void) {
-        if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
+    func endCall(callUUID: String, completed: @escaping (Bool) -> Void) {
+        if let call = ChatModel.shared.activeCall, call.callUUID == callUUID {
             endCall(call: call) { completed(true) }
         } else if let invitation = getCallInvitation(callUUID) {
             endCall(invitation: invitation) { completed(true) }
@@ -126,8 +126,8 @@ class CallManager {
         }
     }
 
-    private func getCallInvitation(_ callUUID: UUID) -> RcvCallInvitation? {
-        if let (_, invitation) = ChatModel.shared.callInvitations.first(where: { (_, inv) in inv.callkitUUID == callUUID }) {
+    private func getCallInvitation(_ callUUID: String) -> RcvCallInvitation? {
+        if let (_, invitation) = ChatModel.shared.callInvitations.first(where: { (_, inv) in inv.callUUID == callUUID }) {
             return invitation
         }
         return nil

apps/ios/Shared/Views/Call/WebRTC.swift

@@ -18,7 +18,7 @@ class Call: ObservableObject, Equatable {
 
     var direction: CallDirection
     var contact: Contact
-    var callkitUUID: UUID?
+    var callUUID: String?
     var localMedia: CallMediaType
     @Published var callState: CallState
     @Published var localCapabilities: CallCapabilities?
@@ -33,14 +33,14 @@ class Call: ObservableObject, Equatable {
     init(
         direction: CallDirection,
         contact: Contact,
-        callkitUUID: UUID?,
+        callUUID: String?,
         callState: CallState,
         localMedia: CallMediaType,
         sharedKey: String? = nil
     ) {
         self.direction = direction
         self.contact = contact
-        self.callkitUUID = callkitUUID
+        self.callUUID = callUUID
         self.callState = callState
         self.localMedia = localMedia
         self.sharedKey = sharedKey

apps/ios/Shared/Views/Chat/ChatItem/CIGroupInvitationView.swift

@@ -12,7 +12,6 @@ import SimpleXChat
 struct CIGroupInvitationView: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme
-    @Environment(\.showTimestamp) var showTimestamp: Bool
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var groupInvitation: CIGroupInvitation
@@ -46,7 +45,7 @@ struct CIGroupInvitationView: View {
                                     .foregroundColor(inProgress ? theme.colors.secondary : chatIncognito ? .indigo : theme.colors.primary)
                                     .font(.callout)
                                 + Text("   ")
-                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
                             )
                             .overlay(DetermineWidth())
                         }
@@ -54,7 +53,7 @@ struct CIGroupInvitationView: View {
                         (
                             groupInvitationText()
                             + Text("   ")
-                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
                         )
                         .overlay(DetermineWidth())
                     }
@@ -70,7 +69,7 @@ struct CIGroupInvitationView: View {
         }
         .padding(.horizontal, 12)
         .padding(.vertical, 6)
-        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
+        .background(chatItemFrameColor(chatItem, theme))
         .textSelection(.disabled)
         .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
         .onChange(of: inProgress) { inProgress in

apps/ios/Shared/Views/Chat/ChatItem/CIMetaView.swift

@@ -12,7 +12,6 @@ import SimpleXChat
 struct CIMetaView: View {
     @ObservedObject var chat: Chat
     @EnvironmentObject var theme: AppTheme
-    @Environment(\.showTimestamp) var showTimestamp: Bool
     var chatItem: ChatItem
     var metaColor: Color
     var paleMetaColor = Color(UIColor.tertiaryLabel)
@@ -31,24 +30,24 @@ struct CIMetaView: View {
             switch meta.itemStatus {
             case let .sndSent(sndProgress):
                 switch sndProgress {
-                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
-                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                 }
             case let .sndRcvd(_, sndProgress):
                 switch sndProgress {
                 case .complete:
                     ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                     }
                 case .partial:
                     ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
                     }
                 }
             default:
-                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
             }
         }
     }
@@ -70,8 +69,7 @@ func ciMetaText(
     sent: SentCheckmark? = nil,
     showStatus: Bool = true,
     showEdited: Bool = true,
-    showViaProxy: Bool,
-    showTimesamp: Bool
+    showViaProxy: Bool
 ) -> Text {
     var r = Text("")
     if showEdited, meta.itemEdited {
@@ -107,9 +105,7 @@ func ciMetaText(
     if let enc = encrypted {
         r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
     }
-    if showTimesamp {
-        r = r + meta.timestampText.foregroundColor(color)
-    }
+    r = r + meta.timestampText.foregroundColor(color)
     return r.font(.caption)
 }
 

apps/ios/Shared/Views/Chat/ChatItem/CIRcvDecryptionError.swift

@@ -15,7 +15,6 @@ struct CIRcvDecryptionError: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
-    @Environment(\.showTimestamp) var showTimestamp: Bool
     var msgDecryptError: MsgDecryptError
     var msgCount: UInt32
     var chatItem: ChatItem
@@ -69,40 +68,37 @@ struct CIRcvDecryptionError: View {
     }
 
     @ViewBuilder private func viewBody() -> some View {
-        Group {
-            if case let .direct(contact) = chat.chatInfo,
-               let contactStats = contact.activeConn?.connectionStats {
-                if contactStats.ratchetSyncAllowed {
-                    decryptionErrorItemFixButton(syncSupported: true) {
-                        alert = .syncAllowedAlert { syncContactConnection(contact) }
-                    }
-                } else if !contactStats.ratchetSyncSupported {
-                    decryptionErrorItemFixButton(syncSupported: false) {
-                        alert = .syncNotSupportedContactAlert
-                    }
-                } else {
-                    basicDecryptionErrorItem()
+        if case let .direct(contact) = chat.chatInfo,
+           let contactStats = contact.activeConn?.connectionStats {
+            if contactStats.ratchetSyncAllowed {
+                decryptionErrorItemFixButton(syncSupported: true) {
+                    alert = .syncAllowedAlert { syncContactConnection(contact) }
                 }
-            } else if case let .group(groupInfo) = chat.chatInfo,
-                      case let .groupRcv(groupMember) = chatItem.chatDir,
-                      let mem = m.getGroupMember(groupMember.groupMemberId),
-                      let memberStats = mem.wrapped.activeConn?.connectionStats {
-                if memberStats.ratchetSyncAllowed {
-                    decryptionErrorItemFixButton(syncSupported: true) {
-                        alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
-                    }
-                } else if !memberStats.ratchetSyncSupported {
-                    decryptionErrorItemFixButton(syncSupported: false) {
-                        alert = .syncNotSupportedMemberAlert
-                    }
-                } else {
-                    basicDecryptionErrorItem()
+            } else if !contactStats.ratchetSyncSupported {
+                decryptionErrorItemFixButton(syncSupported: false) {
+                    alert = .syncNotSupportedContactAlert
                 }
             } else {
                 basicDecryptionErrorItem()
             }
+        } else if case let .group(groupInfo) = chat.chatInfo,
+                  case let .groupRcv(groupMember) = chatItem.chatDir,
+                  let mem = m.getGroupMember(groupMember.groupMemberId),
+                  let memberStats = mem.wrapped.activeConn?.connectionStats {
+            if memberStats.ratchetSyncAllowed {
+                decryptionErrorItemFixButton(syncSupported: true) {
+                    alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
+                }
+            } else if !memberStats.ratchetSyncSupported {
+                decryptionErrorItemFixButton(syncSupported: false) {
+                    alert = .syncNotSupportedMemberAlert
+                }
+            } else {
+                basicDecryptionErrorItem()
+            }
+        } else {
+            basicDecryptionErrorItem()
         }
-        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
     }
 
     private func basicDecryptionErrorItem() -> some View {
@@ -126,7 +122,7 @@ struct CIRcvDecryptionError: View {
                         .foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
                         .font(.callout)
                     + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
                 )
             }
             .padding(.horizontal, 12)
@@ -135,6 +131,7 @@ struct CIRcvDecryptionError: View {
         }
         .onTapGesture(perform: { onClick() })
         .padding(.vertical, 6)
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
         .textSelection(.disabled)
     }
 
@@ -145,7 +142,7 @@ struct CIRcvDecryptionError: View {
                     .foregroundColor(.red)
                     .italic()
                 + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
             }
             .padding(.horizontal, 12)
             CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
@@ -153,6 +150,7 @@ struct CIRcvDecryptionError: View {
         }
         .onTapGesture(perform: { onClick() })
         .padding(.vertical, 6)
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
         .textSelection(.disabled)
     }
 

apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift

@@ -12,7 +12,7 @@ import SimpleXChat
 struct FramedItemView: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject var scrollModel: ReverseListScrollModel
+    @EnvironmentObject var scrollModel: ReverseListScrollModel<ChatItem>
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var preview: UIImage?
@@ -71,8 +71,8 @@ struct FramedItemView: View {
                     .overlay(DetermineWidth())
                     .accessibilityLabel("")
             }
-        }   
-            .background { chatItemFrameColorMaybeImageOrVideo(chatItem, theme).modifier(ChatTailPadding()) }
+        }
+            .background(chatItemFrameColorMaybeImageOrVideo(chatItem, theme))
             .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }
 
         if let (title, text) = chatItem.meta.itemStatus.statusInfo {

apps/ios/Shared/Views/Chat/ChatItem/FullScreenMediaView.swift

@@ -13,7 +13,7 @@ import AVKit
 
 struct FullScreenMediaView: View {
     @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var scrollModel: ReverseListScrollModel
+    @EnvironmentObject var scrollModel: ReverseListScrollModel<ChatItem>
     @State var chatItem: ChatItem
     @State var image: UIImage?
     @State var player: AVPlayer? = nil

apps/ios/Shared/Views/Chat/ChatItem/IntegrityErrorItemView.swift

@@ -69,7 +69,7 @@ struct CIMsgError: View {
         }
         .padding(.leading, 12)
         .padding(.vertical, 6)
-        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
         .textSelection(.disabled)
         .onTapGesture(perform: onTap)
     }

apps/ios/Shared/Views/Chat/ChatItem/MarkedDeletedItemView.swift

@@ -22,7 +22,7 @@ struct MarkedDeletedItemView: View {
         .foregroundColor(theme.colors.secondary)
         .padding(.horizontal, 12)
         .padding(.vertical, 6)
-        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
+        .background(chatItemFrameColor(chatItem, theme))
         .textSelection(.disabled)
     }
 

apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift

@@ -26,7 +26,6 @@ private func typing(_ w: Font.Weight = .light) -> Text {
 
 struct MsgContentView: View {
     @ObservedObject var chat: Chat
-    @Environment(\.showTimestamp) var showTimestamp: Bool
     @EnvironmentObject var theme: AppTheme
     var text: String
     var formattedText: [FormattedText]? = nil
@@ -85,7 +84,7 @@ struct MsgContentView: View {
     }
 
     private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
     }
 }
 

apps/ios/Shared/Views/Chat/ChatItemView.swift

@@ -9,21 +9,9 @@
 import SwiftUI
 import SimpleXChat
 
-extension EnvironmentValues {
-    struct ShowTimestamp: EnvironmentKey {
-        static let defaultValue: Bool = true
-    }
-
-    var showTimestamp: Bool {
-        get { self[ShowTimestamp.self] }
-        set { self[ShowTimestamp.self] = newValue }
-    }
-}
-
 struct ChatItemView: View {
     @ObservedObject var chat: Chat
     @EnvironmentObject var theme: AppTheme
-    @Environment(\.showTimestamp) var showTimestamp: Bool
     var chatItem: ChatItem
     var maxWidth: CGFloat = .infinity
     @Binding var revealed: Bool

apps/ios/Shared/Views/Chat/ChatView.swift

@@ -22,8 +22,8 @@ struct ChatView: View {
     @Environment(\.presentationMode) var presentationMode
     @Environment(\.scenePhase) var scenePhase
     @State @ObservedObject var chat: Chat
-    @StateObject private var scrollModel = ReverseListScrollModel()
-    @StateObject private var floatingButtonModel: FloatingButtonModel = .shared
+    @StateObject private var scrollModel = ReverseListScrollModel<ChatItem>()
+    @StateObject private var floatingButtonModel = FloatingButtonModel()
     @State private var showChatInfoSheet: Bool = false
     @State private var showAddMembersSheet: Bool = false
     @State private var composeState = ComposeState()
@@ -74,12 +74,9 @@ struct ChatView: View {
                     )
             }
             VStack(spacing: 0) {
-                ZStack {
+                ZStack(alignment: .bottomTrailing) {
                     chatItemsList()
                     floatingButtons(counts: floatingButtonModel.unreadChatItemCounts)
-                        .frame(maxWidth: .infinity, alignment: .trailing)
-                    floatingDate
-                        .frame(maxHeight: .infinity, alignment: .top)
                 }
                 connectingText()
                 if selectedChatItems == nil {
@@ -416,6 +413,12 @@ struct ChatView: View {
                     revealedChatItem: $revealedChatItem,
                     selectedChatItems: $selectedChatItems
                 )
+                .onAppear {
+                    floatingButtonModel.appeared(viewId: ci.viewId)
+                }
+                .onDisappear {
+                    floatingButtonModel.disappeared(viewId: ci.viewId)
+                }
                 .id(ci.id) // Required to trigger `onAppear` on iOS15
             } loadPage: {
                 loadChatItems(cInfo)
@@ -426,6 +429,9 @@ struct ChatView: View {
             .onChange(of: searchText) { _ in
                 Task { await loadChat(chat: chat, search: searchText) }
             }
+            .onChange(of: im.reversedChatItems) { _ in
+                floatingButtonModel.chatItemsChanged()
+            }
             .onChange(of: im.itemAdded) { added in
                 if added {
                     im.itemAdded = false
@@ -452,13 +458,15 @@ struct ChatView: View {
     }
 
     class FloatingButtonModel: ObservableObject {
-        static let shared = FloatingButtonModel()
+        private enum Event {
+            case appeared(String)
+            case disappeared(String)
+            case chatItemsChanged
+        }
 
         @Published var unreadChatItemCounts: UnreadChatItemCounts
-        @Published var date: Date?
-        @Published var isDateVisible: Bool = false
 
-        let visibleItems = PassthroughSubject<[String], Never>()
+        private let events = PassthroughSubject<Event, Never>()
         private var bag = Set<AnyCancellable>()
 
         init() {
@@ -467,58 +475,34 @@ struct ChatView: View {
                 isReallyNearBottom: true,
                 unreadBelow: 0
             )
-
-            // Unread item counts
-            visibleItems
+            events
                 .receive(on: DispatchQueue.global(qos: .background))
-                .map { ChatModel.shared.unreadChatItemCounts(itemsInView: Set($0)) }
+                .scan(Set<String>()) { itemsInView, event in
+                    var updated = itemsInView
+                    switch event {
+                    case let .appeared(viewId): updated.insert(viewId)
+                    case let .disappeared(viewId): updated.remove(viewId)
+                    case .chatItemsChanged: ()
+                    }
+                    return updated
+                }
+                .map { ChatModel.shared.unreadChatItemCounts(itemsInView: $0) }
                 .removeDuplicates()
                 .throttle(for: .seconds(0.2), scheduler: DispatchQueue.main, latest: true)
                 .assign(to: \.unreadChatItemCounts, on: self)
                 .store(in: &bag)
-
-            // Floating date
-            visibleItems
-                .receive(on: DispatchQueue.global(qos: .background))
-                .map { visibleItems -> Date? in
-                    if let viewId = visibleItems.last {
-                        ItemsModel.shared.reversedChatItems
-                            .first { $0.viewId == viewId }
-                            .map { Calendar.current.startOfDay(for: $0.meta.itemTs) }
-                    } else { nil }
-                }
-                .removeDuplicates()
-                .throttle(for: .seconds(0.2), scheduler: DispatchQueue.main, latest: true)
-                .assign(to: \.date, on: self)
-                .store(in: &bag)
-            
-            // Floating date visibility
-            visibleItems
-                .removeDuplicates()
-                .receive(on: DispatchQueue.main)
-                .map { _ in
-                    if !self.isDateVisible {
-                        withAnimation { self.isDateVisible = true }
-                    }
-                }
-                .debounce(for: 1, scheduler: DispatchQueue.main)
-                .sink {
-                    if self.isDateVisible {
-                        withAnimation { self.isDateVisible = false }
-                    }
-                }
-                .store(in: &bag)
         }
-    }
 
-    @ViewBuilder
-    var floatingDate: some View {
-        if let date = floatingButtonModel.date {
-            DateSeparator(date: date)
-                .padding(.vertical, 4).padding(.horizontal, 8)
-                .background(ToolbarMaterial.material(toolbarMaterial))
-                .clipShape(Capsule())
-                .opacity(floatingButtonModel.isDateVisible ? 1 : 0)
+        func appeared(viewId: String) {
+            events.send(.appeared(viewId))
+        }
+
+        func disappeared(viewId: String) {
+            events.send(.disappeared(viewId))
+        }
+
+        func chatItemsChanged() {
+            events.send(.chatItemsChanged)
         }
     }
 
@@ -584,8 +568,8 @@ struct ChatView: View {
 
     private func endCallButton(_ call: Call) -> some View {
         Button {
-            if let uuid = call.callkitUUID {
-                CallController.shared.endCall(callUUID: uuid)
+            if CallController.useCallKit(), let callUUID = call.callUUID {
+                CallController.shared.endCall(callUUID: callUUID)
             } else {
                 CallController.shared.endCall(call: call) {}
             }
@@ -708,26 +692,10 @@ struct ChatView: View {
         VoiceItemState.chatView = [:]
     }
 
-    private struct DateSeparator: View {
-        let date: Date
-
-        var body: some View {
-            Text(String.localizedStringWithFormat(
-                NSLocalizedString("%@, %@", comment: "format for date separator in chat"),
-                date.formatted(.dateTime.weekday(.abbreviated)),
-                date.formatted(.dateTime.day().month(.abbreviated))
-            ))
-            .font(.callout)
-            .fontWeight(.medium)
-            .foregroundStyle(.secondary)
-        }
-    }
-
     private struct ChatItemWithMenu: View {
         @EnvironmentObject var m: ChatModel
         @EnvironmentObject var theme: AppTheme
         @Binding @ObservedObject var chat: Chat
-        @ObservedObject var dummyModel: ChatItemDummyModel = .shared
         let chatItem: ChatItem
         let maxWidth: CGFloat
         @Binding var composeState: ComposeState
@@ -748,54 +716,31 @@ struct ChatView: View {
 
         var revealed: Bool { chatItem == revealedChatItem }
 
-        typealias ItemSeparation = (timestamp: Bool, largeGap: Bool, date: Date?)
-
-        func getItemSeparation(_ chatItem: ChatItem, at i: Int?) -> ItemSeparation {
-            let im = ItemsModel.shared
-            if let i, i > 0 && im.reversedChatItems.count >= i {
-                let nextItem = im.reversedChatItems[i - 1]
-                let largeGap = !nextItem.chatDir.sameDirection(chatItem.chatDir) || nextItem.meta.itemTs.timeIntervalSince(chatItem.meta.itemTs) > 60
-                return (
-                    timestamp: largeGap || formatTimestampText(chatItem.meta.itemTs) != formatTimestampText(nextItem.meta.itemTs),
-                    largeGap: largeGap,
-                    date: Calendar.current.isDate(chatItem.meta.itemTs, inSameDayAs: nextItem.meta.itemTs) ? nil : nextItem.meta.itemTs
-                )
-            } else {
-                return (timestamp: true, largeGap: true, date: nil)
-            }
-        }
-
         var body: some View {
-            let currIndex = m.getChatItemIndex(chatItem)
+            let (currIndex, _) = m.getNextChatItem(chatItem)
             let ciCategory = chatItem.mergeCategory
             let (prevHidden, prevItem) = m.getPrevShownChatItem(currIndex, ciCategory)
             let range = itemsRange(currIndex, prevHidden)
-            let timeSeparation = getItemSeparation(chatItem, at: currIndex)
             let im = ItemsModel.shared
             Group {
                 if revealed, let range = range {
                     let items = Array(zip(Array(range), im.reversedChatItems[range]))
-                    VStack(spacing: 0) {
-                        ForEach(items.reversed(), id: \.1.viewId) { (i: Int, ci: ChatItem) in
-                            let prev = i == prevHidden ? prevItem : im.reversedChatItems[i + 1]
-                            chatItemView(ci, nil, prev, getItemSeparation(ci, at: i))
-                                .overlay {
-                                    if let selected = selectedChatItems, ci.canBeDeletedForSelf {
-                                        Color.clear
-                                            .contentShape(Rectangle())
-                                            .onTapGesture {
-                                                let checked = selected.contains(ci.id)
-                                                selectUnselectChatItem(select: !checked, ci)
-                                            }
+                    ForEach(items.reversed(), id: \.1.viewId) { (i, ci) in
+                        let prev = i == prevHidden ? prevItem : im.reversedChatItems[i + 1]
+                        chatItemView(ci, nil, prev)
+                        .overlay {
+                            if let selected = selectedChatItems, ci.canBeDeletedForSelf {
+                                Color.clear
+                                    .contentShape(Rectangle())
+                                    .onTapGesture {
+                                        let checked = selected.contains(ci.id)
+                                        selectUnselectChatItem(select: !checked, ci)
                                     }
-                                }
+                            }
                         }
                     }
                 } else {
-                    VStack(spacing: 0) {
-                        chatItemView(chatItem, range, prevItem, timeSeparation)
-                        if let date = timeSeparation.date { DateSeparator(date: date).padding(8) }
-                    }
+                    chatItemView(chatItem, range, prevItem)
                     .overlay {
                         if let selected = selectedChatItems, chatItem.canBeDeletedForSelf {
                             Color.clear
@@ -846,8 +791,7 @@ struct ChatView: View {
             }
         }
 
-        @ViewBuilder func chatItemView(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ prevItem: ChatItem?, _ itemSeparation: ItemSeparation) -> some View {
-            let bottomPadding: Double = itemSeparation.largeGap ? 10 : 2
+        @ViewBuilder func chatItemView(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ prevItem: ChatItem?) -> some View {
             if case let .groupRcv(member) = ci.chatDir,
                case let .group(groupInfo) = chat.chatInfo {
                 let (prevMember, memCount): (GroupMember?, Int) =
@@ -869,14 +813,14 @@ struct ChatView: View {
                                 .foregroundStyle(.secondary)
                                 .lineLimit(2)
                                 .padding(.leading, memberImageSize + 14 + (selectedChatItems != nil && ci.canBeDeletedForSelf ? 12 + 24 : 0))
-                                .padding(.top, 3) // this is in addition to message sequence gap
+                                .padding(.top, 7)
                         }
                         HStack(alignment: .center, spacing: 0) {
                             if selectedChatItems != nil && ci.canBeDeletedForSelf {
                                 SelectedChatItem(ciId: ci.id, selectedChatItems: $selectedChatItems)
                                     .padding(.trailing, 12)
                             }
-                            HStack(alignment: .top, spacing: 10) {
+                            HStack(alignment: .top, spacing: 8) {
                                 MemberProfileImage(member, size: memberImageSize, backgroundColor: theme.colors.background)
                                     .onTapGesture {
                                         if let member =  m.getGroupMember(member.groupMemberId) {
@@ -889,11 +833,11 @@ struct ChatView: View {
                                             }
                                         }
                                     }
-                                chatItemWithMenu(ci, range, maxWidth, itemSeparation)
+                                chatItemWithMenu(ci, range, maxWidth)
                             }
                         }
                     }
-                    .padding(.bottom, bottomPadding)
+                    .padding(.bottom, 5)
                     .padding(.trailing)
                     .padding(.leading, 12)
                 } else {
@@ -902,11 +846,11 @@ struct ChatView: View {
                             SelectedChatItem(ciId: ci.id, selectedChatItems: $selectedChatItems)
                                 .padding(.leading, 12)
                         }
-                        chatItemWithMenu(ci, range, maxWidth, itemSeparation)
+                        chatItemWithMenu(ci, range, maxWidth)
                             .padding(.trailing)
-                            .padding(.leading, 10 + memberImageSize + 12)
+                            .padding(.leading, memberImageSize + 8 + 12)
                     }
-                    .padding(.bottom, bottomPadding)
+                    .padding(.bottom, 5)
                 }
             } else {
                 HStack(alignment: .center, spacing: 0) {
@@ -919,10 +863,10 @@ struct ChatView: View {
                                 .padding(.leading)
                         }
                     }
-                    chatItemWithMenu(ci, range, maxWidth, itemSeparation)
+                    chatItemWithMenu(ci, range, maxWidth)
                         .padding(.horizontal)
                 }
-                .padding(.bottom, bottomPadding)
+                .padding(.bottom, 5)
             }
         }
 
@@ -937,7 +881,7 @@ struct ChatView: View {
             }
         }
 
-        @ViewBuilder func chatItemWithMenu(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ maxWidth: CGFloat, _ itemSeparation: ItemSeparation) -> some View {
+        @ViewBuilder func chatItemWithMenu(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ maxWidth: CGFloat) -> some View {
             let alignment: Alignment = ci.chatDir.sent ? .trailing : .leading
             VStack(alignment: alignment.horizontal, spacing: 3) {
                 ChatItemView(
@@ -947,8 +891,7 @@ struct ChatView: View {
                     revealed: .constant(revealed),
                     allowMenu: $allowMenu
                 )
-                .environment(\.showTimestamp, itemSeparation.timestamp)
-                .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap))
+                .modifier(ChatItemClipped(ci))
                 .contextMenu { menu(ci, range, live: composeState.liveMessage != nil) }
                 .accessibilityLabel("")
                 if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {

apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift

@@ -751,7 +751,6 @@ struct ComposeView: View {
             case .linkPreview:
                 sent = await send(checkLinkPreview(), quoted: quoted, live: live, ttl: ttl)
             case let .mediaPreviews(mediaPreviews: media):
-                // TODO batch send: batch media previews
                 let last = media.count - 1
                 if last >= 0 {
                     for i in 0..<last {
@@ -888,26 +887,22 @@ struct ComposeView: View {
         }
 
         func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
-            if let chatItems = chat.chatInfo.chatType == .local
-                ? await apiCreateChatItems(
-                    noteFolderId: chat.chatInfo.apiId,
-                    composedMessages: [ComposedMessage(fileSource: file, msgContent: mc)]
-                )
-                : await apiSendMessages(
+            if let chatItem = chat.chatInfo.chatType == .local
+                ? await apiCreateChatItem(noteFolderId: chat.chatInfo.apiId, file: file, msg: mc)
+                : await apiSendMessage(
                     type: chat.chatInfo.chatType,
                     id: chat.chatInfo.apiId,
+                    file: file,
+                    quotedItemId: quoted,
+                    msg: mc,
                     live: live,
-                    ttl: ttl,
-                    composedMessages: [ComposedMessage(fileSource: file, quotedItemId: quoted, msgContent: mc)]
+                    ttl: ttl
                 ) {
                 await MainActor.run {
                     chatModel.removeLiveDummy(animated: false)
-                    for chatItem in chatItems {
-                        chatModel.addChatItem(chat.chatInfo, chatItem)
-                    }
+                    chatModel.addChatItem(chat.chatInfo, chatItem)
                 }
-                // UI only supports sending one item at a time
-                return chatItems.first
+                return chatItem
             }
             if let file = file {
                 removeFile(file.filePath)
@@ -916,21 +911,18 @@ struct ComposeView: View {
         }
 
         func forwardItem(_ forwardedItem: ChatItem, _ fromChatInfo: ChatInfo, _ ttl: Int?) async -> ChatItem? {
-            if let chatItems = await apiForwardChatItems(
+            if let chatItem = await apiForwardChatItem(
                 toChatType: chat.chatInfo.chatType,
                 toChatId: chat.chatInfo.apiId,
                 fromChatType: fromChatInfo.chatType,
                 fromChatId: fromChatInfo.apiId,
-                itemIds: [forwardedItem.id],
+                itemId: forwardedItem.id,
                 ttl: ttl
             ) {
                 await MainActor.run {
-                    for chatItem in chatItems {
-                        chatModel.addChatItem(chat.chatInfo, chatItem)
-                    }
+                    chatModel.addChatItem(chat.chatInfo, chatItem)
                 }
-                // TODO batch send: forward multiple messages
-                return chatItems.first
+                return chatItem
             }
             return nil
         }

apps/ios/Shared/Views/Chat/ReverseList.swift

@@ -8,16 +8,15 @@
 
 import SwiftUI
 import Combine
-import SimpleXChat
 
 /// A List, which displays it's items in reverse order - from bottom to top
-struct ReverseList<Content: View>: UIViewControllerRepresentable {
-    let items: Array<ChatItem>
+struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIViewControllerRepresentable {
+    let items: Array<Item>
 
-    @Binding var scrollState: ReverseListScrollModel.State
+    @Binding var scrollState: ReverseListScrollModel<Item>.State
 
     /// Closure, that returns user interface for a given item
-    let content: (ChatItem) -> Content
+    let content: (Item) -> Content
 
     let loadPage: () -> Void
 
@@ -26,7 +25,6 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
     }
 
     func updateUIViewController(_ controller: Controller, context: Context) {
-        controller.representer = self
         if case let .scrollingTo(destination) = scrollState, !items.isEmpty {
             switch destination {
             case .nextPage:
@@ -44,8 +42,8 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
     /// Controller, which hosts SwiftUI cells
     class Controller: UITableViewController {
         private enum Section { case main }
-        var representer: ReverseList
-        private var dataSource: UITableViewDiffableDataSource<Section, ChatItem>!
+        private let representer: ReverseList
+        private var dataSource: UITableViewDiffableDataSource<Section, Item>!
         private var itemCount: Int = 0
         private var bag = Set<AnyCancellable>()
 
@@ -73,7 +71,7 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
             }
 
             // 3. Configure data source
-            self.dataSource = UITableViewDiffableDataSource<Section, ChatItem>(
+            self.dataSource = UITableViewDiffableDataSource<Section, Item>(
                 tableView: tableView
             ) { (tableView, indexPath, item) -> UITableViewCell? in
                 if indexPath.item > self.itemCount - 8, self.itemCount > 8 {
@@ -173,8 +171,8 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
             Task { representer.scrollState = .atDestination }
         }
 
-        func update(items: [ChatItem]) {
-            var snapshot = NSDiffableDataSourceSnapshot<Section, ChatItem>()
+        func update(items: Array<Item>) {
+            var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
             snapshot.appendSections([.main])
             snapshot.appendItems(items)
             dataSource.defaultRowAnimation = .none
@@ -190,30 +188,6 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
                 )
             }
             itemCount = items.count
-            updateVisibleItems()
-        }
-
-        override func scrollViewDidScroll(_ scrollView: UIScrollView) {
-            updateVisibleItems()
-        }
-
-        private func updateVisibleItems() {
-            ChatView.FloatingButtonModel.shared.visibleItems.send(
-                (tableView.indexPathsForVisibleRows ?? [])
-                    .compactMap { indexPath -> String? in
-                        let relativeFrame = tableView.superview!.convert(
-                            tableView.rectForRow(at: indexPath),
-                            from: tableView
-                        )
-                        // Checks that the cell is visible accounting for the added insets
-                        let isVisible =
-                            relativeFrame.maxY > InvertedTableView.inset &&
-                            relativeFrame.minY < tableView.frame.height - InvertedTableView.inset
-                        return indexPath.item < representer.items.count && isVisible
-                        ? representer.items[indexPath.item].viewId
-                        : nil
-                    }
-            )
         }
     }
 
@@ -258,12 +232,12 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
 }
 
 /// Manages ``ReverseList`` scrolling
-class ReverseListScrollModel: ObservableObject {
+class ReverseListScrollModel<Item: Identifiable>: ObservableObject {
     /// Represents Scroll State of ``ReverseList``
     enum State: Equatable {
         enum Destination: Equatable {
             case nextPage
-            case item(ChatItem.ID)
+            case item(Item.ID)
             case bottom
         }
 
@@ -281,7 +255,7 @@ class ReverseListScrollModel: ObservableObject {
         state = .scrollingTo(.bottom)
     }
 
-    func scrollToItem(id: ChatItem.ID) {
+    func scrollToItem(id: Item.ID) {
         state = .scrollingTo(.item(id))
     }
 }

apps/ios/Shared/Views/ChatList/ChatPreviewView.swift

@@ -324,12 +324,12 @@ struct ChatPreviewView: View {
         case let .image(_, image):
             smallContentPreview(size: dynamicMediaSize) {
                 CIImageView(chatItem: ci, preview: UIImage(base64Encoded: image), maxWidth: dynamicMediaSize, smallView: true, showFullScreenImage: $showFullscreenGallery)
-                    .environmentObject(ReverseListScrollModel())
+                    .environmentObject(ReverseListScrollModel<ChatItem>())
             }
         case let .video(_,image, duration):
             smallContentPreview(size: dynamicMediaSize) {
                 CIVideoView(chatItem: ci, preview: UIImage(base64Encoded: image), duration: duration, maxWidth: dynamicMediaSize, videoWidth: nil, smallView: true, showFullscreenPlayer: $showFullscreenGallery)
-                    .environmentObject(ReverseListScrollModel())
+                    .environmentObject(ReverseListScrollModel<ChatItem>())
             }
         case let .voice(_, duration):
             smallContentPreviewVoice(size: dynamicMediaSize) {

apps/ios/Shared/Views/ChatList/ServersSummaryView.swift

@@ -407,12 +407,18 @@ struct ServersSummaryView: View {
 
 struct SubscriptionStatusIndicatorView: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     var subs: SMPServerSubs
     var hasSess: Bool
 
     var body: some View {
-        let onionHosts = networkUseOnionHostsGroupDefault.get()
-        let (color, variableValue, opacity, _) = subscriptionStatusColorAndPercentage(m.networkInfo.online, onionHosts, subs, hasSess)
+        let (color, variableValue, opacity, _) = subscriptionStatusColorAndPercentage(
+            online: m.networkInfo.online,
+            usesProxy: networkUseOnionHostsGroupDefault.get() != .no || groupDefaults.string(forKey: GROUP_DEFAULT_NETWORK_SOCKS_PROXY) != nil,
+            subs: subs,
+            hasSess: hasSess,
+            primaryColor: theme.colors.primary
+        )
         if #available(iOS 16.0, *) {
             Image(systemName: "dot.radiowaves.up.forward", variableValue: variableValue)
                 .foregroundColor(color)
@@ -425,26 +431,32 @@ struct SubscriptionStatusIndicatorView: View {
 
 struct SubscriptionStatusPercentageView: View {
     @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
     var subs: SMPServerSubs
     var hasSess: Bool
 
     var body: some View {
-        let onionHosts = networkUseOnionHostsGroupDefault.get()
-        let (_, _, _, statusPercent) = subscriptionStatusColorAndPercentage(m.networkInfo.online, onionHosts, subs, hasSess)
+        let (_, _, _, statusPercent) = subscriptionStatusColorAndPercentage(
+            online: m.networkInfo.online,
+            usesProxy: networkUseOnionHostsGroupDefault.get() != .no || groupDefaults.string(forKey: GROUP_DEFAULT_NETWORK_SOCKS_PROXY) != nil,
+            subs: subs,
+            hasSess: hasSess,
+            primaryColor: theme.colors.primary
+        )
         Text(verbatim: "\(Int(floor(statusPercent * 100)))%")
             .foregroundColor(.secondary)
             .font(.caption)
     }
 }
 
-func subscriptionStatusColorAndPercentage(_ online: Bool, _ onionHosts: OnionHosts, _ subs: SMPServerSubs, _ hasSess: Bool) -> (Color, Double, Double, Double) {
+func subscriptionStatusColorAndPercentage(online: Bool, usesProxy: Bool, subs: SMPServerSubs, hasSess: Bool, primaryColor: Color) -> (Color, Double, Double, Double) {
     func roundedToQuarter(_ n: Double) -> Double {
         n >= 1 ? 1
         : n <= 0 ? 0
         : (n * 4).rounded() / 4
     }
 
-    let activeColor: Color = onionHosts == .require ? .indigo : .accentColor
+    let activeColor: Color = usesProxy ? .indigo : primaryColor
     let noConnColorAndPercent: (Color, Double, Double, Double) = (Color(uiColor: .tertiaryLabel), 1, 1, 0)
     let activeSubsRounded = roundedToQuarter(subs.shareOfActive)
 

apps/ios/Shared/Views/Helpers/ChatItemClipShape.swift

@@ -14,60 +14,50 @@ import SimpleXChat
 /// Supports [Dynamic Type](https://developer.apple.com/documentation/uikit/uifont/scaling_fonts_automatically)
 /// by retaining pill shape, even when ``ChatItem``'s height is less that twice its corner radius
 struct ChatItemClipped: ViewModifier {
-    @AppStorage(DEFAULT_CHAT_ITEM_ROUNDNESS) private var roundness = defaultChatItemRoundness
-    @AppStorage(DEFAULT_CHAT_ITEM_TAIL) private var tailEnabled = true
-    private let chatItem: (content: CIContent, chatDir: CIDirection)?
-    private let tailVisible: Bool
-
-    init() {
-        self.chatItem = nil
-        self.tailVisible = false
-    }
-
-    init(_ ci: ChatItem, tailVisible: Bool) {
-        self.chatItem = (ci.content, ci.chatDir)
-        self.tailVisible = tailVisible
+    struct ClipShape: Shape {
+        let maxCornerRadius: Double
+        
+        func path(in rect: CGRect) -> Path {
+            Path(
+                roundedRect: rect,
+                cornerRadius: min((rect.height / 2), maxCornerRadius), 
+                style: .circular
+            )
+        }
     }
     
-    private func shapeStyle() -> ChatItemShape.Style {
-        if let ci = chatItem {
-            switch ci.content {
-            case
-                    .sndMsgContent,
+    init() {
+        clipShape = ClipShape(
+            maxCornerRadius: 18
+        )
+    }
+    
+    init(_ chatItem: ChatItem) {
+        clipShape = ClipShape(
+            maxCornerRadius: {
+                switch chatItem.content {
+                case 
+                    .sndMsgContent, 
                     .rcvMsgContent,
                     .rcvDecryptionError,
                     .rcvGroupInvitation,
                     .sndGroupInvitation,
-                    .sndDeleted,
+                    .sndDeleted, 
                     .rcvDeleted,
                     .rcvIntegrityError,
-                    .sndModerated,
-                    .rcvModerated,
+                    .sndModerated, 
+                    .rcvModerated, 
                     .rcvBlocked,
-                    .invalidJSON:
-                let tail = if let mc = ci.content.msgContent, mc.isImageOrVideo && mc.text.isEmpty {
-                    false
-                } else {
-                    tailVisible
+                    .invalidJSON: 18
+                default: 8
                 }
-                return tailEnabled
-                ? .bubble(
-                    padding: ci.chatDir.sent ? .trailing : .leading,
-                    tailVisible: tail
-                )
-                : .roundRect(radius: msgRectMaxRadius)
-            default: return .roundRect(radius: 8)
-            }
-        } else {
-            return.roundRect(radius: msgRectMaxRadius)
-        }
-    }
-
-    func body(content: Content) -> some View {
-        let clipShape = ChatItemShape(
-            roundness: roundness,
-            style: shapeStyle()
+            }()
         )
+    }
+    
+    private let clipShape: ClipShape
+    
+    func body(content: Content) -> some View {
         content
             .contentShape(.dragPreview, clipShape)
             .contentShape(.contextMenuPreview, clipShape)
@@ -75,106 +65,4 @@ struct ChatItemClipped: ViewModifier {
     }
 }
 
-struct ChatTailPadding: ViewModifier {
-    func body(content: Content) -> some View {
-        content.padding(.horizontal, -msgTailWidth)
-    }
-}
 
-private let msgRectMaxRadius: Double = 18
-private let msgBubbleMaxRadius: Double = msgRectMaxRadius * 1.2
-private let msgTailWidth: Double = 9
-private let msgTailMinHeight: Double = msgTailWidth * 1.254 // ~56deg
-private let msgTailMaxHeight: Double = msgTailWidth * 1.732 // 60deg
-
-struct ChatItemShape: Shape {
-    fileprivate enum Style {
-        case bubble(padding: HorizontalEdge, tailVisible: Bool)
-        case roundRect(radius: Double)
-    }
-
-    fileprivate let roundness: Double
-    fileprivate let style: Style
-
-    func path(in rect: CGRect) -> Path {
-        switch style {
-        case let .bubble(padding, tailVisible):
-            let w = rect.width
-            let h = rect.height
-            let rxMax = min(msgBubbleMaxRadius, w / 2)
-            let ryMax = min(msgBubbleMaxRadius, h / 2)
-            let rx = roundness * rxMax
-            let ry = roundness * ryMax
-            let tailHeight = min(msgTailMinHeight + roundness * (msgTailMaxHeight - msgTailMinHeight), h / 2)
-            var path = Path()
-            // top side
-            path.move(to: CGPoint(x: rx, y: 0))
-            path.addLine(to: CGPoint(x: w - rx, y: 0))
-            if roundness > 0 {
-                // top-right corner
-                path.addQuadCurve(to: CGPoint(x: w, y: ry), control: CGPoint(x: w, y: 0))
-            }
-            if rect.height > 2 * ry {
-                // right side
-                path.addLine(to: CGPoint(x: w, y: h - ry))
-            }
-            if roundness > 0 {
-                // bottom-right corner
-                path.addQuadCurve(to: CGPoint(x: w - rx, y: h), control: CGPoint(x: w, y: h))
-            }
-            // bottom side
-            if tailVisible {
-                path.addLine(to: CGPoint(x: -msgTailWidth, y: h))
-                if roundness > 0 {
-                    // bottom-left tail
-                    // distance of control point from touch point, calculated via ratios
-                    let d = tailHeight - msgTailWidth * msgTailWidth / tailHeight
-                    // tail control point
-                    let tc = CGPoint(x: 0, y: h - tailHeight + d * sqrt(roundness))
-                    // bottom-left tail curve
-                    path.addQuadCurve(to: CGPoint(x: 0, y: h - tailHeight), control: tc)
-                } else {
-                    path.addLine(to: CGPoint(x: 0, y: h - tailHeight))
-                }
-                if rect.height > ry + tailHeight {
-                    // left side
-                    path.addLine(to: CGPoint(x: 0, y: ry))
-                }
-            } else {
-                path.addLine(to: CGPoint(x: rx, y: h))
-                path.addQuadCurve(to: CGPoint(x: 0, y: h - ry), control: CGPoint(x: 0 , y: h))
-                if rect.height > 2 * ry {
-                    // left side
-                    path.addLine(to: CGPoint(x: 0, y: ry))
-                }
-            }
-            if roundness > 0 {
-                // top-left corner
-                path.addQuadCurve(to: CGPoint(x: rx, y: 0), control: CGPoint(x: 0, y: 0))
-            }
-            path.closeSubpath()
-            return switch padding {
-            case .leading: path
-            case .trailing: path
-                    .scale(x: -1, y: 1, anchor: .center)
-                    .path(in: rect)
-            }
-        case let .roundRect(radius):
-            return Path(roundedRect: rect, cornerRadius: radius * roundness)
-        }
-    }
-
-    var offset: Double? {
-        switch style {
-        case let .bubble(padding, isTailVisible):
-            if isTailVisible {
-                switch padding {
-                case .leading: -msgTailWidth
-                case .trailing: msgTailWidth
-                }
-            } else { 0 }
-        case .roundRect: 0
-        }
-    }
-
-}

apps/ios/Shared/Views/Migration/MigrateFromDevice.swift

@@ -24,6 +24,7 @@ private enum MigrationFromState: Equatable {
 }
 
 private enum MigrateFromDeviceViewAlert: Identifiable {
+    case finishMigration(_ fileId: Int64, _ ctrl: chat_ctrl)
     case deleteChat(_ title: LocalizedStringKey = "Delete chat profile?", _ text: LocalizedStringKey = "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.")
     case startChat(_ title: LocalizedStringKey = "Start chat?", _ text: LocalizedStringKey = "Warning: starting chat on multiple devices is not supported and will cause message delivery failures")
 
@@ -38,6 +39,7 @@ private enum MigrateFromDeviceViewAlert: Identifiable {
 
     var id: String {
         switch self {
+        case .finishMigration: return "finishMigration"
         case let .deleteChat(title, text): return "\(title) \(text)"
         case let .startChat(title, text): return "\(title) \(text)"
 
@@ -138,6 +140,15 @@ struct MigrateFromDevice: View {
         }
         .alert(item: $alert) { alert in
             switch alert {
+            case let .finishMigration(fileId, ctrl):
+                return Alert(
+                    title: Text("Remove archive?"),
+                    message: Text("The uploaded database archive will be permanently removed from the servers."),
+                    primaryButton: .destructive(Text("Continue")) {
+                        finishMigration(fileId, ctrl)
+                    },
+                    secondaryButton: .cancel()
+                )
             case let .startChat(title, text):
                 return Alert(
                     title: Text(title),
@@ -318,7 +329,7 @@ struct MigrateFromDevice: View {
                         Text("Cancel migration").foregroundColor(.red)
                     }
                 }
-                Button(action: { finishMigration(fileId, ctrl) }) {
+                Button(action: { alert = .finishMigration(fileId, ctrl) }) {
                     settingsRow("checkmark", color: theme.colors.secondary) {
                         Text("Finalize migration").foregroundColor(theme.colors.primary)
                     }
@@ -523,9 +534,15 @@ struct MigrateFromDevice: View {
                         }
                     case let .sndStandaloneFileComplete(_, fileTransferMeta, rcvURIs):
                         let cfg = getNetCfg()
+                        let proxy: NetworkProxy? = if cfg.socksProxy == nil {
+                            nil
+                        } else {
+                            networkProxyDefault.get()
+                        }
                         let data = MigrationFileLinkData.init(
                             networkConfig: MigrationFileLinkData.NetworkConfig(
                                 socksProxy: cfg.socksProxy,
+                                networkProxy: proxy,
                                 hostMode: cfg.hostMode,
                                 requiredHostMode: cfg.requiredHostMode
                             )

apps/ios/Shared/Views/Migration/MigrateToDevice.swift

@@ -93,7 +93,6 @@ struct MigrateToDevice: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
-    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @Binding var migrationState: MigrationToState?
     @State private var useKeychain = storeDBPassphraseGroupDefault.get()
     @State private var alert: MigrateToDeviceViewAlert?
@@ -102,6 +101,7 @@ struct MigrateToDevice: View {
     // Prevent from hiding the view until migration is finished or app deleted
     @State private var backDisabled: Bool = false
     @State private var showQRCodeScanner: Bool = true
+    @State private var pasteboardHasStrings = UIPasteboard.general.hasStrings
 
     var body: some View {
         VStack {
@@ -197,10 +197,8 @@ struct MigrateToDevice: View {
                         }
                     }
                 }
-                if developerTools {
-                    Section(header: Text("Or paste archive link").foregroundColor(theme.colors.secondary)) {
-                        pasteLinkView()
-                    }
+                Section(header: Text("Or paste archive link").foregroundColor(theme.colors.secondary)) {
+                    pasteLinkView()
                 }
             }
         }
@@ -218,7 +216,7 @@ struct MigrateToDevice: View {
         } label: {
             Text("Tap to paste link")
         }
-        .disabled(!ChatModel.shared.pasteboardHasStrings)
+        .disabled(!pasteboardHasStrings)
         .frame(maxWidth: .infinity, alignment: .center)
     }
 
@@ -487,6 +485,9 @@ struct MigrateToDevice: View {
             do {
                 if !hasChatCtrl() {
                     chatInitControllerRemovingDatabases()
+                } else if ChatModel.shared.chatRunning == true {
+                    // cannot delete storage if chat is running
+                    try await apiStopChat()
                 }
                 try await apiDeleteStorage()
                 try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
@@ -556,11 +557,22 @@ struct MigrateToDevice: View {
         do {
             try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
             MigrationToDeviceState.save(nil)
-            appSettings.importIntoApp()
-            try SimpleX.startChat(refreshInvitations: true)
-            AlertManager.shared.showAlertMsg(title: "Chat migrated!", message: "Finalize migration on another device.")
+            try ObjC.catchException {
+                appSettings.importIntoApp()
+            }
+            do {
+                try SimpleX.startChat(refreshInvitations: true)
+                AlertManager.shared.showAlertMsg(title: "Chat migrated!", message: "Finalize migration on another device.")
+            } catch let error {
+                AlertManager.shared.showAlert(Alert(title: Text("Error starting chat"), message: Text(responseError(error))))
+            }
         } catch let error {
-            AlertManager.shared.showAlert(Alert(title: Text("Error starting chat"), message: Text(responseError(error))))
+            logger.error("Error importing settings: \(error.localizedDescription)")
+            AlertManager.shared.showAlert(
+                Alert(
+                    title: Text("Error migrating settings"),
+                    message: Text ("Not all settings were migrated. Repeat migration if you need them.") + Text("\n\n") + Text(responseError(error)))
+            )
         }
         hideView()
     }

apps/ios/Shared/Views/NewChat/AddContactLearnMore.swift

@@ -28,9 +28,7 @@ struct AddContactLearnMore: View {
                 Text("If you can't meet in person, show QR code in a video call, or share the link.")
                 Text("Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends).")
             }
-            .frame(maxWidth: .infinity, alignment: .leading)
             .listRowBackground(Color.clear)
-            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
         }
         .modifier(ThemedBackground(grouped: true))
     }

apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift

@@ -14,10 +14,9 @@ enum ContactType: Int {
 }
 
 struct NewChatMenuButton: View {
-    @EnvironmentObject var chatModel: ChatModel
     @State private var showNewChatSheet = false
     @State private var alert: SomeAlert? = nil
-    @State private var pendingConnection: PendingContactConnection? = nil
+    @State private var globalAlert: SomeAlert? = nil
 
     var body: some View {
             Button {
@@ -29,14 +28,22 @@ struct NewChatMenuButton: View {
                 .frame(width: 24, height: 24)
         }
         .appSheet(isPresented: $showNewChatSheet) {
-            NewChatSheet(pendingConnection: $pendingConnection)
+            NewChatSheet(alert: $alert)
                 .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
-                .onDisappear {
-                    alert = cleanupPendingConnection(chatModel: chatModel, contactConnection: pendingConnection)
-                    pendingConnection = nil
+                .alert(item: $alert) { a in
+                    return a.alert
                 }
         }
-        .alert(item: $alert) { a in
+        // This is a workaround to show "Keep unused invitation" alert in both following cases:
+        // - on going back from NewChatView to NewChatSheet,
+        // - on dismissing NewChatMenuButton sheet while on NewChatView (skipping NewChatSheet)
+        .onChange(of: alert?.id) { a in
+            if !showNewChatSheet && alert != nil {
+                globalAlert = alert
+                alert = nil
+            }
+        }
+        .alert(item: $globalAlert) { a in
             return a.alert
         }
     }
@@ -53,8 +60,7 @@ struct NewChatSheet: View {
     @State private var searchText = ""
     @State private var searchShowingSimplexLink = false
     @State private var searchChatFilteredBySimplexLink: String? = nil
-    @State private var alert: SomeAlert?
-    @Binding var pendingConnection: PendingContactConnection?
+    @Binding var alert: SomeAlert?
 
     // Sheet height management
     @State private var isAddContactActive = false
@@ -72,9 +78,6 @@ struct NewChatSheet: View {
                 .navigationBarTitleDisplayMode(.large)
                 .navigationBarHidden(searchMode)
                 .modifier(ThemedBackground(grouped: true))
-                .alert(item: $alert) { a in
-                    return a.alert
-                }
         }
         if #available(iOS 16.0, *), oneHandUI {
             let sheetHeight: CGFloat = showArchive ? 575 : 500
@@ -109,7 +112,7 @@ struct NewChatSheet: View {
             if (searchText.isEmpty) {
                 Section {
                     NavigationLink(isActive: $isAddContactActive) {
-                        NewChatView(selection: .invite, parentAlert: $alert, contactConnection: $pendingConnection)
+                        NewChatView(selection: .invite, parentAlert: $alert)
                             .navigationTitle("New chat")
                             .modifier(ThemedBackground(grouped: true))
                             .navigationBarTitleDisplayMode(.large)
@@ -119,7 +122,7 @@ struct NewChatSheet: View {
                         }
                     }
                     NavigationLink(isActive: $isScanPasteLinkActive) {
-                        NewChatView(selection: .connect, showQRCodeScanner: true, parentAlert: $alert, contactConnection: $pendingConnection)
+                        NewChatView(selection: .connect, showQRCodeScanner: true, parentAlert: $alert)
                             .navigationTitle("New chat")
                             .modifier(ThemedBackground(grouped: true))
                             .navigationBarTitleDisplayMode(.large)
@@ -196,7 +199,7 @@ func chatContactType(chat: Chat) -> ContactType {
     case .contactRequest:
         return .request
     case let .direct(contact):
-        if contact.activeConn == nil && contact.profile.contactLink != nil {
+        if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
             return .card
         } else if contact.chatDeleted {
             return .chatDeleted

apps/ios/Shared/Views/NewChat/NewChatView.swift

@@ -45,47 +45,18 @@ enum NewChatOption: Identifiable {
     var id: Self { self }
 }
 
-func cleanupPendingConnection(chatModel: ChatModel, contactConnection: PendingContactConnection?) -> SomeAlert? {
-    var alert: SomeAlert? = nil
-
-    if !(chatModel.showingInvitation?.connChatUsed ?? true),
-       let conn = contactConnection {
-        alert = SomeAlert(
-            alert: Alert(
-                title: Text("Keep unused invitation?"),
-                message: Text("You can view invitation link again in connection details."),
-                primaryButton: .default(Text("Keep")) {},
-                secondaryButton: .destructive(Text("Delete")) {
-                    Task {
-                        await deleteChat(Chat(
-                            chatInfo: .contactConnection(contactConnection: conn),
-                            chatItems: []
-                        ))
-                    }
-                }
-            ),
-            id: "keepUnusedInvitation"
-        )
-    }
-    
-    chatModel.showingInvitation = nil
-
-    return alert
-}
-
 struct NewChatView: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
     @State var selection: NewChatOption
     @State var showQRCodeScanner = false
     @State private var invitationUsed: Bool = false
+    @State private var contactConnection: PendingContactConnection? = nil
     @State private var connReqInvitation: String = ""
     @State private var creatingConnReq = false
-    @State var choosingProfile = false
     @State private var pastedLink: String = ""
     @State private var alert: NewChatViewAlert?
     @Binding var parentAlert: SomeAlert?
-    @Binding var contactConnection: PendingContactConnection?
 
     var body: some View {
         VStack(alignment: .leading) {
@@ -151,10 +122,26 @@ struct NewChatView: View {
             }
         }
         .onDisappear {
-            if !choosingProfile {
-                parentAlert = cleanupPendingConnection(chatModel: m, contactConnection: contactConnection)
-                contactConnection = nil
+            if !(m.showingInvitation?.connChatUsed ?? true),
+               let conn = contactConnection {
+                parentAlert = SomeAlert(
+                    alert: Alert(
+                        title: Text("Keep unused invitation?"),
+                        message: Text("You can view invitation link again in connection details."),
+                        primaryButton: .default(Text("Keep")) {},
+                        secondaryButton: .destructive(Text("Delete")) {
+                            Task {
+                                await deleteChat(Chat(
+                                    chatInfo: .contactConnection(contactConnection: conn),
+                                    chatItems: []
+                                ))
+                            }
+                        }
+                    ),
+                    id: "keepUnusedInvitation"
+                )
             }
+            m.showingInvitation = nil
         }
         .alert(item: $alert) { a in
             switch(a) {
@@ -172,8 +159,7 @@ struct NewChatView: View {
                 InviteView(
                     invitationUsed: $invitationUsed,
                     contactConnection: $contactConnection,
-                    connReqInvitation: $connReqInvitation,
-                    choosingProfile: $choosingProfile
+                    connReqInvitation: connReqInvitation
                 )
             } else if creatingConnReq {
                 creatingLinkProgressView()
@@ -224,24 +210,13 @@ struct NewChatView: View {
     }
 }
 
-private func incognitoProfileImage() -> some View {
-    Image(systemName: "theatermasks.fill")
-        .resizable()
-        .scaledToFit()
-        .frame(width: 30)
-        .foregroundColor(.indigo)
-}
-
 private struct InviteView: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme
     @Binding var invitationUsed: Bool
     @Binding var contactConnection: PendingContactConnection?
-    @Binding var connReqInvitation: String
-    @Binding var choosingProfile: Bool
-
+    var connReqInvitation: String
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
-    @State private var showSettings: Bool = false
 
     var body: some View {
         List {
@@ -251,40 +226,28 @@ private struct InviteView: View {
             .listRowInsets(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 10))
 
             qrCodeView()
-            if let selectedProfile = chatModel.currentUser {
-                Section {
-                    NavigationLink {
-                        ActiveProfilePicker(
-                            contactConnection: $contactConnection,
-                            connReqInvitation: $connReqInvitation,
-                            incognitoEnabled: $incognitoDefault,
-                            choosingProfile: $choosingProfile,
-                            selectedProfile: selectedProfile
-                        )
-                    } label: {
-                        HStack {
-                            if incognitoDefault {
-                                incognitoProfileImage()
-                                Text("Incognito")
-                            } else {
-                                ProfileImage(imageStr: chatModel.currentUser?.image, size: 30)
-                                Text(chatModel.currentUser?.chatViewName ?? "")
-                            }
-                        }
-                    }
-                } header: {
-                    Text("Share profile").foregroundColor(theme.colors.secondary)
-                } footer: {
-                     if incognitoDefault {
-                         Text("A new random profile will be shared.")
-                     }
-                }
+
+            Section {
+                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+            } footer: {
+                sharedProfileInfo(incognitoDefault)
+                    .foregroundColor(theme.colors.secondary)
             }
         }
         .onChange(of: incognitoDefault) { incognito in
-            setInvitationUsed()
-        }
-        .onChange(of: chatModel.currentUser) { u in
+            Task {
+                do {
+                    if let contactConn = contactConnection,
+                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
+                        await MainActor.run {
+                            contactConnection = conn
+                            chatModel.updateContactConnection(conn)
+                        }
+                    }
+                } catch {
+                    logger.error("apiSetConnectionIncognito error: \(responseError(error))")
+                }
+            }
             setInvitationUsed()
         }
     }
@@ -307,7 +270,6 @@ private struct InviteView: View {
     private func qrCodeView() -> some View {
         Section(header: Text("Or show this code").foregroundColor(theme.colors.secondary)) {
             SimpleXLinkQRCode(uri: connReqInvitation, onShare: setInvitationUsed)
-                .id("simplex-qrcode-view-for-\(connReqInvitation)")
                 .padding()
                 .background(
                     RoundedRectangle(cornerRadius: 12, style: .continuous)
@@ -327,257 +289,6 @@ private struct InviteView: View {
     }
 }
 
-private enum ProfileSwitchStatus {
-    case switchingUser
-    case switchingIncognito
-    case idle
-}
-
-private struct ActiveProfilePicker: View {
-    @Environment(\.dismiss) var dismiss
-    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
-    @Binding var contactConnection: PendingContactConnection?
-    @Binding var connReqInvitation: String
-    @Binding var incognitoEnabled: Bool
-    @Binding var choosingProfile: Bool
-    @State private var alert: SomeAlert?
-    @State private var profileSwitchStatus: ProfileSwitchStatus = .idle
-    @State private var switchingProfileByTimeout = false
-    @State private var lastSwitchingProfileByTimeoutCall: Double?
-    @State private var profiles: [User] = []
-    @State private var searchTextOrPassword = ""
-    @State private var showIncognitoSheet = false
-    @State private var incognitoFirst: Bool = false
-    @State var selectedProfile: User
-    var trimmedSearchTextOrPassword: String { searchTextOrPassword.trimmingCharacters(in: .whitespaces)}
-
-    var body: some View {
-        viewBody()
-            .navigationTitle("Select chat profile")
-            .searchable(text: $searchTextOrPassword, placement: .navigationBarDrawer(displayMode: .always))
-            .autocorrectionDisabled(true)
-            .navigationBarTitleDisplayMode(.large)
-            .onAppear {
-                profiles = chatModel.users
-                    .map { $0.user }
-                    .sorted { u, _ in u.activeUser }
-            }
-            .onChange(of: incognitoEnabled) { incognito in
-                if profileSwitchStatus != .switchingIncognito {
-                    return
-                }
-
-                Task {
-                    do {
-                        if let contactConn = contactConnection,
-                           let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
-                            await MainActor.run {
-                                contactConnection = conn
-                                chatModel.updateContactConnection(conn)
-                                profileSwitchStatus = .idle
-                                dismiss()
-                            }
-                        }
-                    } catch {
-                        profileSwitchStatus = .idle
-                        incognitoEnabled = !incognito
-                        logger.error("apiSetConnectionIncognito error: \(responseError(error))")
-                        let err = getErrorAlert(error, "Error changing to incognito!")
-
-                        alert = SomeAlert(
-                            alert: Alert(
-                                title: Text(err.title),
-                                message: Text(err.message ?? "Error: \(responseError(error))")
-                            ),
-                            id: "setConnectionIncognitoError"
-                        )
-                    }
-                }
-            }
-            .onChange(of: profileSwitchStatus) { sp in
-                if sp != .idle {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                        switchingProfileByTimeout = profileSwitchStatus != .idle
-                    }
-                } else {
-                    switchingProfileByTimeout = false
-                }
-            }
-            .onChange(of: selectedProfile) { profile in
-                if (profileSwitchStatus != .switchingUser) {
-                    return
-                }
-                Task {
-                    do {
-                        if let contactConn = contactConnection,
-                           let conn = try await apiChangeConnectionUser(connId: contactConn.pccConnId, userId: profile.userId) {
-                            
-                            await MainActor.run {
-                                contactConnection = conn
-                                connReqInvitation = conn.connReqInv ?? ""
-                                incognitoEnabled = false
-                                chatModel.updateContactConnection(conn)
-                            }
-                            do {
-                                try await changeActiveUserAsync_(profile.userId, viewPwd: profile.hidden ? trimmedSearchTextOrPassword : nil )
-                                await MainActor.run {
-                                    profileSwitchStatus = .idle
-                                    dismiss()
-                                }
-                            } catch {
-                                await MainActor.run {
-                                    profileSwitchStatus = .idle
-                                    alert = SomeAlert(
-                                        alert: Alert(
-                                            title: Text("Error switching profile"),
-                                            message: Text("Your connection was moved to \(profile.chatViewName) but an unexpected error occurred while redirecting you to the profile.")
-                                        ),
-                                        id: "switchingProfileError"
-                                    )
-                                }
-                            }
-                        }
-                    } catch {
-                        await MainActor.run {
-                            profileSwitchStatus = .idle
-                            if let currentUser = chatModel.currentUser {
-                                selectedProfile = currentUser
-                            }
-                            let err = getErrorAlert(error, "Error changing connection profile")
-                            alert = SomeAlert(
-                                alert: Alert(
-                                    title: Text(err.title),
-                                    message: Text(err.message ?? "Error: \(responseError(error))")
-                                ),
-                                id: "changeConnectionUserError"
-                            )
-                        }
-                    }
-                }
-            }
-            .alert(item: $alert) { a in
-                a.alert
-            }
-            .onAppear {
-                incognitoFirst = incognitoEnabled
-                choosingProfile = true
-            }
-            .onDisappear {
-                choosingProfile = false
-            }
-            .sheet(isPresented: $showIncognitoSheet) {
-                IncognitoHelp()
-            }
-    }
-    
-    
-    @ViewBuilder private func viewBody() -> some View {
-        profilePicker()
-            .allowsHitTesting(!switchingProfileByTimeout)
-            .modifier(ThemedBackground(grouped: true))
-            .overlay {
-                if switchingProfileByTimeout {
-                    ProgressView()
-                        .scaleEffect(2)
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                }
-            }
-    }
-    
-    private func filteredProfiles() -> [User] {
-        let s = trimmedSearchTextOrPassword
-        let lower = s.localizedLowercase
-        
-        return profiles.filter { u in
-            if (u.activeUser || !u.hidden) && (s == "" || u.chatViewName.localizedLowercase.contains(lower)) {
-                return true
-            }
-            return correctPassword(u, s)
-        }
-    }
-    
-    @ViewBuilder private func profilerPickerUserOption(_ user: User) -> some View {
-        Button {
-            if selectedProfile == user && incognitoEnabled {
-                incognitoEnabled = false
-                profileSwitchStatus = .switchingIncognito
-            } else if selectedProfile != user {
-                selectedProfile = user
-                profileSwitchStatus = .switchingUser
-            }
-        } label: {
-            HStack {
-                ProfileImage(imageStr: user.image, size: 30)
-                    .padding(.trailing, 2)
-                Text(user.chatViewName)
-                    .foregroundColor(theme.colors.onBackground)
-                    .lineLimit(1)
-                Spacer()
-                if selectedProfile == user, !incognitoEnabled {
-                    Image(systemName: "checkmark")
-                        .resizable().scaledToFit().frame(width: 16)
-                        .foregroundColor(theme.colors.primary)
-                }
-            }
-        }
-    }
-        
-    @ViewBuilder private func profilePicker() -> some View {
-        let incognitoOption = Button {
-            if !incognitoEnabled {
-                incognitoEnabled = true
-                profileSwitchStatus = .switchingIncognito
-            }
-        } label : {
-            HStack {
-                incognitoProfileImage()
-                Text("Incognito")
-                    .foregroundColor(theme.colors.onBackground)
-                Image(systemName: "info.circle")
-                    .foregroundColor(theme.colors.primary)
-                    .font(.system(size: 14))
-                    .onTapGesture {
-                        showIncognitoSheet = true
-                    }
-                Spacer()
-                if incognitoEnabled {
-                    Image(systemName: "checkmark")
-                        .resizable().scaledToFit().frame(width: 16)
-                        .foregroundColor(theme.colors.primary)
-                }
-            }
-        }
-        
-        List {
-            let filteredProfiles = filteredProfiles()
-            let activeProfile = filteredProfiles.first { u in u.activeUser }
-            
-            if let selectedProfile = activeProfile {
-                let otherProfiles = filteredProfiles.filter { u in u.userId != activeProfile?.userId }
-                
-                if incognitoFirst {
-                    incognitoOption
-                    profilerPickerUserOption(selectedProfile)
-                } else {
-                    profilerPickerUserOption(selectedProfile)
-                    incognitoOption
-                }
-                
-                ForEach(otherProfiles) { p in
-                    profilerPickerUserOption(p)
-                }
-            } else {
-                incognitoOption
-                ForEach(filteredProfiles) { p in
-                    profilerPickerUserOption(p)
-                }
-            }
-        }
-        .opacity(switchingProfileByTimeout ? 0.4 : 1)
-    }
-}
-
 private struct ConnectView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @EnvironmentObject var theme: AppTheme
@@ -585,6 +296,7 @@ private struct ConnectView: View {
     @Binding var pastedLink: String
     @Binding var alert: NewChatViewAlert?
     @State private var sheet: PlanAndConnectActionSheet?
+    @State private var pasteboardHasStrings = UIPasteboard.general.hasStrings
 
     var body: some View {
         List {
@@ -621,7 +333,7 @@ private struct ConnectView: View {
             } label: {
                 Text("Tap to paste link")
             }
-            .disabled(!ChatModel.shared.pasteboardHasStrings)
+            .disabled(!pasteboardHasStrings)
             .frame(maxWidth: .infinity, alignment: .center)
         } else {
             linkTextView(pastedLink)
@@ -1264,12 +976,10 @@ func connReqSentAlert(_ type: ConnReqType) -> Alert {
 struct NewChatView_Previews: PreviewProvider {
     static var previews: some View {
         @State var parentAlert: SomeAlert?
-        @State var contactConnection: PendingContactConnection? = nil
 
         NewChatView(
             selection: .invite,
-            parentAlert: $parentAlert,
-            contactConnection: $contactConnection
+            parentAlert: $parentAlert
         )
     }
 }

apps/ios/Shared/Views/TerminalView.swift

@@ -160,7 +160,7 @@ struct TerminalView_Previews: PreviewProvider {
         let chatModel = ChatModel()
         chatModel.terminalItems = [
             .resp(.now, ChatResponse.response(type: "contactSubscribed", json: "{}")),
-            .resp(.now, ChatResponse.response(type: "newChatItems", json: "{}"))
+            .resp(.now, ChatResponse.response(type: "newChatItem", json: "{}"))
         ]
         return NavigationView {
             TerminalView()

apps/ios/Shared/Views/UserSettings/AdvancedNetworkSettings.swift

@@ -36,6 +36,10 @@ struct AdvancedNetworkSettings: View {
     @State private var showSettingsAlert: NetworkSettingsAlert?
     @State private var onionHosts: OnionHosts = .no
     @State private var showSaveDialog = false
+    @State private var netProxy = networkProxyDefault.get()
+    @State private var currentNetProxy = networkProxyDefault.get()
+    @State private var useNetProxy = false
+    @State private var netProxyAuth = false
 
     var body: some View {
         VStack {
@@ -102,6 +106,76 @@ struct AdvancedNetworkSettings: View {
                     .foregroundColor(theme.colors.secondary)
                 }
 
+                Section {
+                    Toggle("Use SOCKS proxy", isOn: $useNetProxy)
+                    Group {
+                        TextField("IP address", text: $netProxy.host)
+                        TextField(
+                            "Port",
+                            text: Binding(
+                                get: { netProxy.port > 0 ? "\(netProxy.port)" : "" },
+                                set: { s in
+                                    netProxy.port = if let port = Int(s), port > 0 {
+                                        port
+                                    } else {
+                                        0
+                                    }
+                                }
+                            )
+                        )
+                        Toggle("Proxy requires password", isOn: $netProxyAuth)
+                        if netProxyAuth {
+                            TextField("Username", text: $netProxy.username)
+                            PassphraseField(
+                                key: $netProxy.password,
+                                placeholder: "Password",
+                                valid: NetworkProxy.validCredential(netProxy.password)
+                            )
+                        }
+                    }
+                    .if(!useNetProxy) { $0.foregroundColor(theme.colors.secondary) }
+                    .disabled(!useNetProxy)
+                } header: {
+                    HStack {
+                        Text("SOCKS proxy").foregroundColor(theme.colors.secondary)
+                        if useNetProxy && !netProxy.valid {
+                            Spacer()
+                            Image(systemName: "exclamationmark.circle.fill").foregroundColor(.red)
+                        }
+                    }
+                } footer: {
+                    if netProxyAuth {
+                        Text("Your credentials may be sent unencrypted.")
+                            .foregroundColor(theme.colors.secondary)
+                    } else {
+                        Text("Do not use credentials with proxy.")
+                            .foregroundColor(theme.colors.secondary)
+                    }
+                }
+                .onChange(of: useNetProxy) { useNetProxy in
+                    netCfg.socksProxy = useNetProxy && currentNetProxy.valid
+                        ? currentNetProxy.toProxyString()
+                        : nil
+                    netProxy = currentNetProxy
+                    netProxyAuth = netProxy.username != "" || netProxy.password != ""
+                }
+                .onChange(of: netProxyAuth) { netProxyAuth in
+                    if netProxyAuth {
+                        netProxy.auth = currentNetProxy.auth
+                        netProxy.username = currentNetProxy.username
+                        netProxy.password = currentNetProxy.password
+                    } else {
+                        netProxy.auth = .username
+                        netProxy.username = ""
+                        netProxy.password = ""
+                    }
+                }
+                .onChange(of: netProxy) { netProxy in
+                    netCfg.socksProxy = useNetProxy && netProxy.valid
+                        ? netProxy.toProxyString()
+                        : nil
+                }
+
                 Section {
                     Picker("Use .onion hosts", selection: $onionHosts) {
                         ForEach(OnionHosts.values, id: \.self) { Text($0.text) }
@@ -156,19 +230,19 @@ struct AdvancedNetworkSettings: View {
                 
                 Section {
                     Button("Reset to defaults") {
-                        updateNetCfgView(NetCfg.defaults)
+                        updateNetCfgView(NetCfg.defaults, NetworkProxy.def)
                     }
                     .disabled(netCfg == NetCfg.defaults)
 
                     Button("Set timeouts for proxy/VPN") {
-                        updateNetCfgView(netCfg.withProxyTimeouts)
+                        updateNetCfgView(netCfg.withProxyTimeouts, netProxy)
                     }
                     .disabled(netCfg.hasProxyTimeouts)
                     
                     Button("Save and reconnect") {
                         showSettingsAlert = .update
                     }
-                    .disabled(netCfg == currentNetCfg)
+                    .disabled(netCfg == currentNetCfg || (useNetProxy && !netProxy.valid))
                 }
             }
         }
@@ -182,7 +256,8 @@ struct AdvancedNetworkSettings: View {
             if cfgLoaded { return }
             cfgLoaded = true
             currentNetCfg = getNetCfg()
-            updateNetCfgView(currentNetCfg)
+            currentNetProxy = networkProxyDefault.get()
+            updateNetCfgView(currentNetCfg, currentNetProxy)
         }
         .alert(item: $showSettingsAlert) { a in
             switch a {
@@ -206,7 +281,7 @@ struct AdvancedNetworkSettings: View {
             if netCfg == currentNetCfg {
                 dismiss()
                 cfgLoaded = false
-            } else {
+            } else if !useNetProxy || netProxy.valid {
                 showSaveDialog = true
             }
         })
@@ -221,18 +296,26 @@ struct AdvancedNetworkSettings: View {
         }
     }
 
-    private func updateNetCfgView(_ cfg: NetCfg) {
+    private func updateNetCfgView(_ cfg: NetCfg, _ proxy: NetworkProxy) {
         netCfg = cfg
+        netProxy = proxy
         onionHosts = OnionHosts(netCfg: netCfg)
         enableKeepAlive = netCfg.enableKeepAlive
         keepAliveOpts = netCfg.tcpKeepAlive ?? KeepAliveOpts.defaults
+        useNetProxy = netCfg.socksProxy != nil
+        netProxyAuth = switch netProxy.auth {
+        case .username: netProxy.username != "" || netProxy.password != ""
+        case .isolate: false
+        }
     }
 
     private func saveNetCfg() -> Bool {
         do {
             try setNetworkConfig(netCfg)
             currentNetCfg = netCfg
-            setNetCfg(netCfg)
+            setNetCfg(netCfg, networkProxy: useNetProxy ? netProxy : nil)
+            currentNetProxy = netProxy
+            networkProxyDefault.set(netProxy)
             return true
         } catch let error {
             let err = responseError(error)

apps/ios/Shared/Views/UserSettings/AppSettings.swift

@@ -19,9 +19,15 @@ extension AppSettings {
                 val.hostMode = .publicHost
                 val.requiredHostMode = true
             }
-            val.socksProxy = nil
-            setNetCfg(val)
+            if val.socksProxy != nil {
+                val.socksProxy = networkProxy?.toProxyString()
+                setNetCfg(val, networkProxy: networkProxy)
+            } else {
+                val.socksProxy = nil
+                setNetCfg(val, networkProxy: nil)
+            }
         }
+        if let val = networkProxy { networkProxyDefault.set(val) }
         if let val = privacyEncryptLocalFiles { privacyEncryptLocalFilesGroupDefault.set(val) }
         if let val = privacyAskToApproveRelays { privacyAskToApproveRelaysGroupDefault.set(val) }
         if let val = privacyAcceptImages {
@@ -52,10 +58,10 @@ extension AppSettings {
             profileImageCornerRadiusGroupDefault.set(val)
             def.setValue(val, forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
         }
-        if let val = uiColorScheme { def.setValue(val, forKey: DEFAULT_CURRENT_THEME) }
-        if let val = uiDarkColorScheme { def.setValue(val, forKey: DEFAULT_SYSTEM_DARK_THEME) }
-        if let val = uiCurrentThemeIds { def.setValue(val, forKey: DEFAULT_CURRENT_THEME_IDS) }
-        if let val = uiThemes { def.setValue(val.skipDuplicates(), forKey: DEFAULT_THEME_OVERRIDES) }
+        if let val = uiColorScheme { currentThemeDefault.set(val) }
+        if let val = uiDarkColorScheme { systemDarkThemeDefault.set(val) }
+        if let val = uiCurrentThemeIds { currentThemeIdsDefault.set(val) }
+        if let val = uiThemes { themeOverridesDefault.set(val.skipDuplicates()) }
         if let val = oneHandUI { groupDefaults.setValue(val, forKey: GROUP_DEFAULT_ONE_HAND_UI) }
     }
 
@@ -63,6 +69,7 @@ extension AppSettings {
         let def = UserDefaults.standard
         var c = AppSettings.defaults
         c.networkConfig = getNetCfg()
+        c.networkProxy = networkProxyDefault.get()
         c.privacyEncryptLocalFiles = privacyEncryptLocalFilesGroupDefault.get()
         c.privacyAskToApproveRelays = privacyAskToApproveRelaysGroupDefault.get()
         c.privacyAcceptImages = privacyAcceptImagesGroupDefault.get()

apps/ios/Shared/Views/UserSettings/AppearanceSettings.swift

@@ -33,8 +33,6 @@ struct AppearanceSettings: View {
     }()
     @State private var darkModeTheme: String = UserDefaults.standard.string(forKey: DEFAULT_SYSTEM_DARK_THEME) ?? DefaultTheme.DARK.themeName
     @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var profileImageCornerRadius = defaultProfileImageCorner
-    @AppStorage(DEFAULT_CHAT_ITEM_ROUNDNESS) private var chatItemRoundness = defaultChatItemRoundness
-    @AppStorage(DEFAULT_CHAT_ITEM_TAIL) private var chatItemTail = true
     @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
     @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
 
@@ -181,14 +179,6 @@ struct AppearanceSettings: View {
                     }
                 }
 
-                Section(header: Text("Message shape").foregroundColor(theme.colors.secondary)) {
-                    HStack {
-                        Text("Corner")
-                        Slider(value: $chatItemRoundness, in: 0...1, step: 0.05)
-                    }
-                    Toggle("Tail", isOn: $chatItemTail)
-                }
-
                 Section(header: Text("Profile images").foregroundColor(theme.colors.secondary)) {
                     HStack(spacing: 16) {
                         if let img = m.currentUser?.image, img != "" {
@@ -368,21 +358,20 @@ struct ChatThemePreview: View {
                 let bob = ChatItem.getSample(2, CIDirection.directSnd, Date.now, NSLocalizedString("Good morning!", comment: "message preview"), quotedItem: CIQuote.getSample(alice.id, alice.meta.itemTs, alice.content.text, chatDir: alice.chatDir))
                 HStack {
                     ChatItemView(chat: Chat.sampleData, chatItem: alice, revealed: Binding.constant(false))
-                        .modifier(ChatItemClipped(alice, tailVisible: true))
+                        .modifier(ChatItemClipped())
                     Spacer()
                 }
                 HStack {
                     Spacer()
                     ChatItemView(chat: Chat.sampleData, chatItem: bob, revealed: Binding.constant(false))
-                        .modifier(ChatItemClipped(bob, tailVisible: true))
+                        .modifier(ChatItemClipped())
                         .frame(alignment: .trailing)
                 }
             } else {
                 Rectangle().fill(.clear)
             }
         }
-            .padding(.vertical, 10)
-            .padding(.horizontal, 16)
+        .padding(10)
         .frame(maxWidth: .infinity)
 
         if let wallpaperType, let wallpaperImage = wallpaperType.image, let backgroundColor, let tintColor {

apps/ios/Shared/Views/UserSettings/IncognitoHelp.swift

@@ -26,7 +26,6 @@ struct IncognitoHelp: View {
                 Text("Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).")
             }
             .listRowBackground(Color.clear)
-            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
         }
         .modifier(ThemedBackground())
     }

apps/ios/Shared/Views/UserSettings/SettingsView.swift

@@ -47,8 +47,6 @@ let DEFAULT_ACCENT_COLOR_GREEN = "accentColorGreen" // deprecated, only used for
 let DEFAULT_ACCENT_COLOR_BLUE = "accentColorBlue" // deprecated, only used for migration
 let DEFAULT_USER_INTERFACE_STYLE = "userInterfaceStyle" // deprecated, only used for migration
 let DEFAULT_PROFILE_IMAGE_CORNER_RADIUS = "profileImageCornerRadius"
-let DEFAULT_CHAT_ITEM_ROUNDNESS = "chatItemRoundness"
-let DEFAULT_CHAT_ITEM_TAIL = "chatItemTail"
 let DEFAULT_ONE_HAND_UI_CARD_SHOWN = "oneHandUICardShown"
 let DEFAULT_TOOLBAR_MATERIAL = "toolbarMaterial"
 let DEFAULT_CONNECT_VIA_LINK_TAB = "connectViaLinkTab"
@@ -75,9 +73,9 @@ let DEFAULT_SYSTEM_DARK_THEME = "systemDarkTheme"
 let DEFAULT_CURRENT_THEME_IDS = "currentThemeIds"
 let DEFAULT_THEME_OVERRIDES = "themeOverrides"
 
-let ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN = "androidCallOnLockScreen"
+let DEFAULT_NETWORK_PROXY = "networkProxy"
 
-let defaultChatItemRoundness: Double = 0.75
+let ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN = "androidCallOnLockScreen"
 
 let appDefaults: [String: Any] = [
     DEFAULT_SHOW_LA_NOTICE: false,
@@ -102,8 +100,6 @@ let appDefaults: [String: Any] = [
     DEFAULT_DEVELOPER_TOOLS: false,
     DEFAULT_ENCRYPTION_STARTED: false,
     DEFAULT_PROFILE_IMAGE_CORNER_RADIUS: defaultProfileImageCorner,
-    DEFAULT_CHAT_ITEM_ROUNDNESS: defaultChatItemRoundness,
-    DEFAULT_CHAT_ITEM_TAIL: true,
     DEFAULT_ONE_HAND_UI_CARD_SHOWN: false,
     DEFAULT_TOOLBAR_MATERIAL: ToolbarMaterial.defaultMaterial,
     DEFAULT_CONNECT_VIA_LINK_TAB: ConnectViaLinkTab.scan.rawValue,
@@ -251,6 +247,7 @@ public class CodableDefault<T: Codable> {
     }
 }
 
+let networkProxyDefault: CodableDefault<NetworkProxy> = CodableDefault(defaults: UserDefaults.standard, forKey: DEFAULT_NETWORK_PROXY, withDefault: NetworkProxy.def)
 
 struct SettingsView: View {
     @Environment(\.colorScheme) var colorScheme

apps/ios/Shared/Views/UserSettings/UserProfilesView.swift

@@ -406,13 +406,6 @@ public func chatPasswordHash(_ pwd: String, _ salt: String) -> String {
     return hash
 }
 
-public func correctPassword(_ user: User, _ pwd: String) -> Bool {
-    if let ph = user.viewPwdHash {
-        return pwd != "" && chatPasswordHash(pwd, ph.salt) == ph.hash
-    }
-    return false
-}
-
 struct UserProfilesView_Previews: PreviewProvider {
     static var previews: some View {
         UserProfilesView(showSettings: Binding.constant(true))

apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff

@@ -137,10 +137,6 @@
         <target>%@ иска да се свърже!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ и %lld членове</target>
@@ -1689,10 +1685,6 @@ This is your own one-time link!</source>
         <target>Версия на ядрото: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>Поправи име на %@?</target>
@@ -2653,10 +2645,6 @@ This is your own one-time link!</source>
         <target>Грешка при промяна на адреса</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Грешка при промяна на ролята</target>
@@ -2667,10 +2655,6 @@ This is your own one-time link!</source>
         <target>Грешка при промяна на настройката</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2886,10 +2870,6 @@ This is your own one-time link!</source>
         <target>Грешка при спиране на чата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Грешка при смяна на профил!</target>
@@ -4089,10 +4069,6 @@ This is your link for group %@!</source>
         <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Източникът на съобщението остава скрит.</target>
@@ -5586,10 +5562,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Избери</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <note>No comment provided by engineer.</note>
@@ -5939,10 +5911,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Сподели линк</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Сподели този еднократен линк за връзка</target>
@@ -6267,10 +6235,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Направи снимка</target>
@@ -7516,10 +7480,6 @@ Repeat connection request?</source>
         <target>Вашите чат профили</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Вашият контакт изпрати файл, който е по-голям от поддържания в момента максимален размер (%@).</target>

apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff

@@ -135,10 +135,6 @@
         <target>%@ se chce připojit!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <note>No comment provided by engineer.</note>
@@ -1627,10 +1623,6 @@ This is your own one-time link!</source>
         <target>Verze jádra: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <note>No comment provided by engineer.</note>
@@ -2560,10 +2552,6 @@ This is your own one-time link!</source>
         <target>Chuba změny adresy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Chyba při změně role</target>
@@ -2574,10 +2562,6 @@ This is your own one-time link!</source>
         <target>Chyba změny nastavení</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2788,10 +2772,6 @@ This is your own one-time link!</source>
         <target>Chyba při zastavení chatu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Chyba při přepínání profilu!</target>
@@ -3948,10 +3928,6 @@ This is your link for group %@!</source>
         <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <note>No comment provided by engineer.</note>
@@ -5387,10 +5363,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Vybrat</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <note>No comment provided by engineer.</note>
@@ -5736,10 +5708,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Sdílet odkaz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <note>No comment provided by engineer.</note>
@@ -6056,10 +6024,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Vyfotit</target>
@@ -7245,10 +7209,6 @@ Repeat connection request?</source>
         <target>Vaše chat profily</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Kontakt odeslal soubor, který je větší než aktuálně podporovaná maximální velikost (%@).</target>

apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff

@@ -137,10 +137,6 @@
         <target>%@ will sich mit Ihnen verbinden!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ und %lld Mitglieder</target>
@@ -1744,10 +1740,6 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Core Version: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>Richtiger Name für %@?</target>
@@ -2732,10 +2724,6 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Wechseln der Empfängeradresse</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Fehler beim Ändern der Rolle</target>
@@ -2746,10 +2734,6 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Ändern der Einstellung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Fehler beim Verbinden mit dem Weiterleitungsserver %@. Bitte versuchen Sie es später erneut.</target>
@@ -2970,10 +2954,6 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Fehler beim Beenden des Chats</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Fehler beim Umschalten des Profils!</target>
@@ -4204,10 +4184,6 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Nachrichten-Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Die Nachrichtenquelle bleibt privat.</target>
@@ -5753,10 +5729,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Auswählen</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <target>%lld ausgewählt</target>
@@ -6127,10 +6099,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Link teilen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Teilen Sie diesen Einmal-Einladungslink</target>
@@ -6471,10 +6439,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Machen Sie ein Foto</target>
@@ -7755,10 +7719,6 @@ Verbindungsanfrage wiederholen?</target>
         <target>Ihre Chat-Profile</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Ihr Kontakt hat eine Datei gesendet, die größer ist als die derzeit unterstützte maximale Größe (%@).</target>

apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff

@@ -137,11 +137,6 @@
         <target>%@ wants to connect!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <target>%1$@, %2$@</target>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ and %lld members</target>
@@ -1745,11 +1740,6 @@ This is your own one-time link!</target>
         <target>Core version: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <target>Corner</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>Correct name to %@?</target>
@@ -2734,11 +2724,6 @@ This is your own one-time link!</target>
         <target>Error changing address</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <target>Error changing connection profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Error changing role</target>
@@ -2749,11 +2734,6 @@ This is your own one-time link!</target>
         <target>Error changing setting</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <target>Error changing to incognito!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Error connecting to forwarding server %@. Please try later.</target>
@@ -2974,11 +2954,6 @@ This is your own one-time link!</target>
         <target>Error stopping chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <target>Error switching profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Error switching profile!</target>
@@ -4209,11 +4184,6 @@ This is your link for group %@!</target>
         <target>Message servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <target>Message shape</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Message source remains private.</target>
@@ -5759,11 +5729,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Select</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <target>Select chat profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <target>Selected %lld</target>
@@ -6134,11 +6099,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Share link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <target>Share profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Share this 1-time invite link</target>
@@ -6479,11 +6439,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <target>Tail</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Take picture</target>
@@ -7764,11 +7719,6 @@ Repeat connection request?</target>
         <target>Your chat profiles</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <target>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Your contact sent a file that is larger than currently supported maximum size (%@).</target>

apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff

@@ -137,10 +137,6 @@
         <target>¡ %@ quiere contactar!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ y %lld miembro(s) más</target>
@@ -1744,10 +1740,6 @@ This is your own one-time link!</source>
         <target>Versión Core: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>¿Corregir el nombre a %@?</target>
@@ -2732,10 +2724,6 @@ This is your own one-time link!</source>
         <target>Error al cambiar servidor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Error al cambiar rol</target>
@@ -2746,10 +2734,6 @@ This is your own one-time link!</source>
         <target>Error cambiando configuración</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Error al conectar con el servidor de reenvío %@. Por favor, inténtalo más tarde.</target>
@@ -2970,10 +2954,6 @@ This is your own one-time link!</source>
         <target>Error al parar SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>¡Error al cambiar perfil!</target>
@@ -4204,10 +4184,6 @@ This is your link for group %@!</source>
         <target>Servidores de mensajes</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>El autor del mensaje se mantiene privado.</target>
@@ -5753,10 +5729,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Seleccionar</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <target>Seleccionados %lld</target>
@@ -6127,10 +6099,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Compartir enlace</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Comparte este enlace de un solo uso</target>
@@ -6471,10 +6439,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Tomar foto</target>
@@ -7755,10 +7719,6 @@ Repeat connection request?</source>
         <target>Mis perfiles</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>El contacto ha enviado un archivo mayor al máximo admitido (%@).</target>

apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff

@@ -133,10 +133,6 @@
         <target>%@ haluaa muodostaa yhteyden!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <note>No comment provided by engineer.</note>
@@ -1620,10 +1616,6 @@ This is your own one-time link!</source>
         <target>Ydinversio: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <note>No comment provided by engineer.</note>
@@ -2552,10 +2544,6 @@ This is your own one-time link!</source>
         <target>Virhe osoitteenvaihdossa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Virhe roolin vaihdossa</target>
@@ -2566,10 +2554,6 @@ This is your own one-time link!</source>
         <target>Virhe asetuksen muuttamisessa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2778,10 +2762,6 @@ This is your own one-time link!</source>
         <target>Virhe keskustelun lopettamisessa</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Virhe profiilin vaihdossa!</target>
@@ -3938,10 +3918,6 @@ This is your link for group %@!</source>
         <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <note>No comment provided by engineer.</note>
@@ -5375,10 +5351,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Valitse</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <note>No comment provided by engineer.</note>
@@ -5723,10 +5695,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Jaa linkki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <note>No comment provided by engineer.</note>
@@ -6042,10 +6010,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Ota kuva</target>
@@ -7230,10 +7194,6 @@ Repeat connection request?</source>
         <target>Keskusteluprofiilisi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Yhteyshenkilösi lähetti tiedoston, joka on suurempi kuin tällä hetkellä tuettu enimmäiskoko (%@).</target>

apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff

@@ -137,10 +137,6 @@
         <target>%@ veut se connecter !</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ et %lld membres</target>
@@ -1744,10 +1740,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Version du cœur : v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>Corriger le nom pour %@ ?</target>
@@ -2732,10 +2724,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur de changement d'adresse</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Erreur lors du changement de rôle</target>
@@ -2746,10 +2734,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur de changement de paramètre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Erreur de connexion au serveur de redirection %@. Veuillez réessayer plus tard.</target>
@@ -2970,10 +2954,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur lors de l'arrêt du chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Erreur lors du changement de profil !</target>
@@ -4204,10 +4184,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Serveurs de messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>La source du message reste privée.</target>
@@ -5753,10 +5729,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Choisir</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <target>%lld sélectionné(s)</target>
@@ -6127,10 +6099,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Partager le lien</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Partager ce lien d'invitation unique</target>
@@ -6471,10 +6439,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Prendre une photo</target>
@@ -7755,10 +7719,6 @@ Répéter la demande de connexion ?</target>
         <target>Vos profils de chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Votre contact a envoyé un fichier plus grand que la taille maximale supportée actuellement(%@).</target>

apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff

@@ -137,10 +137,6 @@
         <target>%@ kapcsolódni szeretne!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ és további %lld tag</target>
@@ -1744,10 +1740,6 @@ Ez az egyszer használatos hivatkozása!</target>
         <target>Alapverziószám: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>Név javítása erre: %@?</target>
@@ -2732,10 +2724,6 @@ Ez az egyszer használatos hivatkozása!</target>
         <target>Hiba a cím megváltoztatásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Hiba a szerepkör megváltoztatásakor</target>
@@ -2746,10 +2734,6 @@ Ez az egyszer használatos hivatkozása!</target>
         <target>Hiba a beállítás megváltoztatásakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Hiba a(z) %@ továbbító kiszolgálóhoz való kapcsolódáskor. Próbálja meg később.</target>
@@ -2970,10 +2954,6 @@ Ez az egyszer használatos hivatkozása!</target>
         <target>Hiba a csevegés megállításakor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Hiba a profil váltásakor!</target>
@@ -4204,10 +4184,6 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
         <target>Üzenetkiszolgálók</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Az üzenet forrása titokban marad.</target>
@@ -5753,10 +5729,6 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
         <target>Választás</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <target>%lld kiválasztva</target>
@@ -6127,10 +6099,6 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
         <target>Hivatkozás megosztása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Egyszer használatos meghívó hivatkozás megosztása</target>
@@ -6471,10 +6439,6 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Kép készítése</target>
@@ -7755,10 +7719,6 @@ Kapcsolódási kérés megismétlése?</target>
         <target>Csevegési profilok</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Ismerőse olyan fájlt küldött, amely meghaladja a jelenleg támogatott maximális méretet (%@).</target>

apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff

@@ -137,10 +137,6 @@
         <target>%@ si vuole connettere!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ e %lld membri</target>
@@ -1744,10 +1740,6 @@ Questo è il tuo link una tantum!</target>
         <target>Versione core: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>Correggere il nome a %@?</target>
@@ -2732,10 +2724,6 @@ Questo è il tuo link una tantum!</target>
         <target>Errore nella modifica dell'indirizzo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Errore nel cambio di ruolo</target>
@@ -2746,10 +2734,6 @@ Questo è il tuo link una tantum!</target>
         <target>Errore nella modifica dell'impostazione</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Errore di connessione al server di inoltro %@. Riprova più tardi.</target>
@@ -2970,10 +2954,6 @@ Questo è il tuo link una tantum!</target>
         <target>Errore nell'interruzione della chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Errore nel cambio di profilo!</target>
@@ -4204,10 +4184,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Server dei messaggi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>La fonte del messaggio resta privata.</target>
@@ -5753,10 +5729,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Seleziona</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <target>%lld selezionato</target>
@@ -6127,10 +6099,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Condividi link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Condividi questo link di invito una tantum</target>
@@ -6471,10 +6439,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Scatta foto</target>
@@ -7755,10 +7719,6 @@ Ripetere la richiesta di connessione?</target>
         <target>I tuoi profili di chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Il tuo contatto ha inviato un file più grande della dimensione massima attualmente supportata (%@).</target>

apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff

@@ -137,10 +137,6 @@
         <target>%@ が接続を希望しています!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@や%@など%lld人のメンバー</target>
@@ -1644,10 +1640,6 @@ This is your own one-time link!</source>
         <target>コアのバージョン: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <note>No comment provided by engineer.</note>
@@ -2577,10 +2569,6 @@ This is your own one-time link!</source>
         <target>アドレス変更にエラー発生</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>役割変更にエラー発生</target>
@@ -2591,10 +2579,6 @@ This is your own one-time link!</source>
         <target>設定変更にエラー発生</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2803,10 +2787,6 @@ This is your own one-time link!</source>
         <target>チャット停止にエラー発生</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>プロフィール切り替えにエラー発生！</target>
@@ -3962,10 +3942,6 @@ This is your link for group %@!</source>
         <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <note>No comment provided by engineer.</note>
@@ -5400,10 +5376,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>選択</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <note>No comment provided by engineer.</note>
@@ -5741,10 +5713,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>リンクを送る</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <note>No comment provided by engineer.</note>
@@ -6061,10 +6029,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>写真を撮影</target>
@@ -7248,10 +7212,6 @@ Repeat connection request?</source>
         <target>あなたのチャットプロフィール</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>連絡先が現在サポートされている最大サイズ (%@) より大きいファイルを送信しました。</target>

apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff

@@ -137,10 +137,6 @@
         <target>%@ wil verbinding maken!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ en %lld leden</target>
@@ -1744,10 +1740,6 @@ Dit is uw eigen eenmalige link!</target>
         <target>Core versie: v% @</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>Juiste naam voor %@?</target>
@@ -2732,10 +2724,6 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij wijzigen van adres</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Fout bij wisselen van rol</target>
@@ -2746,10 +2734,6 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij wijzigen van instelling</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Fout bij het verbinden met doorstuurserver %@. Probeer het later opnieuw.</target>
@@ -2970,10 +2954,6 @@ Dit is uw eigen eenmalige link!</target>
         <target>Fout bij het stoppen van de chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Fout bij wisselen van profiel!</target>
@@ -4204,10 +4184,6 @@ Dit is jouw link voor groep %@!</target>
         <target>Berichtservers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Berichtbron blijft privé.</target>
@@ -5753,10 +5729,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Selecteer</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <target>%lld geselecteerd</target>
@@ -6127,10 +6099,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Deel link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Deel deze eenmalige uitnodigingslink</target>
@@ -6471,10 +6439,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Foto nemen</target>
@@ -7755,10 +7719,6 @@ Verbindingsverzoek herhalen?</target>
         <target>Uw chat profielen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Uw contact heeft een bestand verzonden dat groter is dan de momenteel ondersteunde maximale grootte (%@).</target>

apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff

@@ -137,10 +137,6 @@
         <target>%@ chce się połączyć!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ i %lld członków</target>
@@ -1744,10 +1740,6 @@ To jest twój jednorazowy link!</target>
         <target>Wersja rdzenia: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>Poprawić imię na %@?</target>
@@ -2732,10 +2724,6 @@ To jest twój jednorazowy link!</target>
         <target>Błąd zmiany adresu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Błąd zmiany roli</target>
@@ -2746,10 +2734,6 @@ To jest twój jednorazowy link!</target>
         <target>Błąd zmiany ustawienia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Błąd połączenia z serwerem przekierowania %@. Spróbuj ponownie później.</target>
@@ -2970,10 +2954,6 @@ To jest twój jednorazowy link!</target>
         <target>Błąd zatrzymania czatu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Błąd przełączania profilu!</target>
@@ -4204,10 +4184,6 @@ To jest twój link do grupy %@!</target>
         <target>Serwery wiadomości</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Źródło wiadomości pozostaje prywatne.</target>
@@ -5753,10 +5729,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Wybierz</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <target>Zaznaczono %lld</target>
@@ -6127,10 +6099,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Udostępnij link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Udostępnij ten jednorazowy link</target>
@@ -6471,10 +6439,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Zrób zdjęcie</target>
@@ -7755,10 +7719,6 @@ Powtórzyć prośbę połączenia?</target>
         <target>Twoje profile czatu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Twój kontakt wysłał plik, który jest większy niż obecnie obsługiwany maksymalny rozmiar (%@).</target>

apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff

@@ -137,10 +137,6 @@
         <target>%@ хочет соединиться!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ и %lld членов группы</target>
@@ -1744,10 +1740,6 @@ This is your own one-time link!</source>
         <target>Версия ядра: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>Исправить имя на %@?</target>
@@ -2732,10 +2724,6 @@ This is your own one-time link!</source>
         <target>Ошибка при изменении адреса</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Ошибка при изменении роли</target>
@@ -2746,10 +2734,6 @@ This is your own one-time link!</source>
         <target>Ошибка при изменении настройки</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Ошибка подключения к пересылающему серверу %@. Попробуйте позже.</target>
@@ -2970,10 +2954,6 @@ This is your own one-time link!</source>
         <target>Ошибка при остановке чата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Ошибка выбора профиля!</target>
@@ -4204,10 +4184,6 @@ This is your link for group %@!</source>
         <target>Серверы сообщений</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Источник сообщения остаётся конфиденциальным.</target>
@@ -5753,10 +5729,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Выбрать</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <target>Выбрано %lld</target>
@@ -6127,10 +6099,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Поделиться ссылкой</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Поделиться одноразовой ссылкой-приглашением</target>
@@ -6471,10 +6439,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Сделать фото</target>
@@ -7755,10 +7719,6 @@ Repeat connection request?</source>
         <target>Ваши профили чата</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Ваш контакт отправил файл, размер которого превышает максимальный размер (%@).</target>

apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff

@@ -129,10 +129,6 @@
         <target>%@ อยากเชื่อมต่อ!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <note>No comment provided by engineer.</note>
@@ -1610,10 +1606,6 @@ This is your own one-time link!</source>
         <target>รุ่นหลัก: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <note>No comment provided by engineer.</note>
@@ -2538,10 +2530,6 @@ This is your own one-time link!</source>
         <target>เกิดข้อผิดพลาดในการเปลี่ยนที่อยู่</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>เกิดข้อผิดพลาดในการเปลี่ยนบทบาท</target>
@@ -2552,10 +2540,6 @@ This is your own one-time link!</source>
         <target>เกิดข้อผิดพลาดในการเปลี่ยนการตั้งค่า</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2763,10 +2747,6 @@ This is your own one-time link!</source>
         <target>เกิดข้อผิดพลาดในการหยุดแชท</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>เกิดข้อผิดพลาดในการเปลี่ยนโปรไฟล์!</target>
@@ -3921,10 +3901,6 @@ This is your link for group %@!</source>
         <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <note>No comment provided by engineer.</note>
@@ -5352,10 +5328,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>เลือก</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <note>No comment provided by engineer.</note>
@@ -5698,10 +5670,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>แชร์ลิงก์</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <note>No comment provided by engineer.</note>
@@ -6015,10 +5983,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>ถ่ายภาพ</target>
@@ -7199,10 +7163,6 @@ Repeat connection request?</source>
         <target>โปรไฟล์แชทของคุณ</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>ผู้ติดต่อของคุณส่งไฟล์ที่ใหญ่กว่าขนาดสูงสุดที่รองรับในปัจจุบัน (%@)</target>

apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff

@@ -137,10 +137,6 @@
         <target>%@ bağlanmak istiyor!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ ve %lld üyeleri</target>
@@ -1693,10 +1689,6 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Çekirdek sürümü: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>İsim %@ olarak düzeltilsin mi?</target>
@@ -2661,10 +2653,6 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Adres değiştirilirken hata oluştu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Rol değiştirilirken hata oluştu</target>
@@ -2675,10 +2663,6 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Ayar değiştirilirken hata oluştu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2894,10 +2878,6 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
         <target>Sohbet durdurulurken hata oluştu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Profil değiştirilirken hata oluştu!</target>
@@ -4104,10 +4084,6 @@ Bu senin grup için bağlantın %@!</target>
         <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Mesaj kaynağı gizli kalır.</target>
@@ -5609,10 +5585,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Seç</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <note>No comment provided by engineer.</note>
@@ -5966,10 +5938,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Bağlantıyı paylaş</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Bu tek kullanımlık bağlantı davetini paylaş</target>
@@ -6296,10 +6264,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP_TVLDEKAL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Fotoğraf çek</target>
@@ -7553,10 +7517,6 @@ Bağlantı isteği tekrarlansın mı?</target>
         <target>Sohbet profillerin</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Kişiniz şu anda desteklenen maksimum boyuttan (%@) daha büyük bir dosya gönderdi.</target>

apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff

@@ -137,10 +137,6 @@
         <target>%@ хоче підключитися!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ та %lld учасників</target>
@@ -1744,10 +1740,6 @@ This is your own one-time link!</source>
         <target>Основна версія: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <target>Виправити ім'я на %@?</target>
@@ -2732,10 +2724,6 @@ This is your own one-time link!</source>
         <target>Помилка зміни адреси</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>Помилка зміни ролі</target>
@@ -2746,10 +2734,6 @@ This is your own one-time link!</source>
         <target>Помилка зміни налаштування</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <target>Помилка підключення до сервера переадресації %@. Спробуйте пізніше.</target>
@@ -2970,10 +2954,6 @@ This is your own one-time link!</source>
         <target>Помилка зупинки чату</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Помилка перемикання профілю!</target>
@@ -4204,10 +4184,6 @@ This is your link for group %@!</source>
         <target>Сервери повідомлень</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>Джерело повідомлення залишається приватним.</target>
@@ -5753,10 +5729,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Виберіть</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <target>Вибрано %lld</target>
@@ -6127,10 +6099,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Поділіться посиланням</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>Поділіться цим одноразовим посиланням-запрошенням</target>
@@ -6471,10 +6439,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>Сфотографуйте</target>
@@ -7755,10 +7719,6 @@ Repeat connection request?</source>
         <target>Ваші профілі чату</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>Ваш контакт надіслав файл, розмір якого перевищує підтримуваний на цей момент максимальний розмір (%@).</target>

apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff

@@ -135,10 +135,6 @@
         <target>%@ 要连接！</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve">
-        <source>%1$@, %2$@</source>
-        <note>format for date separator in chat</note>
-      </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
         <source>%@, %@ and %lld members</source>
         <target>%@, %@ 和 %lld 成员</target>
@@ -1669,10 +1665,6 @@ This is your own one-time link!</source>
         <target>核心版本: v%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Corner" xml:space="preserve">
-        <source>Corner</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
         <source>Correct name to %@?</source>
         <note>No comment provided by engineer.</note>
@@ -2626,10 +2618,6 @@ This is your own one-time link!</source>
         <target>更改地址错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing connection profile" xml:space="preserve">
-        <source>Error changing connection profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
         <source>Error changing role</source>
         <target>更改角色错误</target>
@@ -2640,10 +2628,6 @@ This is your own one-time link!</source>
         <target>更改设置错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error changing to incognito!" xml:space="preserve">
-        <source>Error changing to incognito!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
         <source>Error connecting to forwarding server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -2857,10 +2841,6 @@ This is your own one-time link!</source>
         <target>停止聊天错误</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error switching profile" xml:space="preserve">
-        <source>Error switching profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>切换资料错误！</target>
@@ -4053,10 +4033,6 @@ This is your link for group %@!</source>
         <source>Message servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message shape" xml:space="preserve">
-        <source>Message shape</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
         <source>Message source remains private.</source>
         <target>消息来源保持私密。</target>
@@ -5536,10 +5512,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>选择</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Select chat profile" xml:space="preserve">
-        <source>Select chat profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
         <source>Selected %lld</source>
         <note>No comment provided by engineer.</note>
@@ -5889,10 +5861,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>分享链接</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Share profile" xml:space="preserve">
-        <source>Share profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
         <source>Share this 1-time invite link</source>
         <target>分享此一次性邀请链接</target>
@@ -6217,10 +6185,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>TCP_KEEPINTVL</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Tail" xml:space="preserve">
-        <source>Tail</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
         <source>Take picture</source>
         <target>拍照</target>
@@ -7453,10 +7417,6 @@ Repeat connection request?</source>
         <target>您的聊天资料</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
-        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
         <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
         <target>您的联系人发送的文件大于当前支持的最大大小 (%@)。</target>

apps/ios/SimpleX NSE/NotificationService.swift

@@ -339,7 +339,9 @@ class NotificationService: UNNotificationServiceExtension {
                 CXProvider.reportNewIncomingVoIPPushPayload([
                     "displayName": invitation.contact.displayName,
                     "contactId": invitation.contact.id,
-                    "media": invitation.callType.media.rawValue
+                    "callUUID": invitation.callUUID ?? "",
+                    "media": invitation.callType.media.rawValue,
+                    "callTs": invitation.callTs.timeIntervalSince1970
                 ]) { error in
                     logger.debug("reportNewIncomingVoIPPushPayload result: \(error)")
                     deliver(error == nil ? nil : createCallInvitationNtf(invitation))
@@ -571,22 +573,17 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
 //            TODO profile update
     case let .receivedContactRequest(user, contactRequest):
         return (UserContact(contactRequest: contactRequest).id, .nse(createContactRequestNtf(user, contactRequest)))
-    case let .newChatItems(user, chatItems):
-        // Received items are created one at a time
-        if let chatItem = chatItems.first {
-            let cInfo = chatItem.chatInfo
-            var cItem = chatItem.chatItem
-            if !cInfo.ntfsEnabled {
-                ntfBadgeCountGroupDefault.set(max(0, ntfBadgeCountGroupDefault.get() - 1))
-            }
-            if let file = cItem.autoReceiveFile() {
-                cItem = autoReceiveFile(file) ?? cItem
-            }
-            let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(createMessageReceivedNtf(user, cInfo, cItem)) : .empty
-            return cItem.showNotification ? (chatItem.chatId, ntf) : nil
-        } else {
-            return nil
+    case let .newChatItem(user, aChatItem):
+        let cInfo = aChatItem.chatInfo
+        var cItem = aChatItem.chatItem
+        if !cInfo.ntfsEnabled {
+            ntfBadgeCountGroupDefault.set(max(0, ntfBadgeCountGroupDefault.get() - 1))
         }
+        if let file = cItem.autoReceiveFile() {
+            cItem = autoReceiveFile(file) ?? cItem
+        }
+        let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(createMessageReceivedNtf(user, cInfo, cItem)) : .empty
+        return cItem.showNotification ? (aChatItem.chatId, ntf) : nil
     case let .rcvFileSndCancelled(_, aChatItem, _):
         cleanupFile(aChatItem)
         return nil

apps/ios/SimpleX SE/ShareAPI.swift

@@ -54,30 +54,32 @@ func apiGetChats(userId: User.ID) throws -> Array<ChatData> {
     throw r
 }
 
-func apiSendMessages(
+func apiSendMessage(
     chatInfo: ChatInfo,
-    composedMessages: [ComposedMessage]
-) throws -> [AChatItem] {
+    cryptoFile: CryptoFile?,
+    msgContent: MsgContent
+) throws -> AChatItem {
     let r = sendSimpleXCmd(
         chatInfo.chatType == .local
-        ? .apiCreateChatItems(
+        ? .apiCreateChatItem(
             noteFolderId: chatInfo.apiId,
-            composedMessages: composedMessages
+            file: cryptoFile,
+            msg: msgContent
         )
-        : .apiSendMessages(
+        : .apiSendMessage(
             type: chatInfo.chatType,
             id: chatInfo.apiId,
+            file: cryptoFile,
+            quotedItemId: nil,
+            msg: msgContent,
             live: false,
-            ttl: nil,
-            composedMessages: composedMessages
+            ttl: nil
         )
     )
-    if case let .newChatItems(_, chatItems) = r {
-        return chatItems
+    if case let .newChatItem(_, chatItem) = r {
+        return chatItem
     } else {
-        for composedMessage in composedMessages {
-            if let filePath = composedMessage.fileSource?.filePath { removeFile(filePath) }
-        }
+        if let filePath = cryptoFile?.filePath { removeFile(filePath) }
         throw r
     }
 }

apps/ios/SimpleX SE/ShareModel.swift

@@ -141,25 +141,23 @@ class ShareModel: ObservableObject {
                 do {
                     SEChatState.shared.set(.sendingMessage)
                     await waitForOtherProcessesToSuspend()
-                    let chatItems = try apiSendMessages(
+                    let ci = try apiSendMessage(
                         chatInfo: selected.chatInfo,
-                        composedMessages: [ComposedMessage(fileSource: sharedContent.cryptoFile, msgContent: sharedContent.msgContent(comment: self.comment))]
+                        cryptoFile: sharedContent.cryptoFile,
+                        msgContent: sharedContent.msgContent(comment: self.comment)
                     )
                     if selected.chatInfo.chatType == .local {
                         completion()
                     } else {
-                        // TODO batch send: share multiple items
-                        if let ci = chatItems.first {
-                            await MainActor.run { self.bottomBar = .loadingBar(progress: 0) }
-                            if let e = await handleEvents(
-                                isGroupChat: ci.chatInfo.chatType == .group,
-                                isWithoutFile: sharedContent.cryptoFile == nil,
-                                chatItemId: ci.chatItem.id
-                            ) {
-                                await MainActor.run { errorAlert = e }
-                            } else {
-                                completion()
-                            }
+                        await MainActor.run { self.bottomBar = .loadingBar(progress: 0) }
+                        if let e = await handleEvents(
+                            isGroupChat: ci.chatInfo.chatType == .group,
+                            isWithoutFile: sharedContent.cryptoFile == nil,
+                            chatItemId: ci.chatItem.id
+                        ) {
+                            await MainActor.run { errorAlert = e }
+                        } else {
+                            completion()
                         }
                     }
                 } catch {

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -177,6 +177,8 @@
 		64E972072881BB22008DBC02 /* CIGroupInvitationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */; };
 		64EEB0F72C353F1C00972D62 /* ServersSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64EEB0F62C353F1C00972D62 /* ServersSummaryView.swift */; };
 		64F1CC3B28B39D8600CD1FB1 /* IncognitoHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */; };
+		8C01E9C12C8EFC33008A4B0A /* objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C01E9C02C8EFC33008A4B0A /* objc.m */; };
+		8C01E9C22C8EFF8F008A4B0A /* objc.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C01E9BF2C8EFBB6008A4B0A /* objc.h */; };
 		8C69FE7D2B8C7D2700267E38 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C69FE7C2B8C7D2700267E38 /* AppSettings.swift */; };
 		8C74C3E52C1B900600039E77 /* ThemeTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7E3CE32C0DEAC400BFF63A /* ThemeTypes.swift */; };
 		8C74C3E72C1B901900039E77 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C852B072C1086D100BA61E8 /* Color.swift */; };
@@ -214,11 +216,11 @@
 		D77B92DC2952372200A5A1CC /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = D77B92DB2952372200A5A1CC /* SwiftyGif */; };
 		D7F0E33929964E7E0068AF69 /* LZString in Frameworks */ = {isa = PBXBuildFile; productRef = D7F0E33829964E7E0068AF69 /* LZString */; };
 		E51CC1E62C62085600DB91FE /* OneHandUICard.swift in Sources */ = {isa = PBXBuildFile; fileRef = E51CC1E52C62085600DB91FE /* OneHandUICard.swift */; };
-		E51ED5942C7B9983009F2C7C /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E51ED58F2C7B9983009F2C7C /* libgmpxx.a */; };
-		E51ED5952C7B9983009F2C7C /* libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E51ED5902C7B9983009F2C7C /* libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx-ghc9.6.3.a */; };
-		E51ED5962C7B9983009F2C7C /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E51ED5912C7B9983009F2C7C /* libgmp.a */; };
-		E51ED5972C7B9983009F2C7C /* libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E51ED5922C7B9983009F2C7C /* libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx.a */; };
-		E51ED5982C7B9983009F2C7C /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E51ED5932C7B9983009F2C7C /* libffi.a */; };
+		E5CC47842CA31C3A00551ACF /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5CC477F2CA31C3900551ACF /* libgmpxx.a */; };
+		E5CC47852CA31C3A00551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5CC47802CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a */; };
+		E5CC47862CA31C3A00551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5CC47812CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a */; };
+		E5CC47872CA31C3A00551ACF /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5CC47822CA31C3A00551ACF /* libgmp.a */; };
+		E5CC47882CA31C3A00551ACF /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5CC47832CA31C3A00551ACF /* libffi.a */; };
 		E5DCF8DB2C56FAC1007928CC /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		E5DCF9712C590272007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF96F2C590272007928CC /* Localizable.strings */; };
 		E5DCF9842C5902CE007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9822C5902CE007928CC /* Localizable.strings */; };
@@ -516,6 +518,8 @@
 		64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIGroupInvitationView.swift; sourceTree = "<group>"; };
 		64EEB0F62C353F1C00972D62 /* ServersSummaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServersSummaryView.swift; sourceTree = "<group>"; };
 		64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoHelp.swift; sourceTree = "<group>"; };
+		8C01E9BF2C8EFBB6008A4B0A /* objc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = objc.h; sourceTree = "<group>"; };
+		8C01E9C02C8EFC33008A4B0A /* objc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = objc.m; sourceTree = "<group>"; };
 		8C69FE7C2B8C7D2700267E38 /* AppSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = "<group>"; };
 		8C74C3EB2C1B92A900039E77 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
 		8C74C3ED2C1B942300039E77 /* ChatWallpaper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatWallpaper.swift; sourceTree = "<group>"; };
@@ -550,11 +554,11 @@
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
 		D7AA2C3429A936B400737B40 /* MediaEncryption.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = MediaEncryption.playground; path = Shared/MediaEncryption.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		E51CC1E52C62085600DB91FE /* OneHandUICard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneHandUICard.swift; sourceTree = "<group>"; };
-		E51ED58F2C7B9983009F2C7C /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		E51ED5902C7B9983009F2C7C /* libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx-ghc9.6.3.a"; sourceTree = "<group>"; };
-		E51ED5912C7B9983009F2C7C /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		E51ED5922C7B9983009F2C7C /* libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx.a"; sourceTree = "<group>"; };
-		E51ED5932C7B9983009F2C7C /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		E5CC477F2CA31C3900551ACF /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		E5CC47802CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a"; sourceTree = "<group>"; };
+		E5CC47812CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a"; sourceTree = "<group>"; };
+		E5CC47822CA31C3A00551ACF /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		E5CC47832CA31C3A00551ACF /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		E5DCF9702C590272007928CC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9722C590274007928CC /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9732C590275007928CC /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -645,13 +649,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E51ED5942C7B9983009F2C7C /* libgmpxx.a in Frameworks */,
+				E5CC47852CA31C3A00551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a in Frameworks */,
+				E5CC47872CA31C3A00551ACF /* libgmp.a in Frameworks */,
+				E5CC47842CA31C3A00551ACF /* libgmpxx.a in Frameworks */,
+				E5CC47882CA31C3A00551ACF /* libffi.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
+				E5CC47862CA31C3A00551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				E51ED5982C7B9983009F2C7C /* libffi.a in Frameworks */,
-				E51ED5972C7B9983009F2C7C /* libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx.a in Frameworks */,
-				E51ED5952C7B9983009F2C7C /* libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx-ghc9.6.3.a in Frameworks */,
-				E51ED5962C7B9983009F2C7C /* libgmp.a in Frameworks */,
 				CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -729,11 +733,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				E51ED5932C7B9983009F2C7C /* libffi.a */,
-				E51ED5912C7B9983009F2C7C /* libgmp.a */,
-				E51ED58F2C7B9983009F2C7C /* libgmpxx.a */,
-				E51ED5902C7B9983009F2C7C /* libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx-ghc9.6.3.a */,
-				E51ED5922C7B9983009F2C7C /* libHSsimplex-chat-6.1.0.0-2HbUlAtNXgRGMjFy4vK7lx.a */,
+				E5CC47832CA31C3A00551ACF /* libffi.a */,
+				E5CC47822CA31C3A00551ACF /* libgmp.a */,
+				E5CC477F2CA31C3900551ACF /* libgmpxx.a */,
+				E5CC47812CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a */,
+				E5CC47802CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -976,6 +980,8 @@
 				5CE2BA96284537A800EC33A6 /* dummy.m */,
 				5CD67B8D2B0E858A00C510B1 /* hs_init.h */,
 				5CD67B8E2B0E858A00C510B1 /* hs_init.c */,
+				8C01E9BF2C8EFBB6008A4B0A /* objc.h */,
+				8C01E9C02C8EFC33008A4B0A /* objc.m */,
 			);
 			path = SimpleXChat;
 			sourceTree = "<group>";
@@ -1113,6 +1119,7 @@
 			files = (
 				5CE2BA77284530BF00EC33A6 /* SimpleXChat.h in Headers */,
 				5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */,
+				8C01E9C22C8EFF8F008A4B0A /* objc.h in Headers */,
 				5CE2BA952845354B00EC33A6 /* SimpleX.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1539,6 +1546,7 @@
 				8C74C3E72C1B901900039E77 /* Color.swift in Sources */,
 				5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */,
 				5CE2BA91284533A300EC33A6 /* Notifications.swift in Sources */,
+				8C01E9C12C8EFC33008A4B0A /* objc.m in Sources */,
 				5CE2BA79284530CC00EC33A6 /* SimpleXChat.docc in Sources */,
 				5CE2BA90284533A300EC33A6 /* JSON.swift in Sources */,
 				5CE2BA8B284533A300EC33A6 /* ChatTypes.swift in Sources */,
@@ -1879,7 +1887,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 235;
+				CURRENT_PROJECT_VERSION = 239;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1904,7 +1912,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 6.0.3;
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1928,7 +1936,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 235;
+				CURRENT_PROJECT_VERSION = 239;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1953,7 +1961,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.3;
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1969,11 +1977,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 235;
+				CURRENT_PROJECT_VERSION = 239;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.0.3;
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1989,11 +1997,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 235;
+				CURRENT_PROJECT_VERSION = 239;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.0.3;
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2014,7 +2022,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 235;
+				CURRENT_PROJECT_VERSION = 239;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -2029,7 +2037,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.3;
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2051,7 +2059,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 235;
+				CURRENT_PROJECT_VERSION = 239;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -2066,7 +2074,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.3;
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2088,7 +2096,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 235;
+				CURRENT_PROJECT_VERSION = 239;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2114,7 +2122,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.3;
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2139,7 +2147,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 235;
+				CURRENT_PROJECT_VERSION = 239;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2165,7 +2173,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.3;
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2190,7 +2198,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 235;
+				CURRENT_PROJECT_VERSION = 239;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2205,7 +2213,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.0.3;
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2224,7 +2232,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 235;
+				CURRENT_PROJECT_VERSION = 239;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2239,7 +2247,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.0.3;
+				MARKETING_VERSION = 6.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/APITypes.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import SwiftUI
+import Network
 
 public let jsonDecoder = getJSONDecoder()
 public let jsonEncoder = getJSONEncoder()
@@ -42,13 +43,13 @@ public enum ChatCommand {
     case apiGetChats(userId: Int64)
     case apiGetChat(type: ChatType, id: Int64, pagination: ChatPagination, search: String)
     case apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64)
-    case apiSendMessages(type: ChatType, id: Int64, live: Bool, ttl: Int?, composedMessages: [ComposedMessage])
-    case apiCreateChatItems(noteFolderId: Int64, composedMessages: [ComposedMessage])
+    case apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool, ttl: Int?)
+    case apiCreateChatItem(noteFolderId: Int64, file: CryptoFile?, msg: MsgContent)
     case apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent, live: Bool)
     case apiDeleteChatItem(type: ChatType, id: Int64, itemIds: [Int64], mode: CIDeleteMode)
     case apiDeleteMemberChatItem(groupId: Int64, itemIds: [Int64])
     case apiChatItemReaction(type: ChatType, id: Int64, itemId: Int64, add: Bool, reaction: MsgReaction)
-    case apiForwardChatItems(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemIds: [Int64], ttl: Int?)
+    case apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64, ttl: Int?)
     case apiGetNtfToken
     case apiRegisterToken(token: DeviceToken, notificationMode: NotificationsMode)
     case apiVerifyToken(token: DeviceToken, nonce: String, code: String)
@@ -97,7 +98,6 @@ public enum ChatCommand {
     case apiVerifyGroupMember(groupId: Int64, groupMemberId: Int64, connectionCode: String?)
     case apiAddContact(userId: Int64, incognito: Bool)
     case apiSetConnectionIncognito(connId: Int64, incognito: Bool)
-    case apiChangeConnectionUser(connId: Int64, userId: Int64)
     case apiConnectPlan(userId: Int64, connReq: String)
     case apiConnect(userId: Int64, incognito: Bool, connReq: String)
     case apiConnectContactViaAddress(userId: Int64, incognito: Bool, contactId: Int64)
@@ -191,20 +191,20 @@ public enum ChatCommand {
             case let .apiGetChat(type, id, pagination, search): return "/_get chat \(ref(type, id)) \(pagination.cmdString)" +
                 (search == "" ? "" : " search=\(search)")
             case let .apiGetChatItemInfo(type, id, itemId): return "/_get item info \(ref(type, id)) \(itemId)"
-            case let .apiSendMessages(type, id, live, ttl, composedMessages):
-                let msgs = encodeJSON(composedMessages)
+            case let .apiSendMessage(type, id, file, quotedItemId, mc, live, ttl):
+                let msg = encodeJSON(ComposedMessage(fileSource: file, quotedItemId: quotedItemId, msgContent: mc))
                 let ttlStr = ttl != nil ? "\(ttl!)" : "default"
-                return "/_send \(ref(type, id)) live=\(onOff(live)) ttl=\(ttlStr) json \(msgs)"
-            case let .apiCreateChatItems(noteFolderId, composedMessages):
-                let msgs = encodeJSON(composedMessages)
-                return "/_create *\(noteFolderId) json \(msgs)"
+                return "/_send \(ref(type, id)) live=\(onOff(live)) ttl=\(ttlStr) json \(msg)"
+            case let .apiCreateChatItem(noteFolderId, file, mc):
+                let msg = encodeJSON(ComposedMessage(fileSource: file, msgContent: mc))
+                return "/_create *\(noteFolderId) json \(msg)"
             case let .apiUpdateChatItem(type, id, itemId, mc, live): return "/_update item \(ref(type, id)) \(itemId) live=\(onOff(live)) \(mc.cmdString)"
             case let .apiDeleteChatItem(type, id, itemIds, mode): return "/_delete item \(ref(type, id)) \(itemIds.map({ "\($0)" }).joined(separator: ",")) \(mode.rawValue)"
             case let .apiDeleteMemberChatItem(groupId, itemIds): return "/_delete member item #\(groupId) \(itemIds.map({ "\($0)" }).joined(separator: ","))"
             case let .apiChatItemReaction(type, id, itemId, add, reaction): return "/_reaction \(ref(type, id)) \(itemId) \(onOff(add)) \(encodeJSON(reaction))"
-            case let .apiForwardChatItems(toChatType, toChatId, fromChatType, fromChatId, itemIds, ttl):
+            case let .apiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId, ttl):
                 let ttlStr = ttl != nil ? "\(ttl!)" : "default"
-                return "/_forward \(ref(toChatType, toChatId)) \(ref(fromChatType, fromChatId)) \(itemIds.map({ "\($0)" }).joined(separator: ",")) ttl=\(ttlStr)"
+                return "/_forward \(ref(toChatType, toChatId)) \(ref(fromChatType, fromChatId)) \(itemId) ttl=\(ttlStr)"
             case .apiGetNtfToken: return "/_ntf get "
             case let .apiRegisterToken(token, notificationMode): return "/_ntf register \(token.cmdString) \(notificationMode.rawValue)"
             case let .apiVerifyToken(token, nonce, code): return "/_ntf verify \(token.cmdString) \(nonce) \(code)"
@@ -263,7 +263,6 @@ public enum ChatCommand {
             case let .apiVerifyGroupMember(groupId, groupMemberId, .none): return "/_verify code #\(groupId) \(groupMemberId)"
             case let .apiAddContact(userId, incognito): return "/_connect \(userId) incognito=\(onOff(incognito))"
             case let .apiSetConnectionIncognito(connId, incognito): return "/_set incognito :\(connId) \(onOff(incognito))"
-            case let .apiChangeConnectionUser(connId, userId): return "/_set conn user :\(connId) \(userId)"
             case let .apiConnectPlan(userId, connReq): return "/_connect plan \(userId) \(connReq)"
             case let .apiConnect(userId, incognito, connReq): return "/_connect \(userId) incognito=\(onOff(incognito)) \(connReq)"
             case let .apiConnectContactViaAddress(userId, incognito, contactId): return "/_connect contact \(userId) incognito=\(onOff(incognito)) \(contactId)"
@@ -349,14 +348,14 @@ public enum ChatCommand {
             case .apiGetChats: return "apiGetChats"
             case .apiGetChat: return "apiGetChat"
             case .apiGetChatItemInfo: return "apiGetChatItemInfo"
-            case .apiSendMessages: return "apiSendMessages"
-            case .apiCreateChatItems: return "apiCreateChatItems"
+            case .apiSendMessage: return "apiSendMessage"
+            case .apiCreateChatItem: return "apiCreateChatItem"
             case .apiUpdateChatItem: return "apiUpdateChatItem"
             case .apiDeleteChatItem: return "apiDeleteChatItem"
             case .apiConnectContactViaAddress: return "apiConnectContactViaAddress"
             case .apiDeleteMemberChatItem: return "apiDeleteMemberChatItem"
             case .apiChatItemReaction: return "apiChatItemReaction"
-            case .apiForwardChatItems: return "apiForwardChatItems"
+            case .apiForwardChatItem: return "apiForwardChatItem"
             case .apiGetNtfToken: return "apiGetNtfToken"
             case .apiRegisterToken: return "apiRegisterToken"
             case .apiVerifyToken: return "apiVerifyToken"
@@ -405,7 +404,6 @@ public enum ChatCommand {
             case .apiVerifyGroupMember: return "apiVerifyGroupMember"
             case .apiAddContact: return "apiAddContact"
             case .apiSetConnectionIncognito: return "apiSetConnectionIncognito"
-            case .apiChangeConnectionUser: return "apiChangeConnectionUser"
             case .apiConnectPlan: return "apiConnectPlan"
             case .apiConnect: return "apiConnect"
             case .apiDeleteChat: return "apiDeleteChat"
@@ -558,7 +556,6 @@ public enum ChatResponse: Decodable, Error {
     case connectionVerified(user: UserRef, verified: Bool, expectedCode: String)
     case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
     case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
-    case connectionUserChanged(user: UserRef, fromConnection: PendingContactConnection, toConnection: PendingContactConnection, newUser: UserRef)
     case connectionPlan(user: UserRef, connectionPlan: ConnectionPlan)
     case sentConfirmation(user: UserRef, connection: PendingContactConnection)
     case sentInvitation(user: UserRef, connection: PendingContactConnection)
@@ -592,7 +589,7 @@ public enum ChatResponse: Decodable, Error {
     case memberSubErrors(user: UserRef, memberSubErrors: [MemberSubError])
     case groupEmpty(user: UserRef, groupInfo: GroupInfo)
     case userContactLinkSubscribed
-    case newChatItems(user: UserRef, chatItems: [AChatItem])
+    case newChatItem(user: UserRef, chatItem: AChatItem)
     case chatItemStatusUpdated(user: UserRef, chatItem: AChatItem)
     case chatItemUpdated(user: UserRef, chatItem: AChatItem)
     case chatItemNotChanged(user: UserRef, chatItem: AChatItem)
@@ -729,7 +726,6 @@ public enum ChatResponse: Decodable, Error {
             case .connectionVerified: return "connectionVerified"
             case .invitation: return "invitation"
             case .connectionIncognitoUpdated: return "connectionIncognitoUpdated"
-            case .connectionUserChanged: return "connectionUserChanged"
             case .connectionPlan: return "connectionPlan"
             case .sentConfirmation: return "sentConfirmation"
             case .sentInvitation: return "sentInvitation"
@@ -763,7 +759,7 @@ public enum ChatResponse: Decodable, Error {
             case .memberSubErrors: return "memberSubErrors"
             case .groupEmpty: return "groupEmpty"
             case .userContactLinkSubscribed: return "userContactLinkSubscribed"
-            case .newChatItems: return "newChatItems"
+            case .newChatItem: return "newChatItem"
             case .chatItemStatusUpdated: return "chatItemStatusUpdated"
             case .chatItemUpdated: return "chatItemUpdated"
             case .chatItemNotChanged: return "chatItemNotChanged"
@@ -898,7 +894,6 @@ public enum ChatResponse: Decodable, Error {
             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 .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
-            case let .connectionUserChanged(u, fromConnection, toConnection, newUser): return withUser(u, "fromConnection: \(String(describing: fromConnection))\ntoConnection: \(String(describing: toConnection))\newUserId: \(String(describing: newUser.userId))")
             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))
@@ -932,9 +927,7 @@ public enum ChatResponse: Decodable, Error {
             case let .memberSubErrors(u, memberSubErrors): return withUser(u, String(describing: memberSubErrors))
             case let .groupEmpty(u, groupInfo): return withUser(u, String(describing: groupInfo))
             case .userContactLinkSubscribed: return noDetails
-            case let .newChatItems(u, chatItems):
-                let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
-                return withUser(u, itemsString)
+            case let .newChatItem(u, chatItem): return withUser(u, String(describing: chatItem))
             case let .chatItemStatusUpdated(u, chatItem): return withUser(u, String(describing: chatItem))
             case let .chatItemUpdated(u, chatItem): return withUser(u, String(describing: chatItem))
             case let .chatItemNotChanged(u, chatItem): return withUser(u, String(describing: chatItem))
@@ -1121,16 +1114,10 @@ public enum ChatPagination {
     }
 }
 
-public struct ComposedMessage: Encodable {
-    public var fileSource: CryptoFile?
+struct ComposedMessage: Encodable {
+    var fileSource: CryptoFile?
     var quotedItemId: Int64?
     var msgContent: MsgContent
-
-    public init(fileSource: CryptoFile? = nil, quotedItemId: Int64? = nil, msgContent: MsgContent) {
-        self.fileSource = fileSource
-        self.quotedItemId = quotedItemId
-        self.msgContent = msgContent
-    }
 }
 
 public struct ArchiveConfig: Encodable {
@@ -1490,6 +1477,63 @@ public struct KeepAliveOpts: Codable, Equatable {
     public static let defaults: KeepAliveOpts = KeepAliveOpts(keepIdle: 30, keepIntvl: 15, keepCnt: 4)
 }
 
+public struct NetworkProxy: Equatable, Codable {
+    public var host: String = ""
+    public var port: Int = 0
+    public var auth: NetworkProxyAuth = .username
+    public var username: String = ""
+    public var password: String = ""
+
+    public static var def: NetworkProxy {
+        NetworkProxy()
+    }
+    
+    public var valid: Bool {
+        let hostOk = switch NWEndpoint.Host(host) {
+        case .ipv4: true
+        case .ipv6: true
+        default: false
+        }
+        return hostOk &&
+                port > 0 && port <= 65535 &&
+                NetworkProxy.validCredential(username) && NetworkProxy.validCredential(password)
+    }
+    
+    public static func validCredential(_ s: String) -> Bool {
+        !s.contains(":") && !s.contains("@")
+    }
+
+    public func toProxyString() -> String? {
+        if !valid { return nil }
+        var res = ""
+        switch auth {
+        case .username:
+            let usernameTrimmed = username.trimmingCharacters(in: .whitespaces)
+            let passwordTrimmed = password.trimmingCharacters(in: .whitespaces)
+            if usernameTrimmed != "" || passwordTrimmed != "" {
+                res += usernameTrimmed + ":" + passwordTrimmed + "@"
+            } else {
+                res += "@"
+            }
+        case .isolate: ()
+        }
+        if host != "" {
+            if host.contains(":") {
+                res += "[\(host.trimmingCharacters(in: [" ", "[", "]"]))]"
+            } else {
+                res += host.trimmingCharacters(in: .whitespaces)
+            }
+        }
+        res += ":\(port)"
+        return res
+    }
+}
+
+public enum NetworkProxyAuth: String, Codable {
+    case username
+    case isolate
+}
+
 public enum NetworkStatus: Decodable, Equatable {
     case unknown
     case connected
@@ -1856,6 +1900,7 @@ public enum ChatErrorType: Decodable, Hashable {
     case inlineFileProhibited(fileId: Int64)
     case invalidQuote
     case invalidForward
+    case forwardNoFile
     case invalidChatItemUpdate
     case invalidChatItemDelete
     case hasCurrentCall
@@ -1870,7 +1915,6 @@ public enum ChatErrorType: Decodable, Hashable {
     case agentCommandError(message: String)
     case invalidFileDescription(message: String)
     case connectionIncognitoChangeProhibited
-    case connectionUserChangeProhibited
     case peerChatVRangeIncompatible
     case internalError(message: String)
     case exception(message: String)
@@ -2113,11 +2157,13 @@ public struct MigrationFileLinkData: Codable {
 
     public struct NetworkConfig: Codable {
         let socksProxy: String?
+        let networkProxy: NetworkProxy?
         let hostMode: HostMode?
         let requiredHostMode: Bool?
 
-        public init(socksProxy: String?, hostMode: HostMode?, requiredHostMode: Bool?) {
+        public init(socksProxy: String?, networkProxy: NetworkProxy?, hostMode: HostMode?, requiredHostMode: Bool?) {
             self.socksProxy = socksProxy
+            self.networkProxy = networkProxy
             self.hostMode = hostMode
             self.requiredHostMode = requiredHostMode
         }
@@ -2126,6 +2172,7 @@ public struct MigrationFileLinkData: Codable {
             return if let hostMode, let requiredHostMode {
                 NetworkConfig(
                     socksProxy: nil,
+                    networkProxy: nil,
                     hostMode: hostMode == .onionViaSocks ? .onionHost : hostMode,
                     requiredHostMode: requiredHostMode
                 )
@@ -2145,6 +2192,7 @@ public struct MigrationFileLinkData: Codable {
 
 public struct AppSettings: Codable, Equatable {
     public var networkConfig: NetCfg? = nil
+    public var networkProxy: NetworkProxy? = nil
     public var privacyEncryptLocalFiles: Bool? = nil
     public var privacyAskToApproveRelays: Bool? = nil
     public var privacyAcceptImages: Bool? = nil
@@ -2176,6 +2224,7 @@ public struct AppSettings: Codable, Equatable {
         var empty = AppSettings()
         let def = AppSettings.defaults
         if networkConfig != def.networkConfig { empty.networkConfig = networkConfig }
+        if networkProxy != def.networkProxy { empty.networkProxy = networkProxy }
         if privacyEncryptLocalFiles != def.privacyEncryptLocalFiles { empty.privacyEncryptLocalFiles = privacyEncryptLocalFiles }
         if privacyAskToApproveRelays != def.privacyAskToApproveRelays { empty.privacyAskToApproveRelays = privacyAskToApproveRelays }
         if privacyAcceptImages != def.privacyAcceptImages { empty.privacyAcceptImages = privacyAcceptImages }
@@ -2208,6 +2257,7 @@ public struct AppSettings: Codable, Equatable {
     public static var defaults: AppSettings {
         AppSettings (
             networkConfig: NetCfg.defaults,
+            networkProxy: NetworkProxy.def,
             privacyEncryptLocalFiles: true,
             privacyAskToApproveRelays: true,
             privacyAcceptImages: true,

apps/ios/SimpleXChat/AppGroup.swift

@@ -35,6 +35,7 @@ public let GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS = "privacyAskToApproveRel
 // replaces DEFAULT_PROFILE_IMAGE_CORNER_RADIUS
 public let GROUP_DEFAULT_PROFILE_IMAGE_CORNER_RADIUS = "profileImageCornerRadius"
 let GROUP_DEFAULT_NTF_BADGE_COUNT = "ntgBadgeCount"
+public let GROUP_DEFAULT_NETWORK_SOCKS_PROXY = "networkSocksProxy"
 let GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS = "networkUseOnionHosts"
 let GROUP_DEFAULT_NETWORK_SESSION_MODE = "networkSessionMode"
 let GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE = "networkSMPProxyMode"
@@ -327,6 +328,7 @@ public class Default<T> {
 }
 
 public func getNetCfg() -> NetCfg {
+    let socksProxy = groupDefaults.string(forKey: GROUP_DEFAULT_NETWORK_SOCKS_PROXY)
     let onionHosts = networkUseOnionHostsGroupDefault.get()
     let (hostMode, requiredHostMode) = onionHosts.hostMode
     let sessionMode = networkSessionModeGroupDefault.get()
@@ -349,6 +351,7 @@ public func getNetCfg() -> NetCfg {
         tcpKeepAlive = nil
     }
     return NetCfg(
+        socksProxy: socksProxy,
         hostMode: hostMode,
         requiredHostMode: requiredHostMode,
         sessionMode: sessionMode,
@@ -365,11 +368,13 @@ public func getNetCfg() -> NetCfg {
     )
 }
 
-public func setNetCfg(_ cfg: NetCfg) {
+public func setNetCfg(_ cfg: NetCfg, networkProxy: NetworkProxy?) {
     networkUseOnionHostsGroupDefault.set(OnionHosts(netCfg: cfg))
     networkSessionModeGroupDefault.set(cfg.sessionMode)
     networkSMPProxyModeGroupDefault.set(cfg.smpProxyMode)
     networkSMPProxyFallbackGroupDefault.set(cfg.smpProxyFallback)
+    let socksProxy = networkProxy?.toProxyString()
+    groupDefaults.set(socksProxy, forKey: GROUP_DEFAULT_NETWORK_SOCKS_PROXY)
     groupDefaults.set(cfg.tcpConnectTimeout, forKey: GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT)
     groupDefaults.set(cfg.tcpTimeout, forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT)
     groupDefaults.set(cfg.tcpTimeoutPerKb, forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB)

apps/ios/SimpleXChat/CallTypes.swift

@@ -42,6 +42,7 @@ public struct RcvCallInvitation: Decodable {
     public var contact: Contact
     public var callType: CallType
     public var sharedKey: String?
+    public var callUUID: String?
     public var callTs: Date
     public var callTypeText: LocalizedStringKey {
         get {
@@ -52,10 +53,8 @@ public struct RcvCallInvitation: Decodable {
         }
     }
 
-    public var callkitUUID: UUID? = UUID()
-
     private enum CodingKeys: String, CodingKey {
-        case user, contact, callType, sharedKey, callTs
+        case user, contact, callType, sharedKey, callUUID, callTs
     }
 
     public static let sampleData = RcvCallInvitation(

apps/ios/SimpleXChat/ChatTypes.swift

@@ -2688,13 +2688,6 @@ public enum CIDirection: Decodable, Hashable {
             }
         }
     }
-    
-    public func sameDirection(_ dir: CIDirection) -> Bool {
-        switch (self, dir) {
-        case let (.groupRcv(m1), .groupRcv(m2)): m1.groupMemberId == m2.groupMemberId
-        default: sent == dir.sent
-        }
-    }
 }
 
 public struct CIMeta: Decodable, Hashable {
@@ -2765,8 +2758,26 @@ public struct CITimed: Decodable, Hashable {
     public var deleteAt: Date?
 }
 
+let msgTimeFormat = Date.FormatStyle.dateTime.hour().minute()
+let msgDateFormat = Date.FormatStyle.dateTime.day(.twoDigits).month(.twoDigits)
+
 public func formatTimestampText(_ date: Date) -> Text {
-    Text(verbatim: date.formatted(date: .omitted, time: .shortened))
+    return Text(date, format: recent(date) ? msgTimeFormat : msgDateFormat)
+}
+
+private func recent(_ date: Date) -> Bool {
+    let now = Date()
+    let calendar = Calendar.current
+
+    guard let previousDay = calendar.date(byAdding: DateComponents(day: -1), to: now),
+          let previousDay18 = calendar.date(bySettingHour: 18, minute: 0, second: 0, of: previousDay),
+          let currentDay00 = calendar.date(bySettingHour: 0, minute: 0, second: 0, of: now),
+          let currentDay12 = calendar.date(bySettingHour: 12, minute: 0, second: 0, of: now) else {
+        return false
+    }
+
+    let isSameDay = calendar.isDate(date, inSameDayAs: now)
+    return isSameDay || (now < currentDay12 && date >= previousDay18 && date < currentDay00)
 }
 
 public enum CIStatus: Decodable, Hashable {

apps/ios/SimpleXChat/SimpleX.h

@@ -10,6 +10,7 @@
 #define SimpleX_h
 
 #include "hs_init.h"
+#include "objc.h"
 
 extern void hs_init(int argc, char **argv[]);
 

apps/ios/SimpleXChat/objc.h

@@ -0,0 +1,20 @@
+//
+//  objc.h
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 09.09.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+#ifndef objc_h
+#define objc_h
+
+#import <Foundation/Foundation.h>
+
+@interface ObjC : NSObject
+
++ (BOOL)catchException:(void(^)(void))tryBlock error:(__autoreleasing NSError **)error;
+
+@end
+
+#endif /* objc_h */

apps/ios/SimpleXChat/objc.m

@@ -0,0 +1,25 @@
+//
+//  objc.m
+//  SimpleXChat
+//
+//  Created by Stanislav Dmitrenko on 09.09.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+#import "objc.h"
+
+@implementation ObjC
+
+// https://stackoverflow.com/a/36454808
++ (BOOL)catchException:(void(^)(void))tryBlock error:(__autoreleasing NSError **)error {
+    @try {
+        tryBlock();
+        return YES;
+    }
+    @catch (NSException *exception) {
+        *error = [[NSError alloc] initWithDomain: exception.name code: 0 userInfo: exception.userInfo];
+        return NO;
+    }
+}
+
+@end

apps/multiplatform/android/src/main/java/chat/simplex/app/MessagesFetcherWorker.kt

@@ -5,9 +5,8 @@ import android.util.Log
 import androidx.work.*
 import chat.simplex.app.SimplexService.Companion.showPassphraseNotification
 import chat.simplex.common.model.ChatController
+import chat.simplex.common.platform.*
 import chat.simplex.common.views.helpers.DBMigrationResult
-import chat.simplex.common.platform.chatModel
-import chat.simplex.common.platform.initChatControllerOnStart
 import chat.simplex.common.views.helpers.DatabaseUtils
 import kotlinx.coroutines.*
 import java.util.Date
@@ -30,12 +29,12 @@ object MessagesFetcherWorker {
       .setConstraints(Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
       .build()
 
-    WorkManager.getInstance(SimplexApp.context).enqueueUniqueWork(UNIQUE_WORK_TAG, ExistingWorkPolicy.REPLACE, periodicWorkRequest)
+    SimplexApp.context.getWorkManagerInstance().enqueueUniqueWork(UNIQUE_WORK_TAG, ExistingWorkPolicy.REPLACE, periodicWorkRequest)
   }
 
   fun cancelAll() {
     Log.d(TAG, "Worker: canceled all tasks")
-    WorkManager.getInstance(SimplexApp.context).cancelUniqueWork(UNIQUE_WORK_TAG)
+    SimplexApp.context.getWorkManagerInstance().cancelUniqueWork(UNIQUE_WORK_TAG)
   }
 }
 

apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt

@@ -7,7 +7,6 @@ import chat.simplex.common.platform.Log
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.os.*
-import android.view.View
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.graphics.Color
@@ -164,7 +163,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
       .addTag(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC)
       .build()
     Log.d(TAG, "ServiceStartWorker: Scheduling period work every ${SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES} minutes")
-    WorkManager.getInstance(context)?.enqueueUniquePeriodicWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC, workPolicy, work)
+    getWorkManagerInstance().enqueueUniquePeriodicWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC, workPolicy, work)
   }
 
   fun schedulePeriodicWakeUp() = CoroutineScope(Dispatchers.Default).launch {

apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt

@@ -292,7 +292,7 @@ class SimplexService: Service() {
 
     fun scheduleStart(context: Context) {
       Log.d(TAG, "Enqueuing work to start subscriber service")
-      val workManager = WorkManager.getInstance(context)
+      val workManager = context.getWorkManagerInstance()
       val startServiceRequest = OneTimeWorkRequest.Builder(ServiceStartWorker::class.java).build()
       workManager.enqueueUniqueWork(WORK_NAME_ONCE, ExistingWorkPolicy.KEEP, startServiceRequest) // Unique avoids races!
     }

apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallActivity.kt

@@ -424,6 +424,7 @@ fun PreviewIncomingCallLockScreenAlert() {
     ) {
       IncomingCallLockScreenAlertLayout(
         invitation = RcvCallInvitation(
+          callUUID = "",
           remoteHostId = null,
           user = User.sampleData,
           contact = Contact.sampleData,

apps/multiplatform/common/build.gradle.kts

@@ -99,10 +99,15 @@ kotlin {
     val desktopMain by getting {
       dependencies {
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.0")
-        implementation("com.github.Dansoftowner:jSystemThemeDetector:3.8")
+        implementation("com.github.Dansoftowner:jSystemThemeDetector:3.8") {
+          exclude("net.java.dev.jna")
+        }
+        // For jSystemThemeDetector only
+        implementation("net.java.dev.jna:jna-platform:5.14.0")
         implementation("com.sshtools:two-slices:0.9.0-SNAPSHOT")
         implementation("org.slf4j:slf4j-simple:2.0.12")
-        implementation("uk.co.caprica:vlcj:4.8.2")
+        implementation("uk.co.caprica:vlcj:4.8.3")
+        implementation("net.java.dev.jna:jna:5.14.0")
         implementation("com.github.NanoHttpd.nanohttpd:nanohttpd:efb2ebf85a")
         implementation("com.github.NanoHttpd.nanohttpd:nanohttpd-websocket:efb2ebf85a")
         implementation("com.squareup.okhttp3:okhttp:4.12.0")

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/AppCommon.android.kt

@@ -6,6 +6,8 @@ import android.net.LocalServerSocket
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.fragment.app.FragmentActivity
+import androidx.work.Configuration
+import androidx.work.WorkManager
 import java.io.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -72,3 +74,16 @@ fun initHaskell() {
 
   initHS()
 }
+
+fun Context.getWorkManagerInstance(): WorkManager {
+  // https://github.com/OneSignal/OneSignal-Android-SDK/pull/2052/files
+  // https://github.com/OneSignal/OneSignal-Android-SDK/issues/1672
+  if (!WorkManager.isInitialized()) {
+    try {
+      WorkManager.initialize(this, Configuration.Builder().build())
+    } catch (e: IllegalStateException) {
+      Log.e(TAG, "Error initializing WorkManager: ${e.stackTraceToString()}")
+    }
+  }
+  return WorkManager.getInstance(this)
+}

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt

@@ -770,6 +770,7 @@ fun PreviewActiveCallOverlayVideo() {
         callState = CallState.Negotiated,
         localMedia = CallMediaType.Video,
         peerMedia = CallMediaType.Video,
+        callUUID = "",
         connectionInfo = ConnectionInfo(
           RTCIceCandidate(RTCIceCandidateType.Host, "tcp"),
           RTCIceCandidate(RTCIceCandidateType.Host, "tcp")
@@ -799,6 +800,7 @@ fun PreviewActiveCallOverlayAudio() {
         callState = CallState.Negotiated,
         localMedia = CallMediaType.Audio,
         peerMedia = CallMediaType.Audio,
+        callUUID = "",
         connectionInfo = ConnectionInfo(
           RTCIceCandidate(RTCIceCandidateType.Host, "udp"),
           RTCIceCandidate(RTCIceCandidateType.Host, "udp")

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/helpers/LocalAuthentication.android.kt

@@ -14,6 +14,7 @@ actual fun authenticate(
   promptSubtitle: String,
   selfDestruct: Boolean,
   usingLAMode: LAMode,
+  oneTime: Boolean,
   completed: (LAResult) -> Unit
 ) {
   val activity = mainActivity.get() ?: return completed(LAResult.Error(""))
@@ -27,7 +28,7 @@ actual fun authenticate(
       else -> completed(LAResult.Unavailable())
     }
     LAMode.PASSCODE -> {
-      authenticateWithPasscode(promptTitle, promptSubtitle, selfDestruct, completed)
+      authenticateWithPasscode(promptTitle, promptSubtitle, selfDestruct, oneTime, completed)
     }
   }
 }

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/usersettings/SettingsView.android.kt

@@ -2,7 +2,6 @@ package chat.simplex.common.views.usersettings
 
 import SectionView
 import androidx.compose.runtime.Composable
-import androidx.work.WorkManager
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.helpers.*
@@ -33,7 +32,7 @@ fun restartApp() {
 }
 
 private fun shutdownApp() {
-  WorkManager.getInstance(androidAppContext).cancelAllWork()
+  androidAppContext.getWorkManagerInstance().cancelAllWork()
   platform.androidServiceSafeStop()
   Runtime.getRuntime().exit(0)
 }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt

@@ -74,6 +74,7 @@ fun MainScreen() {
   LaunchedEffect(showAdvertiseLAAlert) {
     if (
       !chatModel.controller.appPrefs.laNoticeShown.get()
+      && !appPrefs.performLA.get()
       && showAdvertiseLAAlert
       && chatModel.controller.appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete
       && chatModel.chats.size > 3
@@ -211,10 +212,8 @@ fun MainScreen() {
         } else {
           ActiveCallView()
         }
-      } else {
-        // It's needed for privacy settings toggle, so it can be shown even if the app is passcode unlocked
-        ModalManager.fullscreen.showPasscodeInView()
       }
+      ModalManager.fullscreen.showOneTimePasscodeInView()
       AlertManager.privacySensitive.showInView()
       if (onboarding == OnboardingStage.OnboardingComplete) {
         LaunchedEffect(chatModel.currentUser.value, chatModel.appOpenUrl.value) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/AppLock.kt

@@ -5,6 +5,7 @@ import androidx.compose.material.*
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.localauth.SetAppPasscodeView
@@ -31,7 +32,7 @@ object AppLock {
 
   fun showLANotice(laNoticeShown: SharedPreference<Boolean>) {
     Log.d(TAG, "showLANotice")
-    if (!laNoticeShown.get()) {
+    if (!laNoticeShown.get() && !appPrefs.performLA.get()) {
       laNoticeShown.set(true)
       AlertManager.shared.showAlertDialog(
         title = generalGetString(MR.strings.la_notice_title_simplex_lock),
@@ -57,6 +58,8 @@ object AppLock {
 
   private fun showChooseLAMode() {
     Log.d(TAG, "showLANotice")
+    if (appPrefs.performLA.get()) return
+
     AlertManager.shared.showAlertDialogStacked(
       title = generalGetString(MR.strings.la_lock_mode),
       text = null,
@@ -80,21 +83,23 @@ object AppLock {
     authenticate(
       generalGetString(MR.strings.auth_enable_simplex_lock),
       generalGetString(MR.strings.auth_confirm_credential),
+      oneTime = true,
       completed = { laResult ->
         when (laResult) {
           LAResult.Success -> {
-            m.performLA.value = true
+            m.showAuthScreen.value = true
             appPrefs.performLA.set(true)
             laTurnedOnAlert()
           }
           is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
           is LAResult.Error -> {
-            m.performLA.value = false
-            appPrefs.performLA.set(false)
+            m.showAuthScreen.value = false
+            // Don't drop auth pref in case of state inconsistency (eg, you have set passcode but somehow bypassed toggle and turned it off and then on)
+            // appPrefs.performLA.set(false)
             laFailedAlert()
           }
           is LAResult.Unavailable -> {
-            m.performLA.value = false
+            m.showAuthScreen.value = false
             appPrefs.performLA.set(false)
             m.showAdvertiseLAUnavailableAlert.value = true
           }
@@ -104,19 +109,22 @@ object AppLock {
   }
 
   private fun setPasscode() {
+    if (appPrefs.performLA.get()) return
+
     val appPrefs = ChatController.appPrefs
     ModalManager.fullscreen.showCustomModal { close ->
       Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background, contentColor = LocalContentColor.current) {
         SetAppPasscodeView(
           submit = {
-            ChatModel.performLA.value = true
+            ChatModel.showAuthScreen.value = true
             appPrefs.performLA.set(true)
             appPrefs.laMode.set(LAMode.PASSCODE)
             laTurnedOnAlert()
           },
           cancel = {
-            ChatModel.performLA.value = false
-            appPrefs.performLA.set(false)
+            ChatModel.showAuthScreen.value = false
+            // Don't drop auth pref in case of state inconsistency (eg, you have set passcode but somehow bypassed toggle and turned it off and then on)
+            // appPrefs.performLA.set(false)
             laPasscodeNotSetAlert()
           },
           close = close
@@ -147,6 +155,7 @@ object AppLock {
             else
               generalGetString(MR.strings.auth_unlock),
             selfDestruct = true,
+            oneTime = false,
             completed = { laResult ->
               when (laResult) {
                 LAResult.Success ->
@@ -160,7 +169,7 @@ object AppLock {
                 }
                 is LAResult.Unavailable -> {
                   userAuthorized.value = true
-                  m.performLA.value = false
+                  m.showAuthScreen.value = false
                   m.controller.appPrefs.performLA.set(false)
                   laUnavailableTurningOffAlert()
                 }
@@ -192,22 +201,23 @@ object AppLock {
         generalGetString(MR.strings.auth_confirm_credential)
       else
         "",
+      oneTime = true,
       completed = { laResult ->
         val prefPerformLA = m.controller.appPrefs.performLA
         when (laResult) {
           LAResult.Success -> {
-            m.performLA.value = true
+            m.showAuthScreen.value = true
             prefPerformLA.set(true)
             laTurnedOnAlert()
           }
           is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
           is LAResult.Error -> {
-            m.performLA.value = false
+            m.showAuthScreen.value = false
             prefPerformLA.set(false)
             laFailedAlert()
           }
           is LAResult.Unavailable -> {
-            m.performLA.value = false
+            m.showAuthScreen.value = false
             prefPerformLA.set(false)
             laUnavailableInstructionAlert()
           }
@@ -227,12 +237,13 @@ object AppLock {
         generalGetString(MR.strings.auth_confirm_credential)
       else
         generalGetString(MR.strings.auth_disable_simplex_lock),
+      oneTime = true,
       completed = { laResult ->
         val prefPerformLA = m.controller.appPrefs.performLA
         val selfDestructPref = m.controller.appPrefs.selfDestruct
         when (laResult) {
           LAResult.Success -> {
-            m.performLA.value = false
+            m.showAuthScreen.value = false
             prefPerformLA.set(false)
             DatabaseUtils.ksAppPassword.remove()
             selfDestructPref.set(false)
@@ -240,12 +251,12 @@ object AppLock {
           }
           is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
           is LAResult.Error -> {
-            m.performLA.value = true
+            m.showAuthScreen.value = true
             prefPerformLA.set(true)
             laFailedAlert()
           }
           is LAResult.Unavailable -> {
-            m.performLA.value = false
+            m.showAuthScreen.value = false
             prefPerformLA.set(false)
             laUnavailableTurningOffAlert()
           }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt

@@ -20,7 +20,6 @@ import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.StringResource
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.flow.internal.ChannelFlow
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.datetime.*
@@ -98,7 +97,7 @@ object ChatModel {
       }
     )
   }
-  val performLA by lazy { mutableStateOf(ChatController.appPrefs.performLA.get()) }
+  val showAuthScreen by lazy { mutableStateOf(ChatController.appPrefs.performLA.get()) }
   val showAdvertiseLAUnavailableAlert = mutableStateOf(false)
   val showChatPreviews by lazy { mutableStateOf(ChatController.appPrefs.privacyShowChatPreviews.get()) }
 
@@ -412,7 +411,9 @@ object ChatModel {
       // remove from current chat
       if (chatId.value == cInfo.id) {
         chatItems.removeAll {
-          val remove = it.id == cItem.id
+          // We delete taking into account meta.createdAt to make sure we will not be in situation when two items with the same id will be deleted
+          // (it can happen if already deleted chat item in backend still in the list and new one came with the same (re-used) chat item id)
+          val remove = it.id == cItem.id && it.meta.createdAt == cItem.meta.createdAt
           if (remove) { AudioPlayer.stop(it) }
           remove
         }
@@ -784,8 +785,7 @@ object ChatModel {
 data class ShowingInvitation(
   val connId: String,
   val connReq: String,
-  val connChatUsed: Boolean,
-  val conn: PendingContactConnection
+  val connChatUsed: Boolean
 )
 
 enum class ChatType(val type: String) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt

@@ -129,7 +129,22 @@ class AppPreferences {
   val terminalAlwaysVisible = mkBoolPreference(SHARED_PREFS_TERMINAL_ALWAYS_VISIBLE, false)
   val networkUseSocksProxy = mkBoolPreference(SHARED_PREFS_NETWORK_USE_SOCKS_PROXY, false)
   val networkShowSubscriptionPercentage = mkBoolPreference(SHARED_PREFS_NETWORK_SHOW_SUBSCRIPTION_PERCENTAGE, false)
-  val networkProxyHostPort = mkStrPreference(SHARED_PREFS_NETWORK_PROXY_HOST_PORT, "localhost:9050")
+  private val _networkProxy = mkStrPreference(SHARED_PREFS_NETWORK_PROXY_HOST_PORT, json.encodeToString(NetworkProxy()))
+  val networkProxy: SharedPreference<NetworkProxy> = SharedPreference(
+    get = fun(): NetworkProxy {
+      val value = _networkProxy.get() ?: return NetworkProxy()
+      return try {
+        if (value.startsWith("{")) {
+          json.decodeFromString(value)
+        } else {
+          NetworkProxy(host = value.substringBefore(":").ifBlank { "localhost" }, port = value.substringAfter(":").toIntOrNull() ?: 9050)
+        }
+      } catch (e: Throwable) {
+        NetworkProxy()
+      }
+    },
+    set = fun(proxy: NetworkProxy) { _networkProxy.set(json.encodeToString(proxy)) }
+  )
   private val _networkSessionMode = mkStrPreference(SHARED_PREFS_NETWORK_SESSION_MODE, TransportSessionMode.default.name)
   val networkSessionMode: SharedPreference<TransportSessionMode> = SharedPreference(
     get = fun(): TransportSessionMode {
@@ -531,7 +546,7 @@ object ChatController {
   suspend fun startChatWithTemporaryDatabase(ctrl: ChatCtrl, netCfg: NetCfg): User? {
     Log.d(TAG, "startChatWithTemporaryDatabase")
     val migrationActiveUser = apiGetActiveUser(null, ctrl) ?: apiCreateActiveUser(null, Profile(displayName = "Temp", fullName = ""), ctrl = ctrl)
-    if (!apiSetNetworkConfig(netCfg, ctrl)) {
+    if (!apiSetNetworkConfig(netCfg, ctrl = ctrl)) {
       Log.e(TAG, "Error setting network config, stopping migration")
       return null
     }
@@ -846,15 +861,15 @@ object ChatController {
     return null
   }
 
-  suspend fun apiSendMessages(rh: Long?, type: ChatType, id: Long, live: Boolean = false, ttl: Int? = null, composedMessages: List<ComposedMessage>): List<AChatItem>? {
-    val cmd = CC.ApiSendMessages(type, id, live, ttl, composedMessages)
+  suspend fun apiSendMessage(rh: Long?, type: ChatType, id: Long, file: CryptoFile? = null, quotedItemId: Long? = null, mc: MsgContent, live: Boolean = false, ttl: Int? = null): AChatItem? {
+    val cmd = CC.ApiSendMessage(type, id, file, quotedItemId, mc, live, ttl)
     return processSendMessageCmd(rh, cmd)
   }
 
-  private suspend fun processSendMessageCmd(rh: Long?, cmd: CC): List<AChatItem>? {
+  private suspend fun processSendMessageCmd(rh: Long?, cmd: CC): AChatItem? {
     val r = sendCmd(rh, cmd)
     return when (r) {
-      is CR.NewChatItems -> r.chatItems
+      is CR.NewChatItem -> r.chatItem
       else -> {
         if (!(networkErrorAlert(r))) {
           apiErrorAlert("processSendMessageCmd", generalGetString(MR.strings.error_sending_message), r)
@@ -863,13 +878,13 @@ object ChatController {
       }
     }
   }
-   suspend fun apiCreateChatItems(rh: Long?, noteFolderId: Long, composedMessages: List<ComposedMessage>): List<AChatItem>? {
-    val cmd = CC.ApiCreateChatItems(noteFolderId, composedMessages)
+   suspend fun apiCreateChatItem(rh: Long?, noteFolderId: Long, file: CryptoFile? = null, mc: MsgContent): AChatItem? {
+    val cmd = CC.ApiCreateChatItem(noteFolderId, file, mc)
     val r = sendCmd(rh, cmd)
     return when (r) {
-      is CR.NewChatItems -> r.chatItems
+      is CR.NewChatItem -> r.chatItem
       else -> {
-        apiErrorAlert("apiCreateChatItems", generalGetString(MR.strings.error_creating_message), r)
+        apiErrorAlert("apiCreateChatItem", generalGetString(MR.strings.error_creating_message), r)
         null
       }
     }
@@ -885,9 +900,9 @@ object ChatController {
     }
   }
 
-  suspend fun apiForwardChatItems(rh: Long?, toChatType: ChatType, toChatId: Long, fromChatType: ChatType, fromChatId: Long, itemIds: List<Long>, ttl: Int?): List<ChatItem>? {
-    val cmd = CC.ApiForwardChatItems(toChatType, toChatId, fromChatType, fromChatId, itemIds, ttl)
-    return processSendMessageCmd(rh, cmd)?.map { it.chatItem }
+  suspend fun apiForwardChatItem(rh: Long?, toChatType: ChatType, toChatId: Long, fromChatType: ChatType, fromChatId: Long, itemId: Long, ttl: Int?): ChatItem? {
+    val cmd = CC.ApiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId, ttl)
+    return processSendMessageCmd(rh, cmd)?.chatItem
   }
 
 
@@ -976,16 +991,18 @@ object ChatController {
     throw Exception("failed to set chat item TTL: ${r.responseType} ${r.details}")
   }
 
-  suspend fun apiSetNetworkConfig(cfg: NetCfg, ctrl: ChatCtrl? = null): Boolean {
+  suspend fun apiSetNetworkConfig(cfg: NetCfg, showAlertOnError: Boolean = true, ctrl: ChatCtrl? = null): Boolean {
     val r = sendCmd(null, CC.APISetNetworkConfig(cfg), ctrl)
     return when (r) {
       is CR.CmdOk -> true
       else -> {
         Log.e(TAG, "apiSetNetworkConfig bad response: ${r.responseType} ${r.details}")
-        AlertManager.shared.showAlertMsg(
-          generalGetString(MR.strings.error_setting_network_config),
-          "${r.responseType}: ${r.details}"
-        )
+        if (showAlertOnError) {
+          AlertManager.shared.showAlertMsg(
+            generalGetString(MR.strings.error_setting_network_config),
+            "${r.responseType}: ${r.details}"
+          )
+        }
         false
       }
     }
@@ -1132,30 +1149,9 @@ object ChatController {
 
   suspend fun apiSetConnectionIncognito(rh: Long?, connId: Long, incognito: Boolean): PendingContactConnection? {
     val r = sendCmd(rh, CC.ApiSetConnectionIncognito(connId, incognito))
-
-    return when (r) {
-      is CR.ConnectionIncognitoUpdated -> r.toConnection
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiSetConnectionIncognito", generalGetString(MR.strings.error_sending_message), r)
-        }
-        null
-      }
-    }
-  }
-
-  suspend fun apiChangeConnectionUser(rh: Long?, connId: Long, userId: Long): PendingContactConnection? {
-    val r = sendCmd(rh, CC.ApiChangeConnectionUser(connId, userId))
-
-    return when (r) {
-      is CR.ConnectionUserChanged -> r.toConnection
-      else -> {
-        if (!(networkErrorAlert(r))) {
-          apiErrorAlert("apiChangeConnectionUser", generalGetString(MR.strings.error_sending_message), r)
-        }
-        null
-      }
-    }
+    if (r is CR.ConnectionIncognitoUpdated) return r.toConnection
+    Log.e(TAG, "apiSetConnectionIncognito bad response: ${r.responseType} ${r.details}")
+    return null
   }
 
   suspend fun apiConnectPlan(rh: Long?, connReq: String): ConnectionPlan? {
@@ -2153,30 +2149,27 @@ object ChatController {
           chatModel.networkStatuses[s.agentConnId] = s.networkStatus
         }
       }
-      is CR.NewChatItems -> withBGApi {
-        r.chatItems.forEach { chatItem ->
-          val cInfo = chatItem.chatInfo
-          val cItem = chatItem.chatItem
-          if (active(r.user)) {
-            withChats {
-              addChatItem(rhId, cInfo, cItem)
-            }
-          } else if (cItem.isRcvNew && cInfo.ntfsEnabled) {
-            chatModel.increaseUnreadCounter(rhId, r.user)
+      is CR.NewChatItem -> withBGApi {
+        val cInfo = r.chatItem.chatInfo
+        val cItem = r.chatItem.chatItem
+        if (active(r.user)) {
+          withChats {
+            addChatItem(rhId, cInfo, cItem)
           }
-          val file = cItem.file
-          val mc = cItem.content.msgContent
-          if (file != null &&
+        } else if (cItem.isRcvNew && cInfo.ntfsEnabled) {
+          chatModel.increaseUnreadCounter(rhId, r.user)
+        }
+        val file = cItem.file
+        val mc = cItem.content.msgContent
+        if (file != null &&
             appPrefs.privacyAcceptImages.get() &&
             ((mc is MsgContent.MCImage && file.fileSize <= MAX_IMAGE_SIZE_AUTO_RCV)
                 || (mc is MsgContent.MCVideo && file.fileSize <= MAX_VIDEO_SIZE_AUTO_RCV)
-                || (mc is MsgContent.MCVoice && file.fileSize <= MAX_VOICE_SIZE_AUTO_RCV && file.fileStatus !is CIFileStatus.RcvAccepted))
-          ) {
-            receiveFile(rhId, r.user, file.fileId, auto = true)
-          }
-          if (cItem.showNotification && (allowedToShowNotification() || chatModel.chatId.value != cInfo.id || chatModel.remoteHostId() != rhId)) {
-            ntfManager.notifyMessageReceived(r.user, cInfo, cItem)
-          }
+                || (mc is MsgContent.MCVoice && file.fileSize <= MAX_VOICE_SIZE_AUTO_RCV && file.fileStatus !is CIFileStatus.RcvAccepted))) {
+          receiveFile(rhId, r.user, file.fileId, auto = true)
+        }
+        if (cItem.showNotification && (allowedToShowNotification() || chatModel.chatId.value != cInfo.id || chatModel.remoteHostId() != rhId)) {
+          ntfManager.notifyMessageReceived(r.user, cInfo, cItem)
         }
       }
       is CR.ChatItemStatusUpdated -> {
@@ -2769,13 +2762,9 @@ object ChatController {
 
   fun getNetCfg(): NetCfg {
     val useSocksProxy = appPrefs.networkUseSocksProxy.get()
-    val proxyHostPort  = appPrefs.networkProxyHostPort.get()
+    val networkProxy  = appPrefs.networkProxy.get()
     val socksProxy = if (useSocksProxy) {
-      if (proxyHostPort?.startsWith("localhost:") == true) {
-        proxyHostPort.removePrefix("localhost")
-      } else {
-        proxyHostPort ?: ":9050"
-      }
+      networkProxy.toProxyString()
     } else {
       null
     }
@@ -2817,7 +2806,7 @@ object ChatController {
   }
 
   /**
-   * [AppPreferences.networkProxyHostPort] is not changed here, use appPrefs to set it
+   * [AppPreferences.networkProxy] is not changed here, use appPrefs to set it
    * */
   fun setNetCfg(cfg: NetCfg) {
     appPrefs.networkUseSocksProxy.set(cfg.useSocksProxy)
@@ -2887,13 +2876,13 @@ sealed class CC {
   class ApiGetChats(val userId: Long): CC()
   class ApiGetChat(val type: ChatType, val id: Long, val pagination: ChatPagination, val search: String = ""): CC()
   class ApiGetChatItemInfo(val type: ChatType, val id: Long, val itemId: Long): CC()
-  class ApiSendMessages(val type: ChatType, val id: Long, val live: Boolean, val ttl: Int?, val composedMessages: List<ComposedMessage>): CC()
-  class ApiCreateChatItems(val noteFolderId: Long, val composedMessages: List<ComposedMessage>): CC()
+  class ApiSendMessage(val type: ChatType, val id: Long, val file: CryptoFile?, val quotedItemId: Long?, val mc: MsgContent, val live: Boolean, val ttl: Int?): CC()
+  class ApiCreateChatItem(val noteFolderId: Long, val file: CryptoFile?, val mc: MsgContent): CC()
   class ApiUpdateChatItem(val type: ChatType, val id: Long, val itemId: Long, val mc: MsgContent, val live: Boolean): CC()
   class ApiDeleteChatItem(val type: ChatType, val id: Long, val itemIds: List<Long>, val mode: CIDeleteMode): CC()
   class ApiDeleteMemberChatItem(val groupId: Long, val itemIds: List<Long>): CC()
   class ApiChatItemReaction(val type: ChatType, val id: Long, val itemId: Long, val add: Boolean, val reaction: MsgReaction): CC()
-  class ApiForwardChatItems(val toChatType: ChatType, val toChatId: Long, val fromChatType: ChatType, val fromChatId: Long, val itemIds: List<Long>, val ttl: Int?): CC()
+  class ApiForwardChatItem(val toChatType: ChatType, val toChatId: Long, val fromChatType: ChatType, val fromChatId: Long, val itemId: Long, val ttl: Int?): CC()
   class ApiNewGroup(val userId: Long, val incognito: Boolean, val groupProfile: GroupProfile): CC()
   class ApiAddMember(val groupId: Long, val contactId: Long, val memberRole: GroupMemberRole): CC()
   class ApiJoinGroup(val groupId: Long): CC()
@@ -2937,7 +2926,6 @@ sealed class CC {
   class APIVerifyGroupMember(val groupId: Long, val groupMemberId: Long, val connectionCode: String?): CC()
   class APIAddContact(val userId: Long, val incognito: Boolean): CC()
   class ApiSetConnectionIncognito(val connId: Long, val incognito: Boolean): CC()
-  class ApiChangeConnectionUser(val connId: Long, val userId: Long): CC()
   class APIConnectPlan(val userId: Long, val connReq: String): CC()
   class APIConnect(val userId: Long, val incognito: Boolean, val connReq: String): CC()
   class ApiConnectContactViaAddress(val userId: Long, val incognito: Boolean, val contactId: Long): CC()
@@ -3033,22 +3021,20 @@ sealed class CC {
     is ApiGetChats -> "/_get chats $userId pcc=on"
     is ApiGetChat -> "/_get chat ${chatRef(type, id)} ${pagination.cmdString}" + (if (search == "") "" else " search=$search")
     is ApiGetChatItemInfo -> "/_get item info ${chatRef(type, id)} $itemId"
-    is ApiSendMessages -> {
-      val msgs = json.encodeToString(composedMessages)
+    is ApiSendMessage -> {
       val ttlStr = if (ttl != null) "$ttl" else "default"
-      "/_send ${chatRef(type, id)} live=${onOff(live)} ttl=${ttlStr} json $msgs"
+      "/_send ${chatRef(type, id)} live=${onOff(live)} ttl=${ttlStr} json ${json.encodeToString(ComposedMessage(file, quotedItemId, mc))}"
     }
-    is ApiCreateChatItems -> {
-      val msgs = json.encodeToString(composedMessages)
-      "/_create *$noteFolderId json $msgs"
+    is ApiCreateChatItem -> {
+      "/_create *$noteFolderId json ${json.encodeToString(ComposedMessage(file, null, mc))}"
     }
     is ApiUpdateChatItem -> "/_update item ${chatRef(type, id)} $itemId live=${onOff(live)} ${mc.cmdString}"
     is ApiDeleteChatItem -> "/_delete item ${chatRef(type, id)} ${itemIds.joinToString(",")} ${mode.deleteMode}"
     is ApiDeleteMemberChatItem -> "/_delete member item #$groupId ${itemIds.joinToString(",")}"
     is ApiChatItemReaction -> "/_reaction ${chatRef(type, id)} $itemId ${onOff(add)} ${json.encodeToString(reaction)}"
-    is ApiForwardChatItems -> {
+    is ApiForwardChatItem -> {
       val ttlStr = if (ttl != null) "$ttl" else "default"
-      "/_forward ${chatRef(toChatType, toChatId)} ${chatRef(fromChatType, fromChatId)} ${itemIds.joinToString(",")} ttl=${ttlStr}"
+      "/_forward ${chatRef(toChatType, toChatId)} ${chatRef(fromChatType, fromChatId)} $itemId ttl=${ttlStr}"
     }
     is ApiNewGroup -> "/_group $userId incognito=${onOff(incognito)} ${json.encodeToString(groupProfile)}"
     is ApiAddMember -> "/_add #$groupId $contactId ${memberRole.memberRole}"
@@ -3093,7 +3079,6 @@ sealed class CC {
     is APIVerifyGroupMember -> "/_verify code #$groupId $groupMemberId" + if (connectionCode != null) " $connectionCode" else ""
     is APIAddContact -> "/_connect $userId incognito=${onOff(incognito)}"
     is ApiSetConnectionIncognito -> "/_set incognito :$connId ${onOff(incognito)}"
-    is ApiChangeConnectionUser -> "/_set conn user :$connId $userId"
     is APIConnectPlan -> "/_connect plan $userId $connReq"
     is APIConnect -> "/_connect $userId incognito=${onOff(incognito)} $connReq"
     is ApiConnectContactViaAddress -> "/_connect contact $userId incognito=${onOff(incognito)} $contactId"
@@ -3186,13 +3171,13 @@ sealed class CC {
     is ApiGetChats -> "apiGetChats"
     is ApiGetChat -> "apiGetChat"
     is ApiGetChatItemInfo -> "apiGetChatItemInfo"
-    is ApiSendMessages -> "apiSendMessages"
-    is ApiCreateChatItems -> "apiCreateChatItems"
+    is ApiSendMessage -> "apiSendMessage"
+    is ApiCreateChatItem -> "apiCreateChatItem"
     is ApiUpdateChatItem -> "apiUpdateChatItem"
     is ApiDeleteChatItem -> "apiDeleteChatItem"
     is ApiDeleteMemberChatItem -> "apiDeleteMemberChatItem"
     is ApiChatItemReaction -> "apiChatItemReaction"
-    is ApiForwardChatItems -> "apiForwardChatItems"
+    is ApiForwardChatItem -> "apiForwardChatItem"
     is ApiNewGroup -> "apiNewGroup"
     is ApiAddMember -> "apiAddMember"
     is ApiJoinGroup -> "apiJoinGroup"
@@ -3236,7 +3221,6 @@ sealed class CC {
     is APIVerifyGroupMember -> "apiVerifyGroupMember"
     is APIAddContact -> "apiAddContact"
     is ApiSetConnectionIncognito -> "apiSetConnectionIncognito"
-    is ApiChangeConnectionUser -> "apiChangeConnectionUser"
     is APIConnectPlan -> "apiConnectPlan"
     is APIConnect -> "apiConnect"
     is ApiConnectContactViaAddress -> "apiConnectContactViaAddress"
@@ -3558,13 +3542,8 @@ data class NetCfg(
   val useSocksProxy: Boolean get() = socksProxy != null
   val enableKeepAlive: Boolean get() = tcpKeepAlive != null
 
-  fun withHostPort(hostPort: String?, default: String? = ":9050"): NetCfg {
-    val socksProxy = if (hostPort?.startsWith("localhost:") == true) {
-      hostPort.removePrefix("localhost")
-    } else {
-      hostPort ?: default
-    }
-    return copy(socksProxy = socksProxy)
+  fun withProxy(proxy: NetworkProxy?, default: String? = ":9050"): NetCfg {
+    return copy(socksProxy = proxy?.toProxyString() ?: default)
   }
 
   companion object {
@@ -3606,6 +3585,39 @@ data class NetCfg(
   }
 }
 
+@Serializable
+data class NetworkProxy(
+  val username: String = "",
+  val password: String = "",
+  val auth: NetworkProxyAuth = NetworkProxyAuth.ISOLATE,
+  val host: String = "localhost",
+  val port: Int = 9050
+) {
+  fun toProxyString(): String {
+    var res = ""
+    if (auth == NetworkProxyAuth.USERNAME && (username.isNotBlank() || password.isNotBlank())) {
+      res += username.trim() + ":" + password.trim() + "@"
+    } else if (auth == NetworkProxyAuth.USERNAME) {
+      res += "@"
+    }
+    if (host != "localhost") {
+      res += if (host.contains(':')) "[${host.trim(' ', '[', ']')}]" else host.trim()
+    }
+    if (port != 9050 || res.isEmpty()) {
+      res += ":$port"
+    }
+    return res
+  }
+}
+
+@Serializable
+enum class NetworkProxyAuth {
+  @SerialName("isolate")
+  ISOLATE,
+  @SerialName("username")
+  USERNAME,
+}
+
 enum class OnionHosts {
   NEVER, PREFER, REQUIRED
 }
@@ -4781,7 +4793,6 @@ sealed class CR {
   @Serializable @SerialName("connectionVerified") class ConnectionVerified(val user: UserRef, val verified: Boolean, val expectedCode: String): 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("connectionUserChanged") class ConnectionUserChanged(val user: UserRef, val fromConnection: PendingContactConnection, val toConnection: PendingContactConnection, val newUser: UserRef): 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()
@@ -4820,7 +4831,7 @@ sealed class CR {
   @Serializable @SerialName("memberSubErrors") class MemberSubErrors(val user: UserRef, val memberSubErrors: List<MemberSubError>): CR()
   @Serializable @SerialName("groupEmpty") class GroupEmpty(val user: UserRef, val group: GroupInfo): CR()
   @Serializable @SerialName("userContactLinkSubscribed") class UserContactLinkSubscribed: CR()
-  @Serializable @SerialName("newChatItems") class NewChatItems(val user: UserRef, val chatItems: List<AChatItem>): CR()
+  @Serializable @SerialName("newChatItem") class NewChatItem(val user: UserRef, val chatItem: AChatItem): CR()
   @Serializable @SerialName("chatItemStatusUpdated") class ChatItemStatusUpdated(val user: UserRef, val chatItem: AChatItem): CR()
   @Serializable @SerialName("chatItemUpdated") class ChatItemUpdated(val user: UserRef, val chatItem: AChatItem): CR()
   @Serializable @SerialName("chatItemNotChanged") class ChatItemNotChanged(val user: UserRef, val chatItem: AChatItem): CR()
@@ -4960,7 +4971,6 @@ sealed class CR {
     is ConnectionVerified -> "connectionVerified"
     is Invitation -> "invitation"
     is ConnectionIncognitoUpdated -> "connectionIncognitoUpdated"
-    is ConnectionUserChanged -> "ConnectionUserChanged"
     is CRConnectionPlan -> "connectionPlan"
     is SentConfirmation -> "sentConfirmation"
     is SentInvitation -> "sentInvitation"
@@ -4997,7 +5007,7 @@ sealed class CR {
     is MemberSubErrors -> "memberSubErrors"
     is GroupEmpty -> "groupEmpty"
     is UserContactLinkSubscribed -> "userContactLinkSubscribed"
-    is NewChatItems -> "newChatItems"
+    is NewChatItem -> "newChatItem"
     is ChatItemStatusUpdated -> "chatItemStatusUpdated"
     is ChatItemUpdated -> "chatItemUpdated"
     is ChatItemNotChanged -> "chatItemNotChanged"
@@ -5129,7 +5139,6 @@ sealed class CR {
     is ConnectionVerified -> withUser(user, "verified: $verified\nconnectionCode: $expectedCode")
     is Invitation -> withUser(user, "connReqInvitation: $connReqInvitation\nconnection: $connection")
     is ConnectionIncognitoUpdated -> withUser(user, json.encodeToString(toConnection))
-    is ConnectionUserChanged -> withUser(user, "fromConnection: ${json.encodeToString(fromConnection)}\ntoConnection: ${json.encodeToString(toConnection)}\nnewUser: ${json.encodeToString(newUser)}" )
     is CRConnectionPlan -> withUser(user, json.encodeToString(connectionPlan))
     is SentConfirmation -> withUser(user, json.encodeToString(connection))
     is SentInvitation -> withUser(user, json.encodeToString(connection))
@@ -5166,7 +5175,7 @@ sealed class CR {
     is MemberSubErrors -> withUser(user, json.encodeToString(memberSubErrors))
     is GroupEmpty -> withUser(user, json.encodeToString(group))
     is UserContactLinkSubscribed -> noDetails()
-    is NewChatItems -> withUser(user, chatItems.joinToString("\n") { json.encodeToString(it) })
+    is NewChatItem -> withUser(user, json.encodeToString(chatItem))
     is ChatItemStatusUpdated -> withUser(user, json.encodeToString(chatItem))
     is ChatItemUpdated -> withUser(user, json.encodeToString(chatItem))
     is ChatItemNotChanged -> withUser(user, json.encodeToString(chatItem))
@@ -5348,6 +5357,7 @@ abstract class TerminalItem {
   val date: Instant = Clock.System.now()
   abstract val label: String
   abstract val details: String
+  val createdAtNanos: Long = System.nanoTime()
 
   class Cmd(override val id: Long, override val remoteHostId: Long?, val cmd: CC): TerminalItem() {
     override val label get() = "> ${cmd.cmdString}"
@@ -5580,7 +5590,6 @@ sealed class ChatErrorType {
       is AgentCommandError -> "agentCommandError"
       is InvalidFileDescription -> "invalidFileDescription"
       is ConnectionIncognitoChangeProhibited -> "connectionIncognitoChangeProhibited"
-      is ConnectionUserChangeProhibited -> "connectionUserChangeProhibited"
       is PeerChatVRangeIncompatible -> "peerChatVRangeIncompatible"
       is InternalError -> "internalError"
       is CEException -> "exception $message"
@@ -5658,7 +5667,6 @@ sealed class ChatErrorType {
   @Serializable @SerialName("agentCommandError") class AgentCommandError(val message: String): ChatErrorType()
   @Serializable @SerialName("invalidFileDescription") class InvalidFileDescription(val message: String): ChatErrorType()
   @Serializable @SerialName("connectionIncognitoChangeProhibited") object ConnectionIncognitoChangeProhibited: ChatErrorType()
-  @Serializable @SerialName("connectionUserChangeProhibited") object ConnectionUserChangeProhibited: ChatErrorType()
   @Serializable @SerialName("peerChatVRangeIncompatible") object PeerChatVRangeIncompatible: ChatErrorType()
   @Serializable @SerialName("internalError") class InternalError(val message: String): ChatErrorType()
   @Serializable @SerialName("exception") class CEException(val message: String): ChatErrorType()
@@ -6172,6 +6180,7 @@ enum class NotificationsMode() {
 @Serializable
 data class AppSettings(
   var networkConfig: NetCfg? = null,
+  var networkProxy: NetworkProxy? = null,
   var privacyEncryptLocalFiles: Boolean? = null,
   var privacyAskToApproveRelays: Boolean? = null,
   var privacyAcceptImages: Boolean? = null,
@@ -6203,6 +6212,7 @@ data class AppSettings(
     val empty = AppSettings()
     val def = defaults
     if (networkConfig != def.networkConfig) { empty.networkConfig = networkConfig }
+    if (networkProxy != def.networkProxy) { empty.networkProxy = networkProxy }
     if (privacyEncryptLocalFiles != def.privacyEncryptLocalFiles) { empty.privacyEncryptLocalFiles = privacyEncryptLocalFiles }
     if (privacyAskToApproveRelays != def.privacyAskToApproveRelays) { empty.privacyAskToApproveRelays = privacyAskToApproveRelays }
     if (privacyAcceptImages != def.privacyAcceptImages) { empty.privacyAcceptImages = privacyAcceptImages }
@@ -6240,8 +6250,12 @@ data class AppSettings(
       if (net.hostMode == HostMode.Onion) {
         net = net.copy(hostMode = HostMode.Public, requiredHostMode = true)
       }
+      if (net.socksProxy != null) {
+        net = net.copy(socksProxy = networkProxy?.toProxyString())
+      }
       setNetCfg(net)
     }
+    networkProxy?.let { def.networkProxy.set(it) }
     privacyEncryptLocalFiles?.let { def.privacyEncryptLocalFiles.set(it) }
     privacyAskToApproveRelays?.let { def.privacyAskToApproveRelays.set(it) }
     privacyAcceptImages?.let { def.privacyAcceptImages.set(it) }
@@ -6274,6 +6288,7 @@ data class AppSettings(
     val defaults: AppSettings
       get() = AppSettings(
         networkConfig = NetCfg.defaults,
+        networkProxy = null,
         privacyEncryptLocalFiles = true,
         privacyAskToApproveRelays = true,
         privacyAcceptImages = true,
@@ -6307,6 +6322,7 @@ data class AppSettings(
         val def = appPreferences
         return defaults.copy(
           networkConfig = getNetCfg(),
+          networkProxy = def.networkProxy.get(),
           privacyEncryptLocalFiles = def.privacyEncryptLocalFiles.get(),
           privacyAskToApproveRelays = def.privacyAskToApproveRelays.get(),
           privacyAcceptImages = def.privacyAcceptImages.get(),

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt

@@ -132,7 +132,7 @@ fun TerminalLog() {
   }
   val clipboard = LocalClipboardManager.current
   LazyColumnWithScrollBar(reverseLayout = true) {
-    items(reversedTerminalItems) { item ->
+    items(reversedTerminalItems, key = { item -> item.id to item.createdAtNanos }) { item ->
       val rhId = item.remoteHostId
       val rhIdStr = if (rhId == null) "" else "$rhId "
       Text(

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallManager.kt

@@ -47,6 +47,7 @@ class CallManager(val chatModel: ChatModel) {
         remoteHostId = invitation.remoteHostId,
         userProfile = userProfile,
         contact = invitation.contact,
+        callUUID = invitation.callUUID,
         callState = CallState.InvitationAccepted,
         localMedia = invitation.callType.media,
         sharedKey = invitation.sharedKey,

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/IncomingCallAlertView.kt

@@ -115,6 +115,7 @@ fun PreviewIncomingCallAlertLayout() {
         contact = Contact.sampleData,
         callType = CallType(media = CallMediaType.Audio, capabilities = CallCapabilities(encryption = false)),
         sharedKey = null,
+        callUUID = "",
         callTs = Clock.System.now()
       ),
       chatModel = ChatModel,

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/WebRTC.kt

@@ -13,6 +13,7 @@ data class Call(
   val remoteHostId: Long?,
   val userProfile: Profile,
   val contact: Contact,
+  val callUUID: String?,
   val callState: CallState,
   val localMedia: CallMediaType,
   val localCapabilities: CallCapabilities? = null,
@@ -105,6 +106,7 @@ sealed class WCallResponse {
   val contact: Contact,
   val callType: CallType,
   val sharedKey: String? = null,
+  val callUUID: String,
   val callTs: Instant
 ) {
   val callTypeText: String get() = generalGetString(when(callType.media) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt

@@ -86,6 +86,7 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
           .collect { chatId ->
             markUnreadChatAsRead(chatId)
             showSearch.value = false
+            searchText.value = ""
             selectedChatItems.value = null
           }
       }
@@ -104,6 +105,7 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
       is ChatInfo.Direct, is ChatInfo.Group, is ChatInfo.Local -> {
         val perChatTheme = remember(chatInfo, CurrentColors.value.base) { if (chatInfo is ChatInfo.Direct) chatInfo.contact.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight) else if (chatInfo is ChatInfo.Group) chatInfo.groupInfo.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight) else null }
         val overrides = if (perChatTheme != null) ThemeManager.currentColors(null, perChatTheme, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get()) else null
+        val fullDeleteAllowed = remember(chatInfo) { chatInfo.featureEnabled(ChatFeature.FullDelete) }
         SimpleXThemeOverride(overrides ?: CurrentColors.collectAsState().value) {
           ChatLayout(
             remoteHostId = remoteHostId,
@@ -141,10 +143,15 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
                   chatInfo = chatInfo,
                   deleteItems = { canDeleteForAll ->
                     val itemIds = selectedChatItems.value
+                    val questionText =
+                      if (!canDeleteForAll || fullDeleteAllowed || chatInfo is ChatInfo.Local)
+                        generalGetString(MR.strings.delete_messages_cannot_be_undone_warning)
+                      else
+                        generalGetString(MR.strings.delete_messages_mark_deleted_warning)
                     if (itemIds != null) {
                       deleteMessagesAlertDialog(
                         itemIds.sorted(),
-                        generalGetString(if (itemIds.size == 1) MR.strings.delete_message_mark_deleted_warning else MR.strings.delete_messages_mark_deleted_warning),
+                        questionText = questionText,
                         forAll = canDeleteForAll,
                         deleteMessages = { ids, forAll ->
                           deleteMessages(chatRh, chatInfo, ids, forAll, moderate = false) {
@@ -544,7 +551,7 @@ fun startChatCall(remoteHostId: Long?, chatInfo: ChatInfo, media: CallMediaType)
     if (chatInfo is ChatInfo.Direct) {
       val contactInfo = chatModel.controller.apiContactInfo(remoteHostId, chatInfo.contact.contactId)
       val profile = contactInfo?.second ?: chatModel.currentUser.value?.profile?.toProfile() ?: return@withBGApi
-      chatModel.activeCall.value = Call(remoteHostId = remoteHostId, contact = chatInfo.contact, callState = CallState.WaitCapabilities, localMedia = media, userProfile = profile)
+      chatModel.activeCall.value = Call(remoteHostId = remoteHostId, contact = chatInfo.contact, callUUID = null, callState = CallState.WaitCapabilities, localMedia = media, userProfile = profile)
       chatModel.showCallView.value = true
       chatModel.callCommand.add(WCallCommand.Capabilities(media))
     }
@@ -997,7 +1004,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
     }
   )
   LazyColumnWithScrollBar(Modifier.align(Alignment.BottomCenter), state = listState, reverseLayout = true) {
-    itemsIndexed(reversedChatItems, key = { _, item -> item.id }) { i, cItem ->
+    itemsIndexed(reversedChatItems, key = { _, item -> item.id to item.meta.createdAt.toEpochMilliseconds() }) { i, cItem ->
       CompositionLocalProvider(
         // Makes horizontal and vertical scrolling to coexist nicely.
         // With default touchSlop when you scroll LazyColumn, you can unintentionally open reply view

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt

@@ -380,28 +380,24 @@ fun ComposeView(
 
   suspend fun send(chat: Chat, mc: MsgContent, quoted: Long?, file: CryptoFile? = null, live: Boolean = false, ttl: Int?): ChatItem? {
     val cInfo = chat.chatInfo
-    val chatItems = if (chat.chatInfo.chatType == ChatType.Local)
-      chatModel.controller.apiCreateChatItems(
-        rh = chat.remoteHostId,
-        noteFolderId = chat.chatInfo.apiId,
-        composedMessages = listOf(ComposedMessage(file, null, mc))
-      )
+    val aChatItem = if (chat.chatInfo.chatType == ChatType.Local)
+      chatModel.controller.apiCreateChatItem(rh = chat.remoteHostId, noteFolderId = chat.chatInfo.apiId, file = file, mc = mc)
     else
-      chatModel.controller.apiSendMessages(
-        rh = chat.remoteHostId,
-        type = cInfo.chatType,
-        id = cInfo.apiId,
-        live = live,
-        ttl = ttl,
-        composedMessages = listOf(ComposedMessage(file, quoted, mc))
-      )
-    if (!chatItems.isNullOrEmpty()) {
-      chatItems.forEach { aChatItem ->
-        withChats {
-          addChatItem(chat.remoteHostId, cInfo, aChatItem.chatItem)
-        }
+      chatModel.controller.apiSendMessage(
+      rh = chat.remoteHostId,
+      type = cInfo.chatType,
+      id = cInfo.apiId,
+      file = file,
+      quotedItemId = quoted,
+      mc = mc,
+      live = live,
+      ttl = ttl
+    )
+    if (aChatItem != null) {
+      withChats {
+        addChatItem(chat.remoteHostId, cInfo, aChatItem.chatItem)
       }
-      return chatItems.first().chatItem
+      return aChatItem.chatItem
     }
     if (file != null) removeFile(file.filePath)
     return null
@@ -418,22 +414,21 @@ fun ComposeView(
     }
 
     suspend fun forwardItem(rhId: Long?, forwardedItem: ChatItem, fromChatInfo: ChatInfo, ttl: Int?): ChatItem? {
-      val chatItems = controller.apiForwardChatItems(
+      val chatItem = controller.apiForwardChatItem(
         rh = rhId,
         toChatType = chat.chatInfo.chatType,
         toChatId = chat.chatInfo.apiId,
         fromChatType = fromChatInfo.chatType,
         fromChatId = fromChatInfo.apiId,
-        itemIds = listOf(forwardedItem.id),
+        itemId = forwardedItem.id,
         ttl = ttl
       )
-      chatItems?.forEach { chatItem ->
+      if (chatItem != null) {
         withChats {
           addChatItem(rhId, chat.chatInfo, chatItem)
         }
       }
-      // TODO batch send: forward multiple messages
-      return chatItems?.firstOrNull()
+      return chatItem
     }
 
     fun checkLinkPreview(): MsgContent {
@@ -524,7 +519,6 @@ fun ComposeView(
         ComposePreview.NoPreview -> msgs.add(MsgContent.MCText(msgText))
         is ComposePreview.CLinkPreview -> msgs.add(checkLinkPreview())
         is ComposePreview.MediaPreview -> {
-          // TODO batch send: batch media previews
           preview.content.forEachIndexed { index, it ->
             val file = when (it) {
               is UploadContent.SimpleImage ->

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt

@@ -40,7 +40,7 @@ import kotlinx.coroutines.launch
 const val SMALL_GROUPS_RCPS_MEM_LIMIT: Int = 20
 
 @Composable
-fun GroupChatInfoView(chatModel: ChatModel, rhId: Long?, chatId: String, groupLink: String?, groupLinkMemberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String, GroupMemberRole>?) -> Unit, close: () -> Unit, onSearchClicked: () -> Unit) {
+fun ModalData.GroupChatInfoView(chatModel: ChatModel, rhId: Long?, chatId: String, groupLink: String?, groupLinkMemberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String, GroupMemberRole>?) -> Unit, close: () -> Unit, onSearchClicked: () -> Unit) {
   BackHandler(onBack = close)
   // TODO derivedStateOf?
   val chat = chatModel.chats.value.firstOrNull { ch -> ch.id == chatId && ch.remoteHostId == rhId }
@@ -249,9 +249,8 @@ fun AddGroupMembersButton(
   )
 }
 
-
 @Composable
-fun GroupChatInfoLayout(
+fun ModalData.GroupChatInfoLayout(
   chat: Chat,
   groupInfo: GroupInfo,
   currentUser: User,
@@ -272,12 +271,12 @@ fun GroupChatInfoLayout(
   close: () -> Unit = { ModalManager.closeAllModalsEverywhere()},
   onSearchClicked: () -> Unit
 ) {
-  val listState = rememberLazyListState()
+  val listState = remember { appBarHandler.listState }
   val scope = rememberCoroutineScope()
   KeyChangeEffect(chat.id) {
     scope.launch { listState.scrollToItem(0) }
   }
-  val searchText = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue()) }
+  val searchText = remember { stateGetOrPut("searchText") { TextFieldValue() } }
   val filteredMembers = remember(members) {
     derivedStateOf {
       val s = searchText.value.text.trim().lowercase()
@@ -674,7 +673,7 @@ private fun SearchRowView(
 @Composable
 fun PreviewGroupChatInfoLayout() {
   SimpleXTheme {
-    GroupChatInfoLayout(
+    ModalData().GroupChatInfoLayout(
       chat = Chat(
         remoteHostId = null,
         chatInfo = ChatInfo.Direct.sampleData,

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt

@@ -135,7 +135,7 @@ fun ChatItemView(
         }
 
         fun deleteMessageQuestionText(): String {
-          return if (!sent || fullDeleteAllowed) {
+          return if (!sent || fullDeleteAllowed || cInfo is ChatInfo.Local) {
             generalGetString(MR.strings.delete_message_cannot_be_undone_warning)
           } else {
             generalGetString(MR.strings.delete_message_mark_deleted_warning)
@@ -637,7 +637,7 @@ fun DeleteItemAction(
             }
             deleteMessagesAlertDialog(
               itemIds,
-              generalGetString(if (itemIds.size == 1) MR.strings.delete_message_mark_deleted_warning else MR.strings.delete_messages_mark_deleted_warning),
+              generalGetString(MR.strings.delete_messages_cannot_be_undone_warning),
               forAll = false,
               deleteMessages = { ids, _ -> deleteMessages(ids) }
             )

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt

@@ -186,7 +186,7 @@ fun ErrorChatListItem() {
 
 suspend fun directChatAction(rhId: Long?, contact: Contact, chatModel: ChatModel) {
   when {
-    contact.activeConn == null && contact.profile.contactLink != null -> askCurrentOrIncognitoProfileConnectContactViaAddress(chatModel, rhId, contact, close = null, openChat = true)
+    contact.activeConn == null && contact.profile.contactLink != null && contact.active -> askCurrentOrIncognitoProfileConnectContactViaAddress(chatModel, rhId, contact, close = null, openChat = true)
     else -> openChat(rhId, ChatInfo.Direct(contact), chatModel)
   }
 }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt

@@ -423,6 +423,7 @@ fun authStopChat(m: ChatModel, progressIndicator: MutableState<Boolean>? = null,
     authenticate(
       generalGetString(MR.strings.auth_stop_chat),
       generalGetString(MR.strings.auth_log_in_using_credential),
+      oneTime = true,
       completed = { laResult ->
         when (laResult) {
           LAResult.Success, is LAResult.Unavailable -> {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatWallpaper.kt

@@ -356,7 +356,8 @@ sealed class WallpaperType {
 private fun drawToBitmap(image: ImageBitmap, imageScale: Float, tint: Color, size: Size, density: Float, layoutDirection: LayoutDirection): ImageBitmap {
   val quality = if (appPlatform.isAndroid) FilterQuality.High else FilterQuality.Low
   val drawScope = CanvasDrawScope()
-  val bitmap = ImageBitmap(size.width.toInt(), size.height.toInt())
+  // Don't allow to make zero size because it crashes the app when reducing a size of a window on desktop
+  val bitmap = ImageBitmap(size.width.toInt().coerceAtLeast(1), size.height.toInt().coerceAtLeast(1))
   val canvas = Canvas(bitmap)
   drawScope.draw(
     density = Density(density),

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/LocalAuthentication.kt

@@ -34,6 +34,7 @@ expect fun authenticate(
   promptSubtitle: String,
   selfDestruct: Boolean = false,
   usingLAMode: LAMode = ChatModel.controller.appPrefs.laMode.get(),
+  oneTime: Boolean,
   completed: (LAResult) -> Unit
 )
 
@@ -41,10 +42,11 @@ fun authenticateWithPasscode(
   promptTitle: String,
   promptSubtitle: String,
   selfDestruct: Boolean,
+  oneTime: Boolean,
   completed: (LAResult) -> Unit
 ) {
   val password = DatabaseUtils.ksAppPassword.get() ?: return completed(LAResult.Unavailable(generalGetString(MR.strings.la_no_app_password)))
-  ModalManager.fullscreen.showPasscodeCustomModal { close ->
+  ModalManager.fullscreen.showPasscodeCustomModal(oneTime) { close ->
     BackHandler {
       close()
       completed(LAResult.Error(generalGetString(MR.strings.authentication_cancelled)))

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt

@@ -69,6 +69,7 @@ class ModalManager(private val placement: ModalPlacement? = null) {
   // Don't use mutableStateOf() here, because it produces this if showing from SimpleXAPI.startChat():
   // java.lang.IllegalStateException: Reading a state that was created after the snapshot was taken or in a snapshot that has not yet been applied
   private var passcodeView: MutableStateFlow<(@Composable (close: () -> Unit) -> Unit)?> = MutableStateFlow(null)
+  private var onTimePasscodeView: MutableStateFlow<(@Composable (close: () -> Unit) -> Unit)?> = MutableStateFlow(null)
 
   fun showModal(settings: Boolean = false, showClose: Boolean = true, closeOnTop: Boolean = true, endButtons: @Composable RowScope.() -> Unit = {}, content: @Composable ModalData.() -> Unit) {
     val data = ModalData()
@@ -105,9 +106,13 @@ class ModalManager(private val placement: ModalPlacement? = null) {
     }
   }
 
-  fun showPasscodeCustomModal(modal: @Composable (close: () -> Unit) -> Unit) {
-    Log.d(TAG, "ModalManager.showPasscodeCustomModal")
-    passcodeView.value = modal
+  fun showPasscodeCustomModal(oneTime: Boolean, modal: @Composable (close: () -> Unit) -> Unit) {
+    Log.d(TAG, "ModalManager.showPasscodeCustomModal, oneTime: $oneTime")
+    if (oneTime) {
+      onTimePasscodeView.value = modal
+    } else {
+      passcodeView.value = modal
+    }
   }
 
   fun hasModalsOpen() = modalCount.value > 0
@@ -179,6 +184,11 @@ class ModalManager(private val placement: ModalPlacement? = null) {
     passcodeView.collectAsState().value?.invoke { passcodeView.value = null }
   }
 
+  @Composable
+  fun showOneTimePasscodeInView() {
+    onTimePasscodeView.collectAsState().value?.invoke { onTimePasscodeView.value = null }
+  }
+
   /**
   * Allows to modify a list without getting [ConcurrentModificationException]
   * */

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/SearchTextField.kt

@@ -71,12 +71,6 @@ fun SearchTextField(
     }
   }
 
-  DisposableEffect(Unit) {
-    onDispose {
-      if (searchText.value.text.isNotEmpty()) onValueChange("")
-    }
-  }
-
   val colors = TextFieldDefaults.textFieldColors(
     backgroundColor = Color.Unspecified,
     textColor = MaterialTheme.colors.onBackground,

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateFromDevice.kt

@@ -4,7 +4,6 @@ import SectionBottomSpacer
 import SectionSpacer
 import SectionTextFooter
 import SectionView
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
@@ -17,6 +16,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatController.getNetCfg
 import chat.simplex.common.model.ChatController.startChat
 import chat.simplex.common.model.ChatController.startChatWithTemporaryDatabase
@@ -38,7 +38,6 @@ import kotlinx.serialization.*
 import java.io.File
 import java.net.URLEncoder
 import kotlin.math.max
-import kotlin.math.sqrt
 
 @Serializable
 data class MigrationFileLinkData(
@@ -46,16 +45,20 @@ data class MigrationFileLinkData(
 ) {
   @Serializable
   data class NetworkConfig(
-    val socksProxy: String?,
+    // Legacy. Remove in 2025
+    @SerialName("socksProxy")
+    val legacySocksProxy: String?,
+    val networkProxy: NetworkProxy?,
     val hostMode: HostMode?,
     val requiredHostMode: Boolean?
   ) {
-    fun hasOnionConfigured(): Boolean = socksProxy != null || hostMode == HostMode.Onion
+    fun hasProxyConfigured(): Boolean = networkProxy != null || legacySocksProxy != null || hostMode == HostMode.Onion
 
     fun transformToPlatformSupported(): NetworkConfig {
       return if (hostMode != null && requiredHostMode != null) {
         NetworkConfig(
-          socksProxy = if (hostMode == HostMode.Onion) socksProxy ?: NetCfg.proxyDefaults.socksProxy else socksProxy,
+          legacySocksProxy = if (hostMode == HostMode.Onion) legacySocksProxy ?: NetCfg.proxyDefaults.socksProxy else legacySocksProxy,
+          networkProxy = if (hostMode == HostMode.Onion) networkProxy ?: NetworkProxy() else networkProxy,
           hostMode = if (hostMode == HostMode.Onion) HostMode.OnionViaSocks else hostMode,
           requiredHostMode = requiredHostMode
         )
@@ -349,7 +352,15 @@ private fun MutableState<MigrationFromState>.LinkShownView(fileId: Long, link: S
       text = stringResource(MR.strings.migrate_from_device_finalize_migration),
       textColor = MaterialTheme.colors.primary,
       click = {
-        finishMigration(fileId, ctrl)
+        AlertManager.shared.showAlertDialog(
+          title = generalGetString(MR.strings.migrate_from_device_remove_archive_question),
+          text = generalGetString(MR.strings.migrate_from_device_uploaded_archive_will_be_removed),
+          confirmText = generalGetString(MR.strings.continue_to_next_step),
+          destructive = true,
+          onConfirm = {
+            finishMigration(fileId, ctrl)
+          }
+        )
       }
     ) {}
     SectionTextFooter(annotatedStringResource(MR.strings.migrate_from_device_archive_will_be_deleted))
@@ -562,7 +573,8 @@ private fun MutableState<MigrationFromState>.startUploading(
           val cfg = getNetCfg()
           val data = MigrationFileLinkData(
             networkConfig = MigrationFileLinkData.NetworkConfig(
-              socksProxy = cfg.socksProxy,
+              legacySocksProxy = null,
+              networkProxy = if (appPrefs.networkUseSocksProxy.get()) appPrefs.networkProxy.get() else null,
               hostMode = cfg.hostMode,
               requiredHostMode = cfg.requiredHostMode
             )

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/migration/MigrateToDevice.kt

@@ -5,16 +5,15 @@ import SectionItemView
 import SectionSpacer
 import SectionTextFooter
 import SectionView
-import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 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.platform.LocalClipboardManager
 import chat.simplex.common.model.*
 import chat.simplex.common.model.AppPreferences.Companion.SHARED_PREFS_MIGRATION_TO_STAGE
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatController.getNetCfg
 import chat.simplex.common.model.ChatController.startChat
 import chat.simplex.common.model.ChatCtrl
@@ -41,10 +40,10 @@ import kotlin.math.max
 
 @Serializable
 sealed class MigrationToDeviceState {
-  @Serializable @SerialName("onion") data class Onion(val link: String, val socksProxy: String?, val hostMode: HostMode, val requiredHostMode: Boolean): MigrationToDeviceState()
-  @Serializable @SerialName("downloadProgress") data class DownloadProgress(val link: String, val archiveName: String, val netCfg: NetCfg): MigrationToDeviceState()
-  @Serializable @SerialName("archiveImport") data class ArchiveImport(val archiveName: String, val netCfg: NetCfg): MigrationToDeviceState()
-  @Serializable @SerialName("passphrase") data class Passphrase(val netCfg: NetCfg): MigrationToDeviceState()
+  @Serializable @SerialName("onion") data class Onion(val link: String, val socksProxy: String?, val networkProxy: NetworkProxy?, val hostMode: HostMode, val requiredHostMode: Boolean): MigrationToDeviceState()
+  @Serializable @SerialName("downloadProgress") data class DownloadProgress(val link: String, val archiveName: String, val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToDeviceState()
+  @Serializable @SerialName("archiveImport") data class ArchiveImport(val archiveName: String, val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToDeviceState()
+  @Serializable @SerialName("passphrase") data class Passphrase(val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToDeviceState()
 
   companion object  {
     // Here we check whether it's needed to show migration process after app restart or not
@@ -66,10 +65,10 @@ sealed class MigrationToDeviceState {
             null
           } else {
             val archivePath = File(getMigrationTempFilesDirectory(), state.archiveName)
-            MigrationToState.ArchiveImportFailed(archivePath.absolutePath, state.netCfg)
+            MigrationToState.ArchiveImportFailed(archivePath.absolutePath, state.netCfg, state.networkProxy)
           }
         }
-        is Passphrase -> MigrationToState.Passphrase("", state.netCfg)
+        is Passphrase -> MigrationToState.Passphrase("", state.netCfg, state.networkProxy)
       }
       if (initial == null) {
         settings.remove(SHARED_PREFS_MIGRATION_TO_STAGE)
@@ -91,16 +90,24 @@ sealed class MigrationToDeviceState {
 @Serializable
 sealed class MigrationToState {
   @Serializable object PasteOrScanLink: MigrationToState()
-  @Serializable data class Onion(val link: String, val socksProxy: String?, val hostMode: HostMode, val requiredHostMode: Boolean): MigrationToState()
-  @Serializable data class DatabaseInit(val link: String, val netCfg: NetCfg): MigrationToState()
-  @Serializable data class LinkDownloading(val link: String, val ctrl: ChatCtrl, val user: User, val archivePath: String, val netCfg: NetCfg): MigrationToState()
-  @Serializable data class DownloadProgress(val downloadedBytes: Long, val totalBytes: Long, val fileId: Long, val link: String, val archivePath: String, val netCfg: NetCfg, val ctrl: ChatCtrl?): MigrationToState()
-  @Serializable data class DownloadFailed(val totalBytes: Long, val link: String, val archivePath: String, val netCfg: NetCfg): MigrationToState()
-  @Serializable data class ArchiveImport(val archivePath: String, val netCfg: NetCfg): MigrationToState()
-  @Serializable data class ArchiveImportFailed(val archivePath: String, val netCfg: NetCfg): MigrationToState()
-  @Serializable data class Passphrase(val passphrase: String, val netCfg: NetCfg): MigrationToState()
-  @Serializable data class MigrationConfirmation(val status: DBMigrationResult, val passphrase: String, val useKeychain: Boolean, val netCfg: NetCfg): MigrationToState()
-  @Serializable data class Migration(val passphrase: String, val confirmation: chat.simplex.common.views.helpers.MigrationConfirmation, val useKeychain: Boolean, val netCfg: NetCfg): MigrationToState()
+  @Serializable data class Onion(
+    val link: String,
+    // Legacy, remove in 2025
+    @SerialName("socksProxy")
+    val legacySocksProxy: String?,
+    val networkProxy: NetworkProxy?,
+    val hostMode: HostMode,
+    val requiredHostMode: Boolean
+  ): MigrationToState()
+  @Serializable data class DatabaseInit(val link: String, val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToState()
+  @Serializable data class LinkDownloading(val link: String, val ctrl: ChatCtrl, val user: User, val archivePath: String, val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToState()
+  @Serializable data class DownloadProgress(val downloadedBytes: Long, val totalBytes: Long, val fileId: Long, val link: String, val archivePath: String, val netCfg: NetCfg, val networkProxy: NetworkProxy?, val ctrl: ChatCtrl?): MigrationToState()
+  @Serializable data class DownloadFailed(val totalBytes: Long, val link: String, val archivePath: String, val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToState()
+  @Serializable data class ArchiveImport(val archivePath: String, val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToState()
+  @Serializable data class ArchiveImportFailed(val archivePath: String, val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToState()
+  @Serializable data class Passphrase(val passphrase: String, val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToState()
+  @Serializable data class MigrationConfirmation(val status: DBMigrationResult, val passphrase: String, val useKeychain: Boolean, val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToState()
+  @Serializable data class Migration(val passphrase: String, val confirmation: chat.simplex.common.views.helpers.MigrationConfirmation, val useKeychain: Boolean, val netCfg: NetCfg, val networkProxy: NetworkProxy?): MigrationToState()
 }
 
 private var MutableState<MigrationToState?>.state: MigrationToState?
@@ -175,16 +182,16 @@ private fun ModalData.SectionByState(
   when (val s = migrationState.value) {
     null -> {}
     is MigrationToState.PasteOrScanLink -> migrationState.PasteOrScanLinkView()
-    is MigrationToState.Onion -> OnionView(s.link, s.socksProxy, s.hostMode, s.requiredHostMode, migrationState)
-    is MigrationToState.DatabaseInit -> migrationState.DatabaseInitView(s.link, tempDatabaseFile, s.netCfg)
-    is MigrationToState.LinkDownloading -> migrationState.LinkDownloadingView(s.link, s.ctrl, s.user, s.archivePath, tempDatabaseFile, chatReceiver, s.netCfg)
+    is MigrationToState.Onion -> OnionView(s.link, s.legacySocksProxy, s.networkProxy, s.hostMode, s.requiredHostMode, migrationState)
+    is MigrationToState.DatabaseInit -> migrationState.DatabaseInitView(s.link, tempDatabaseFile, s.netCfg, s.networkProxy)
+    is MigrationToState.LinkDownloading -> migrationState.LinkDownloadingView(s.link, s.ctrl, s.user, s.archivePath, tempDatabaseFile, chatReceiver, s.netCfg, s.networkProxy)
     is MigrationToState.DownloadProgress -> DownloadProgressView(s.downloadedBytes, totalBytes = s.totalBytes)
-    is MigrationToState.DownloadFailed -> migrationState.DownloadFailedView(s.link, chatReceiver.value, s.archivePath, s.netCfg)
-    is MigrationToState.ArchiveImport -> migrationState.ArchiveImportView(s.archivePath, s.netCfg)
-    is MigrationToState.ArchiveImportFailed -> migrationState.ArchiveImportFailedView(s.archivePath, s.netCfg)
-    is MigrationToState.Passphrase -> migrationState.PassphraseEnteringView(currentKey = s.passphrase, s.netCfg)
-    is MigrationToState.MigrationConfirmation -> migrationState.MigrationConfirmationView(s.status, s.passphrase, s.useKeychain, s.netCfg)
-    is MigrationToState.Migration -> MigrationView(s.passphrase, s.confirmation, s.useKeychain, s.netCfg, close)
+    is MigrationToState.DownloadFailed -> migrationState.DownloadFailedView(s.link, chatReceiver.value, s.archivePath, s.netCfg, s.networkProxy)
+    is MigrationToState.ArchiveImport -> migrationState.ArchiveImportView(s.archivePath, s.netCfg, s.networkProxy)
+    is MigrationToState.ArchiveImportFailed -> migrationState.ArchiveImportFailedView(s.archivePath, s.netCfg, s.networkProxy)
+    is MigrationToState.Passphrase -> migrationState.PassphraseEnteringView(currentKey = s.passphrase, s.netCfg, s.networkProxy)
+    is MigrationToState.MigrationConfirmation -> migrationState.MigrationConfirmationView(s.status, s.passphrase, s.useKeychain, s.netCfg, s.networkProxy)
+    is MigrationToState.Migration -> MigrationView(s.passphrase, s.confirmation, s.useKeychain, s.netCfg, s.networkProxy, close)
   }
 }
 
@@ -199,10 +206,8 @@ private fun MutableState<MigrationToState?>.PasteOrScanLinkView() {
     SectionSpacer()
   }
 
-  if (appPlatform.isDesktop || appPreferences.developerTools.get()) {
-    SectionView(stringResource(if (appPlatform.isAndroid) MR.strings.or_paste_archive_link else MR.strings.paste_archive_link).uppercase()) {
-      PasteLinkView()
-    }
+  SectionView(stringResource(if (appPlatform.isAndroid) MR.strings.or_paste_archive_link else MR.strings.paste_archive_link).uppercase()) {
+    PasteLinkView()
   }
 }
 
@@ -218,21 +223,24 @@ private fun MutableState<MigrationToState?>.PasteLinkView() {
 }
 
 @Composable
-private fun ModalData.OnionView(link: String, socksProxy: String?, hostMode: HostMode, requiredHostMode: Boolean, state: MutableState<MigrationToState?>) {
+private fun ModalData.OnionView(link: String, legacyLinkSocksProxy: String?, linkNetworkProxy: NetworkProxy?, hostMode: HostMode, requiredHostMode: Boolean, state: MutableState<MigrationToState?>) {
   val onionHosts = remember { stateGetOrPut("onionHosts") {
-    getNetCfg().copy(socksProxy = socksProxy, hostMode = hostMode, requiredHostMode = requiredHostMode).onionHosts
+    getNetCfg().copy(socksProxy = linkNetworkProxy?.toProxyString() ?: legacyLinkSocksProxy, hostMode = hostMode, requiredHostMode = requiredHostMode).onionHosts
   } }
-  val networkUseSocksProxy = remember { stateGetOrPut("networkUseSocksProxy") { socksProxy != null } }
+  val networkUseSocksProxy = remember { stateGetOrPut("networkUseSocksProxy") { linkNetworkProxy != null || legacyLinkSocksProxy != null } }
   val sessionMode = remember { stateGetOrPut("sessionMode") { TransportSessionMode.User} }
-  val networkProxyHostPort = remember { stateGetOrPut("networkHostProxyPort") {
-    var proxy = (socksProxy ?: chatModel.controller.appPrefs.networkProxyHostPort.get())
-    if (proxy?.startsWith(":") == true) proxy = "localhost$proxy"
-    proxy
-  }
+  val networkProxy = remember { stateGetOrPut("networkProxy") {
+    linkNetworkProxy
+      ?: if (legacyLinkSocksProxy != null) {
+        NetworkProxy(host = legacyLinkSocksProxy.substringBefore(":").ifBlank { "localhost" }, port = legacyLinkSocksProxy.substringAfter(":").toIntOrNull() ?: 9050)
+      } else {
+        appPrefs.networkProxy.get()
+      }
+    }
   }
 
   val netCfg = rememberSaveable(stateSaver = serializableSaver()) {
-    mutableStateOf(getNetCfg().withOnionHosts(onionHosts.value).copy(socksProxy = socksProxy, sessionMode = sessionMode.value))
+    mutableStateOf(getNetCfg().withOnionHosts(onionHosts.value).copy(socksProxy = linkNetworkProxy?.toProxyString() ?: legacyLinkSocksProxy, sessionMode = sessionMode.value))
   }
 
   SectionView(stringResource(MR.strings.migrate_to_device_confirm_network_settings).uppercase()) {
@@ -243,12 +251,12 @@ private fun ModalData.OnionView(link: String, socksProxy: String?, hostMode: Hos
       click = {
         val updated = netCfg.value
           .withOnionHosts(onionHosts.value)
-          .withHostPort(if (networkUseSocksProxy.value) networkProxyHostPort.value else null, null)
+          .withProxy(if (networkUseSocksProxy.value) networkProxy.value else null, null)
           .copy(
             sessionMode = sessionMode.value
           )
         withBGApi {
-          state.value = MigrationToState.DatabaseInit(link, updated)
+          state.value = MigrationToState.DatabaseInit(link, updated, if (networkUseSocksProxy.value) networkProxy.value else null)
         }
       }
     ){}
@@ -257,8 +265,8 @@ private fun ModalData.OnionView(link: String, socksProxy: String?, hostMode: Hos
 
   SectionSpacer()
 
-  val networkProxyHostPortPref = SharedPreference(get = { networkProxyHostPort.value }, set = {
-    networkProxyHostPort.value = it
+  val networkProxyPref = SharedPreference(get = { networkProxy.value }, set = {
+    networkProxy.value = it
   })
   SectionView(stringResource(MR.strings.network_settings_title).uppercase()) {
     OnionRelatedLayout(
@@ -266,13 +274,10 @@ private fun ModalData.OnionView(link: String, socksProxy: String?, hostMode: Hos
       networkUseSocksProxy,
       onionHosts,
       sessionMode,
-      networkProxyHostPortPref,
+      networkProxyPref,
       toggleSocksProxy = { enable ->
         networkUseSocksProxy.value = enable
       },
-      useOnion = {
-        onionHosts.value = it
-      },
       updateSessionMode = {
         sessionMode.value = it
       }
@@ -281,13 +286,13 @@ private fun ModalData.OnionView(link: String, socksProxy: String?, hostMode: Hos
 }
 
 @Composable
-private fun MutableState<MigrationToState?>.DatabaseInitView(link: String, tempDatabaseFile: File, netCfg: NetCfg) {
+private fun MutableState<MigrationToState?>.DatabaseInitView(link: String, tempDatabaseFile: File, netCfg: NetCfg, networkProxy: NetworkProxy?) {
   Box {
     SectionView(stringResource(MR.strings.migrate_to_device_database_init).uppercase()) {}
     ProgressView()
   }
   LaunchedEffect(Unit) {
-    prepareDatabase(link, tempDatabaseFile, netCfg)
+    prepareDatabase(link, tempDatabaseFile, netCfg, networkProxy)
   }
 }
 
@@ -299,14 +304,15 @@ private fun MutableState<MigrationToState?>.LinkDownloadingView(
   archivePath: String,
   tempDatabaseFile: File,
   chatReceiver: MutableState<MigrationToChatReceiver?>,
-  netCfg: NetCfg
+  netCfg: NetCfg,
+  networkProxy: NetworkProxy?
 ) {
   Box {
     SectionView(stringResource(MR.strings.migrate_to_device_downloading_details).uppercase()) {}
     ProgressView()
   }
   LaunchedEffect(Unit) {
-    startDownloading(0, ctrl, user, tempDatabaseFile, chatReceiver, link, archivePath, netCfg)
+    startDownloading(0, ctrl, user, tempDatabaseFile, chatReceiver, link, archivePath, netCfg, networkProxy)
   }
 }
 
@@ -321,14 +327,14 @@ private fun DownloadProgressView(downloadedBytes: Long, totalBytes: Long) {
 }
 
 @Composable
-private fun MutableState<MigrationToState?>.DownloadFailedView(link: String, chatReceiver: MigrationToChatReceiver?, archivePath: String, netCfg: NetCfg) {
+private fun MutableState<MigrationToState?>.DownloadFailedView(link: String, chatReceiver: MigrationToChatReceiver?, archivePath: String, netCfg: NetCfg, networkProxy: NetworkProxy?) {
   SectionView(stringResource(MR.strings.migrate_to_device_download_failed).uppercase()) {
     SettingsActionItemWithContent(
       icon = painterResource(MR.images.ic_download),
       text = stringResource(MR.strings.migrate_to_device_repeat_download),
       textColor = MaterialTheme.colors.primary,
       click = {
-        state = MigrationToState.DatabaseInit(link, netCfg)
+        state = MigrationToState.DatabaseInit(link, netCfg, networkProxy)
       }
     ) {}
     SectionTextFooter(stringResource(MR.strings.migrate_to_device_try_again))
@@ -341,25 +347,25 @@ private fun MutableState<MigrationToState?>.DownloadFailedView(link: String, cha
 }
 
 @Composable
-private fun MutableState<MigrationToState?>.ArchiveImportView(archivePath: String, netCfg: NetCfg) {
+private fun MutableState<MigrationToState?>.ArchiveImportView(archivePath: String, netCfg: NetCfg, networkProxy: NetworkProxy?) {
   Box {
     SectionView(stringResource(MR.strings.migrate_to_device_importing_archive).uppercase()) {}
     ProgressView()
   }
   LaunchedEffect(Unit) {
-    importArchive(archivePath, netCfg)
+    importArchive(archivePath, netCfg, networkProxy)
   }
 }
 
 @Composable
-private fun MutableState<MigrationToState?>.ArchiveImportFailedView(archivePath: String, netCfg: NetCfg) {
+private fun MutableState<MigrationToState?>.ArchiveImportFailedView(archivePath: String, netCfg: NetCfg, networkProxy: NetworkProxy?) {
   SectionView(stringResource(MR.strings.migrate_to_device_import_failed).uppercase()) {
     SettingsActionItemWithContent(
       icon = painterResource(MR.images.ic_download),
       text = stringResource(MR.strings.migrate_to_device_repeat_import),
       textColor = MaterialTheme.colors.primary,
       click = {
-        state = MigrationToState.ArchiveImport(archivePath, netCfg)
+        state = MigrationToState.ArchiveImport(archivePath, netCfg, networkProxy)
       }
     ) {}
     SectionTextFooter(stringResource(MR.strings.migrate_to_device_try_again))
@@ -367,7 +373,7 @@ private fun MutableState<MigrationToState?>.ArchiveImportFailedView(archivePath:
 }
 
 @Composable
-private fun MutableState<MigrationToState?>.PassphraseEnteringView(currentKey: String, netCfg: NetCfg) {
+private fun MutableState<MigrationToState?>.PassphraseEnteringView(currentKey: String, netCfg: NetCfg, networkProxy: NetworkProxy?) {
   val currentKey = rememberSaveable { mutableStateOf(currentKey) }
   val verifyingPassphrase = rememberSaveable { mutableStateOf(false) }
   val useKeychain = rememberSaveable { mutableStateOf(appPreferences.storeDBPassphrase.get()) }
@@ -397,9 +403,9 @@ private fun MutableState<MigrationToState?>.PassphraseEnteringView(currentKey: S
             val (status, _) = chatInitTemporaryDatabase(dbAbsolutePrefixPath, key = currentKey.value, confirmation = MigrationConfirmation.YesUp)
             val success = status == DBMigrationResult.OK || status == DBMigrationResult.InvalidConfirmation
             if (success) {
-              state = MigrationToState.Migration(currentKey.value, MigrationConfirmation.YesUp, useKeychain.value, netCfg)
+              state = MigrationToState.Migration(currentKey.value, MigrationConfirmation.YesUp, useKeychain.value, netCfg, networkProxy)
             } else if (status is DBMigrationResult.ErrorMigration) {
-              state = MigrationToState.MigrationConfirmation(status, currentKey.value, useKeychain.value, netCfg)
+              state = MigrationToState.MigrationConfirmation(status, currentKey.value, useKeychain.value, netCfg, networkProxy)
             } else {
               showErrorOnMigrationIfNeeded(status)
             }
@@ -416,7 +422,7 @@ private fun MutableState<MigrationToState?>.PassphraseEnteringView(currentKey: S
 }
 
 @Composable
-private fun MutableState<MigrationToState?>.MigrationConfirmationView(status: DBMigrationResult, passphrase: String, useKeychain: Boolean, netCfg: NetCfg) {
+private fun MutableState<MigrationToState?>.MigrationConfirmationView(status: DBMigrationResult, passphrase: String, useKeychain: Boolean, netCfg: NetCfg, networkProxy: NetworkProxy?) {
   data class Tuple4<A,B,C,D>(val a: A, val b: B, val c: C, val d: D)
   val (header: String, button: String?, footer: String, confirmation: MigrationConfirmation?) = when (status) {
     is DBMigrationResult.ErrorMigration -> when (val err = status.migrationError) {
@@ -451,7 +457,7 @@ private fun MutableState<MigrationToState?>.MigrationConfirmationView(status: DB
         text = button,
         textColor = MaterialTheme.colors.primary,
         click = {
-          state = MigrationToState.Migration(passphrase, confirmation, useKeychain, netCfg)
+          state = MigrationToState.Migration(passphrase, confirmation, useKeychain, netCfg, networkProxy)
         }
       ) {}
     }
@@ -460,13 +466,13 @@ private fun MutableState<MigrationToState?>.MigrationConfirmationView(status: DB
 }
 
 @Composable
-private fun MigrationView(passphrase: String, confirmation: MigrationConfirmation, useKeychain: Boolean, netCfg: NetCfg, close: () -> Unit) {
+private fun MigrationView(passphrase: String, confirmation: MigrationConfirmation, useKeychain: Boolean, netCfg: NetCfg, networkProxy: NetworkProxy?, close: () -> Unit) {
   Box {
     SectionView(stringResource(MR.strings.migrate_to_device_migrating).uppercase()) {}
     ProgressView()
   }
   LaunchedEffect(Unit) {
-    startChat(passphrase, confirmation, useKeychain, netCfg, close)
+    startChat(passphrase, confirmation, useKeychain, netCfg, networkProxy, close)
   }
 }
 
@@ -478,19 +484,21 @@ private fun ProgressView() {
 private suspend fun MutableState<MigrationToState?>.checkUserLink(link: String) {
   if (strHasSimplexFileLink(link.trim())) {
     val data = MigrationFileLinkData.readFromLink(link)
-    val hasOnionConfigured = data?.networkConfig?.hasOnionConfigured() ?: false
+    val hasProxyConfigured = data?.networkConfig?.hasProxyConfigured() ?: false
     val networkConfig = data?.networkConfig?.transformToPlatformSupported()
     // If any of iOS or Android had onion enabled, show onion screen
-    if (hasOnionConfigured && networkConfig?.hostMode != null && networkConfig.requiredHostMode != null) {
-      state = MigrationToState.Onion(link.trim(), networkConfig.socksProxy, networkConfig.hostMode, networkConfig.requiredHostMode)
-      MigrationToDeviceState.save(MigrationToDeviceState.Onion(link.trim(), networkConfig.socksProxy, networkConfig.hostMode, networkConfig.requiredHostMode))
+    if (hasProxyConfigured && networkConfig?.hostMode != null && networkConfig.requiredHostMode != null) {
+      state = MigrationToState.Onion(link.trim(), networkConfig.legacySocksProxy, networkConfig.networkProxy, networkConfig.hostMode, networkConfig.requiredHostMode)
+      MigrationToDeviceState.save(MigrationToDeviceState.Onion(link.trim(), networkConfig.legacySocksProxy, networkConfig.networkProxy, networkConfig.hostMode, networkConfig.requiredHostMode))
     } else {
       val current = getNetCfg()
       state = MigrationToState.DatabaseInit(link.trim(), current.copy(
-        socksProxy = networkConfig?.socksProxy,
+        socksProxy = null,
         hostMode = networkConfig?.hostMode ?: current.hostMode,
         requiredHostMode = networkConfig?.requiredHostMode ?: current.requiredHostMode
-      ))
+      ),
+        networkProxy = null
+      )
     }
   } else {
     AlertManager.shared.showAlertMsg(
@@ -504,6 +512,7 @@ private fun MutableState<MigrationToState?>.prepareDatabase(
   link: String,
   tempDatabaseFile: File,
   netCfg: NetCfg,
+  networkProxy: NetworkProxy?
 ) {
   withLongRunningApi {
     val ctrlAndUser = initTemporaryDatabase(tempDatabaseFile, netCfg)
@@ -515,7 +524,7 @@ private fun MutableState<MigrationToState?>.prepareDatabase(
     }
 
     val (ctrl, user) = ctrlAndUser
-    state = MigrationToState.LinkDownloading(link, ctrl, user, archivePath(), netCfg)
+    state = MigrationToState.LinkDownloading(link, ctrl, user, archivePath(), netCfg, networkProxy)
   }
 }
 
@@ -528,13 +537,14 @@ private fun MutableState<MigrationToState?>.startDownloading(
   link: String,
   archivePath: String,
   netCfg: NetCfg,
+  networkProxy: NetworkProxy?
 ) {
   withBGApi {
     chatReceiver.value = MigrationToChatReceiver(ctrl, tempDatabaseFile) { msg ->
         when (msg) {
           is CR.RcvFileProgressXFTP -> {
-            state = MigrationToState.DownloadProgress(msg.receivedSize, msg.totalSize, msg.rcvFileTransfer.fileId, link, archivePath, netCfg, ctrl)
-            MigrationToDeviceState.save(MigrationToDeviceState.DownloadProgress(link, File(archivePath).name, netCfg))
+            state = MigrationToState.DownloadProgress(msg.receivedSize, msg.totalSize, msg.rcvFileTransfer.fileId, link, archivePath, netCfg, networkProxy, ctrl)
+            MigrationToDeviceState.save(MigrationToDeviceState.DownloadProgress(link, File(archivePath).name, netCfg, networkProxy))
           }
           is CR.RcvStandaloneFileComplete -> {
             delay(500)
@@ -542,8 +552,8 @@ private fun MutableState<MigrationToState?>.startDownloading(
             if (state == null) {
               MigrationToDeviceState.save(null)
             } else {
-              state = MigrationToState.ArchiveImport(archivePath, netCfg)
-              MigrationToDeviceState.save(MigrationToDeviceState.ArchiveImport(File(archivePath).name, netCfg))
+              state = MigrationToState.ArchiveImport(archivePath, netCfg, networkProxy)
+              MigrationToDeviceState.save(MigrationToDeviceState.ArchiveImport(File(archivePath).name, netCfg, networkProxy))
             }
           }
           is CR.RcvFileError -> {
@@ -551,7 +561,7 @@ private fun MutableState<MigrationToState?>.startDownloading(
               generalGetString(MR.strings.migrate_to_device_download_failed),
               generalGetString(MR.strings.migrate_to_device_file_delete_or_link_invalid)
             )
-            state = MigrationToState.DownloadFailed(totalBytes, link, archivePath, netCfg)
+            state = MigrationToState.DownloadFailed(totalBytes, link, archivePath, netCfg, networkProxy)
           }
           is CR.ChatRespError -> {
             if (msg.chatError is ChatError.ChatErrorChat && msg.chatError.errorType is ChatErrorType.NoRcvFileUser) {
@@ -559,9 +569,9 @@ private fun MutableState<MigrationToState?>.startDownloading(
                 generalGetString(MR.strings.migrate_to_device_download_failed),
                 generalGetString(MR.strings.migrate_to_device_file_delete_or_link_invalid)
               )
-              state = MigrationToState.DownloadFailed(totalBytes, link, archivePath, netCfg)
+              state = MigrationToState.DownloadFailed(totalBytes, link, archivePath, netCfg, networkProxy)
             } else {
-              Log.d(TAG, "unsupported error: ${msg.responseType}")
+              Log.d(TAG, "unsupported error: ${msg.responseType}, ${json.encodeToString(msg.chatError)}")
             }
           }
           else -> Log.d(TAG, "unsupported event: ${msg.responseType}")
@@ -571,7 +581,7 @@ private fun MutableState<MigrationToState?>.startDownloading(
 
     val (res, error) = controller.downloadStandaloneFile(user, link, CryptoFile.plain(File(archivePath).path), ctrl)
     if (res == null) {
-      state = MigrationToState.DownloadFailed(totalBytes, link, archivePath, netCfg)
+      state = MigrationToState.DownloadFailed(totalBytes, link, archivePath, netCfg, networkProxy)
       AlertManager.shared.showAlertMsg(
         generalGetString(MR.strings.migrate_to_device_error_downloading_archive),
         error
@@ -580,7 +590,7 @@ private fun MutableState<MigrationToState?>.startDownloading(
   }
 }
 
-private fun MutableState<MigrationToState?>.importArchive(archivePath: String, netCfg: NetCfg) {
+private fun MutableState<MigrationToState?>.importArchive(archivePath: String, netCfg: NetCfg, networkProxy: NetworkProxy?) {
   withLongRunningApi {
     try {
       if (ChatController.ctrl == null || ChatController.ctrl == -1L) {
@@ -594,14 +604,14 @@ private fun MutableState<MigrationToState?>.importArchive(archivePath: String, n
         if (archiveErrors.isNotEmpty()) {
           showArchiveImportedWithErrorsAlert(archiveErrors)
         }
-        state = MigrationToState.Passphrase("", netCfg)
-        MigrationToDeviceState.save(MigrationToDeviceState.Passphrase(netCfg))
+        state = MigrationToState.Passphrase("", netCfg, networkProxy)
+        MigrationToDeviceState.save(MigrationToDeviceState.Passphrase(netCfg, networkProxy))
       } catch (e: Exception) {
-        state = MigrationToState.ArchiveImportFailed(archivePath, netCfg)
+        state = MigrationToState.ArchiveImportFailed(archivePath, netCfg, networkProxy)
         AlertManager.shared.showAlertMsg (generalGetString(MR.strings.error_importing_database), e.stackTraceToString())
       }
     } catch (e: Exception) {
-      state = MigrationToState.ArchiveImportFailed(archivePath, netCfg)
+      state = MigrationToState.ArchiveImportFailed(archivePath, netCfg, networkProxy)
       AlertManager.shared.showAlertMsg (generalGetString(MR.strings.error_deleting_database), e.stackTraceToString())
     }
   }
@@ -611,7 +621,7 @@ private suspend fun stopArchiveDownloading(fileId: Long, ctrl: ChatCtrl) {
   controller.apiCancelFile(null, fileId, ctrl)
 }
 
-private fun startChat(passphrase: String, confirmation: MigrationConfirmation, useKeychain: Boolean, netCfg: NetCfg, close: () -> Unit) {
+private fun startChat(passphrase: String, confirmation: MigrationConfirmation, useKeychain: Boolean, netCfg: NetCfg, networkProxy: NetworkProxy?, close: () -> Unit) {
   if (useKeychain) {
     ksDatabasePassword.set(passphrase)
   } else {
@@ -623,7 +633,8 @@ private fun startChat(passphrase: String, confirmation: MigrationConfirmation, u
     try {
       initChatController(useKey = passphrase, confirmMigrations = confirmation) { CompletableDeferred(false) }
       val appSettings = controller.apiGetAppSettings(AppSettings.current.prepareForExport()).copy(
-        networkConfig = netCfg
+        networkConfig = netCfg,
+        networkProxy = networkProxy
       )
       finishMigration(appSettings, close)
     } catch (e: Exception) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ContactConnectionInfoView.kt

@@ -39,7 +39,7 @@ fun ContactConnectionInfoView(
 ) {
   LaunchedEffect(connReqInvitation) {
     if (connReqInvitation != null) {
-      chatModel.showingInvitation.value = ShowingInvitation(contactConnection.id, connReqInvitation, false, conn = contactConnection)
+      chatModel.showingInvitation.value = ShowingInvitation(contactConnection.id, connReqInvitation, false)
     }
   }
   /** When [AddContactLearnMore] is open, we don't need to drop [ChatModel.showingInvitation].

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatSheet.kt

@@ -1,7 +1,9 @@
 package chat.simplex.common.views.newchat
 
+import SectionDivider
 import SectionDividerSpaced
 import SectionItemView
+import SectionSpacer
 import SectionView
 import TextIconSpaced
 import androidx.compose.desktop.ui.tooling.preview.Preview
@@ -34,11 +36,13 @@ import chat.simplex.common.views.chatlist.ScrollDirection
 import chat.simplex.common.views.contacts.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
 import java.net.URI
 
 @Composable
-fun NewChatSheet(rh: RemoteHostInfo?, close: () -> Unit) {
+fun ModalData.NewChatSheet(rh: RemoteHostInfo?, close: () -> Unit) {
   val oneHandUI = remember { appPrefs.oneHandUI.state }
   val keyboardState by getKeyboardState()
   val showToolbarInOneHandUI = remember { derivedStateOf { keyboardState == KeyboardState.Closed && oneHandUI.value } }
@@ -95,7 +99,7 @@ fun chatContactType(chat: Chat): ContactType {
       val contact = cInfo.contact
 
       when {
-        contact.activeConn == null && contact.profile.contactLink != null -> ContactType.CARD
+        contact.activeConn == null && contact.profile.contactLink != null && contact.active -> ContactType.CARD
         contact.chatDeleted -> ContactType.CHAT_DELETED
         contact.contactStatus == ContactStatus.Active -> ContactType.RECENT
         else -> ContactType.UNLISTED
@@ -109,10 +113,8 @@ private fun filterContactTypes(c: List<Chat>, contactTypes: List<ContactType>):
   return c.filter { chat -> contactTypes.contains(chatContactType(chat)) }
 }
 
-private var lazyListState = 0 to 0
-
 @Composable
-private fun NewChatSheetLayout(
+private fun ModalData.NewChatSheetLayout(
   rh: RemoteHostInfo?,
   addContact: () -> Unit,
   scanPaste: () -> Unit,
@@ -120,7 +122,23 @@ private fun NewChatSheetLayout(
   close: () -> Unit,
 ) {
   val oneHandUI = remember { appPrefs.oneHandUI.state }
-  val listState = rememberLazyListState(lazyListState.first, lazyListState.second)
+  val listState = remember { appBarHandler.listState }
+  // This is workaround of an issue when position of a list is not restored (when going back to that screen) when a header exists.
+  // Upon returning back, this code returns correct index and position if number of items is the same
+  LaunchedEffect(Unit) {
+    val prevIndex = listState.firstVisibleItemIndex
+    val prevOffset = listState.firstVisibleItemScrollOffset
+    val total = listState.layoutInfo.totalItemsCount
+    if (prevIndex == 0 && prevOffset == 0) return@LaunchedEffect
+    snapshotFlow { listState.firstVisibleItemIndex to listState.firstVisibleItemScrollOffset }
+      .filter { it == 0 to 0  }
+      .collect {
+        if (total <= listState.layoutInfo.totalItemsCount) {
+          listState.scrollToItem(prevIndex, prevOffset)
+        }
+        cancel()
+      }
+  }
   val searchText = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue("")) }
   val searchShowingSimplexLink = remember { mutableStateOf(false) }
   val searchChatFilteredBySimplexLink = remember { mutableStateOf<String?>(null) }
@@ -164,6 +182,10 @@ private fun NewChatSheetLayout(
   )
 
   val sectionModifier = Modifier.fillMaxWidth()
+  val deletedContactTypes = listOf(ContactType.CHAT_DELETED)
+  val deletedChats by remember(chatModel.chats.value, deletedContactTypes) {
+    derivedStateOf { filterContactTypes(chatModel.chats.value, deletedContactTypes) }
+  }
 
   LazyColumnWithScrollBar(
     Modifier.fillMaxSize(),
@@ -224,7 +246,9 @@ private fun NewChatSheetLayout(
       }
     }
     item {
-      Spacer(Modifier.padding(bottom = 27.dp))
+      if (searchText.value.text.isEmpty()) {
+        Spacer(Modifier.padding(bottom = 27.dp))
+      }
 
       val actionButtonsOriginal = listOf(
         Triple(
@@ -262,37 +286,30 @@ private fun NewChatSheetLayout(
             }
           }
         }
-
-        val deletedContactTypes = listOf(ContactType.CHAT_DELETED)
-        val deletedChats by remember(chatModel.chats.value, deletedContactTypes) {
-          derivedStateOf { filterContactTypes(chatModel.chats.value, deletedContactTypes) }
-        }
         if (deletedChats.isNotEmpty()) {
           SectionDividerSpaced(maxBottomPadding = false)
-          Row(modifier = sectionModifier) {
-            SectionView {
-              SectionItemView(
-                click = {
-                  ModalManager.start.showCustomModal { closeDeletedChats ->
-                    ModalView(
-                      close = closeDeletedChats,
-                      closeOnTop = !oneHandUI.value,
-                    ) {
-                      DeletedContactsView(rh = rh, closeDeletedChats = closeDeletedChats, close = {
-                        ModalManager.start.closeModals()
-                      })
-                    }
+          SectionView {
+            SectionItemView(
+              click = {
+                ModalManager.start.showCustomModal { closeDeletedChats ->
+                  ModalView(
+                    close = closeDeletedChats,
+                    closeOnTop = !oneHandUI.value,
+                  ) {
+                    DeletedContactsView(rh = rh, closeDeletedChats = closeDeletedChats, close = {
+                      ModalManager.start.closeModals()
+                    })
                   }
                 }
-              ) {
-                Icon(
-                  painterResource(MR.images.ic_inventory_2),
-                  contentDescription = stringResource(MR.strings.deleted_chats),
-                  tint = MaterialTheme.colors.secondary,
-                )
-                TextIconSpaced(false)
-                Text(text = stringResource(MR.strings.deleted_chats), color = MaterialTheme.colors.onBackground)
               }
+            ) {
+              Icon(
+                painterResource(MR.images.ic_inventory_2),
+                contentDescription = stringResource(MR.strings.deleted_chats),
+                tint = MaterialTheme.colors.secondary,
+              )
+              TextIconSpaced(false)
+              Text(text = stringResource(MR.strings.deleted_chats), color = MaterialTheme.colors.onBackground)
             }
           }
         }
@@ -300,16 +317,28 @@ private fun NewChatSheetLayout(
     }
 
     item {
-      if (filteredContactChats.isNotEmpty() && !oneHandUI.value) {
-        if (searchText.value.text.isNotEmpty()) {
-          Spacer(Modifier.height(DEFAULT_PADDING))
-        } else {
+      if (filteredContactChats.isNotEmpty() && searchText.value.text.isEmpty()) {
+        if (!oneHandUI.value) {
           SectionDividerSpaced()
+          SectionView(stringResource(MR.strings.contact_list_header_title).uppercase(), headerBottomPadding = DEFAULT_PADDING_HALF) {}
+        } else {
+          SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = false)
+          SectionView(stringResource(MR.strings.contact_list_header_title).uppercase(), headerBottomPadding = DEFAULT_PADDING_HALF) {}
+          Spacer(Modifier.height(DEFAULT_PADDING_HALF))
+        }
+      }
+    }
+
+    item {
+      if (filteredContactChats.isEmpty() && allChats.isNotEmpty()) {
+        Column(sectionModifier.fillMaxSize().padding(DEFAULT_PADDING)) {
+          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
+            Text(
+              generalGetString(MR.strings.no_filtered_contacts),
+              color = MaterialTheme.colors.secondary
+            )
+          }
         }
-        Text(
-          stringResource(MR.strings.contact_list_header_title).uppercase(), color = MaterialTheme.colors.secondary, style = MaterialTheme.typography.body2,
-          modifier = sectionModifier.padding(start = DEFAULT_PADDING, bottom = DEFAULT_PADDING_HALF), fontSize = 12.sp
-        )
       }
     }
 
@@ -322,17 +351,6 @@ private fun NewChatSheetLayout(
       ContactListNavLinkView(chat, nextChatSelected, showDeletedChatIcon = true)
     }
   }
-
-  if (filteredContactChats.isEmpty() && allChats.isNotEmpty()) {
-    Column(sectionModifier.fillMaxSize().padding(DEFAULT_PADDING)) {
-      Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
-        Text(
-          generalGetString(MR.strings.no_filtered_contacts),
-          color = MaterialTheme.colors.secondary
-        )
-      }
-    }
-  }
 }
 
 @Composable
@@ -534,7 +552,7 @@ private fun contactTypesSearchTargets(baseContactTypes: List<ContactType>, searc
 }
 
 @Composable
-private fun DeletedContactsView(rh: RemoteHostInfo?, closeDeletedChats: () -> Unit, close: () -> Unit) {
+private fun ModalData.DeletedContactsView(rh: RemoteHostInfo?, closeDeletedChats: () -> Unit, close: () -> Unit) {
   val oneHandUI = remember { appPrefs.oneHandUI.state }
   val keyboardState by getKeyboardState()
   val showToolbarInOneHandUI = remember { derivedStateOf { keyboardState == KeyboardState.Closed && oneHandUI.value } }
@@ -555,78 +573,75 @@ private fun DeletedContactsView(rh: RemoteHostInfo?, closeDeletedChats: () -> Un
         }
       }
     }
-  ) {
-    Column(
-      Modifier
-        .fillMaxSize()
-        .padding(it)
+  ) { contentPadding ->
+    val listState = remember { appBarHandler.listState }
+    val searchText = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue("")) }
+    val searchShowingSimplexLink = remember { mutableStateOf(false) }
+    val searchChatFilteredBySimplexLink = remember { mutableStateOf<String?>(null) }
+    val showUnreadAndFavorites = remember { appPrefs.showUnreadAndFavorites.state }.value
+    val allChats by remember(chatModel.chats.value) {
+      derivedStateOf { filterContactTypes(chatModel.chats.value, listOf(ContactType.CHAT_DELETED)) }
+    }
+    val filteredContactChats = filteredContactChats(
+      showUnreadAndFavorites = showUnreadAndFavorites,
+      searchChatFilteredBySimplexLink = searchChatFilteredBySimplexLink,
+      searchShowingSimplexLink = searchShowingSimplexLink,
+      searchText = searchText.value.text,
+      contactChats = allChats
+    )
+
+    LazyColumnWithScrollBar(
+      Modifier.fillMaxSize(),
+      contentPadding = contentPadding,
+      reverseLayout = oneHandUI.value,
     ) {
-      if (!oneHandUI.value) {
-        Box(contentAlignment = Alignment.Center) {
-          val bottomPadding = DEFAULT_PADDING
-          AppBarTitle(
-            stringResource(MR.strings.deleted_chats),
-            hostDevice(rh?.remoteHostId),
-            bottomPadding = bottomPadding
-          )
-        }
-      }
-
-      val listState = rememberLazyListState(lazyListState.first, lazyListState.second)
-      val searchText = rememberSaveable(stateSaver = TextFieldValue.Saver) { mutableStateOf(TextFieldValue("")) }
-      val searchShowingSimplexLink = remember { mutableStateOf(false) }
-      val searchChatFilteredBySimplexLink = remember { mutableStateOf<String?>(null) }
-      val showUnreadAndFavorites = remember { appPrefs.showUnreadAndFavorites.state }.value
-      val allChats by remember(chatModel.chats.value) {
-        derivedStateOf { filterContactTypes(chatModel.chats.value, listOf(ContactType.CHAT_DELETED)) }
-      }
-      val filteredContactChats = filteredContactChats(
-        showUnreadAndFavorites = showUnreadAndFavorites,
-        searchChatFilteredBySimplexLink = searchChatFilteredBySimplexLink,
-        searchShowingSimplexLink = searchShowingSimplexLink,
-        searchText = searchText.value.text,
-        contactChats = allChats
-      )
-
-      LazyColumnWithScrollBar(
-        Modifier.fillMaxSize(),
-        reverseLayout = oneHandUI.value,
-        ) {
-        item {
-          if (!oneHandUI.value) {
-            Divider()
-          }
-          ContactsSearchBar(
-            listState = listState,
-            searchText = searchText,
-            searchShowingSimplexLink = searchShowingSimplexLink,
-            searchChatFilteredBySimplexLink = searchChatFilteredBySimplexLink,
-            close = close,
-          )
-          Divider()
-
-          Spacer(Modifier.padding(bottom = DEFAULT_PADDING))
-        }
-
-        itemsIndexed(filteredContactChats) { index, chat ->
-          val nextChatSelected = remember(chat.id, filteredContactChats) {
-            derivedStateOf {
-              chatModel.chatId.value != null && filteredContactChats.getOrNull(index + 1)?.id == chatModel.chatId.value
-            }
-          }
-          ContactListNavLinkView(chat, nextChatSelected, showDeletedChatIcon = false)
-        }
-      }
-      if (filteredContactChats.isEmpty() && allChats.isNotEmpty()) {
-        Column(Modifier.fillMaxSize().padding(DEFAULT_PADDING)) {
-          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
-            Text(
-              generalGetString(MR.strings.no_filtered_contacts),
-              color = MaterialTheme.colors.secondary,
+      item {
+        if (!oneHandUI.value) {
+          Box(contentAlignment = Alignment.Center) {
+            val bottomPadding = DEFAULT_PADDING
+            AppBarTitle(
+              stringResource(MR.strings.deleted_chats),
+              hostDevice(rh?.remoteHostId),
+              bottomPadding = bottomPadding
             )
           }
         }
       }
+      item {
+        if (!oneHandUI.value) {
+          Divider()
+        }
+        ContactsSearchBar(
+          listState = listState,
+          searchText = searchText,
+          searchShowingSimplexLink = searchShowingSimplexLink,
+          searchChatFilteredBySimplexLink = searchChatFilteredBySimplexLink,
+          close = close,
+        )
+        Divider()
+      }
+
+      item {
+        if (filteredContactChats.isEmpty() && allChats.isNotEmpty()) {
+          Column(Modifier.fillMaxSize().padding(DEFAULT_PADDING)) {
+            Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
+              Text(
+                generalGetString(MR.strings.no_filtered_contacts),
+                color = MaterialTheme.colors.secondary,
+              )
+            }
+          }
+        }
+      }
+
+      itemsIndexed(filteredContactChats) { index, chat ->
+        val nextChatSelected = remember(chat.id, filteredContactChats) {
+          derivedStateOf {
+            chatModel.chatId.value != null && filteredContactChats.getOrNull(index + 1)?.id == chatModel.chatId.value
+          }
+        }
+        ContactListNavLinkView(chat, nextChatSelected, showDeletedChatIcon = false)
+      }
     }
   }
 }
@@ -724,6 +739,6 @@ fun ActionButton(
 @Composable
 private fun PreviewNewChatSheet() {
   SimpleXTheme {
-    NewChatSheet(rh = null, close = {})
+    ModalData().NewChatSheet(rh = null, close = {})
   }
 }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatView.kt

@@ -2,25 +2,20 @@ package chat.simplex.common.views.newchat
 
 import SectionBottomSpacer
 import SectionItemView
-import SectionSpacer
 import SectionTextFooter
 import SectionView
-import TextIconSpaced
 import androidx.compose.foundation.*
+import androidx.compose.foundation.gestures.scrollBy
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.BasicTextField
 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.draw.alpha
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.text.TextStyle
@@ -37,7 +32,6 @@ import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.net.URI
 
@@ -49,7 +43,7 @@ enum class NewChatOption {
 fun ModalData.NewChatView(rh: RemoteHostInfo?, selection: NewChatOption, showQRCodeScanner: Boolean = false, close: () -> Unit) {
   val selection = remember { stateGetOrPut("selection") { selection } }
   val showQRCodeScanner = remember { stateGetOrPut("showQRCodeScanner") { showQRCodeScanner } }
-  val contactConnection: MutableState<PendingContactConnection?> = rememberSaveable(stateSaver = serializableSaver()) { mutableStateOf(chatModel.showingInvitation.value?.conn) }
+  val contactConnection: MutableState<PendingContactConnection?> = rememberSaveable(stateSaver = serializableSaver()) { mutableStateOf(null) }
   val connReqInvitation by remember { derivedStateOf { chatModel.showingInvitation.value?.connReq ?: "" } }
   val creatingConnReq = rememberSaveable { mutableStateOf(false) }
   val pastedLink = rememberSaveable { mutableStateOf("") }
@@ -183,15 +177,6 @@ private fun CreatingLinkProgressView() {
   DefaultProgressView(stringResource(MR.strings.creating_link))
 }
 
-private fun updateShownConnection(conn: PendingContactConnection) {
-  chatModel.showingInvitation.value = chatModel.showingInvitation.value?.copy(
-    conn = conn,
-    connId = conn.id,
-    connReq = conn.connReqInv ?: "",
-    connChatUsed = true
-  )
-}
-
 @Composable
 private fun RetryButton(onClick: () -> Unit) {
   Column(
@@ -207,248 +192,6 @@ private fun RetryButton(onClick: () -> Unit) {
   }
 }
 
-@Composable
-private fun ProfilePickerOption(
-  title: String,
-  selected: Boolean,
-  disabled: Boolean,
-  onSelected: () -> Unit,
-  image: @Composable () -> Unit,
-  onInfo: (() -> Unit)? = null
-) {
-  Row(
-    Modifier
-      .fillMaxWidth()
-      .sizeIn(minHeight = DEFAULT_MIN_SECTION_ITEM_HEIGHT + 8.dp)
-      .clickable(enabled = !disabled, onClick = onSelected)
-      .padding(horizontal = DEFAULT_PADDING, vertical = 4.dp),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    image()
-    TextIconSpaced(false)
-    Text(title, modifier = Modifier.align(Alignment.CenterVertically))
-    if (onInfo != null) {
-      Spacer(Modifier.padding(6.dp))
-      Column(Modifier
-        .size(48.dp)
-        .clip(CircleShape)
-        .clickable(
-          enabled = !disabled,
-          onClick = { ModalManager.start.showModal { IncognitoView() } }
-        ),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-      ) {
-        Icon(
-          painterResource(MR.images.ic_info),
-          stringResource(MR.strings.incognito),
-          tint = MaterialTheme.colors.primary
-        )
-      }
-    }
-    Spacer(Modifier.weight(1f))
-    if (selected) {
-      Icon(
-        painterResource(
-          MR.images.ic_check
-        ),
-        title,
-        Modifier.size(20.dp),
-        tint = MaterialTheme.colors.primary,
-      )
-    }
-  }
-  Divider(
-    Modifier.padding(
-      start = DEFAULT_PADDING_HALF,
-      end = DEFAULT_PADDING_HALF,
-    )
-  )
-}
-
-private fun filteredProfiles(users: List<User>, searchTextOrPassword: String): List<User> {
-  val s = searchTextOrPassword.trim()
-  val lower = s.lowercase()
-  return users.filter { u ->
-    if ((u.activeUser || !u.hidden) && (s == "" || u.anyNameContains(lower))) {
-      true
-    } else {
-      correctPassword(u, s)
-    }
-  }
-}
-
-@Composable
-private fun ActiveProfilePicker(
-  search: MutableState<String>,
-  contactConnection: PendingContactConnection?,
-  close: () -> Unit,
-  rhId: Long?
-) {
-  val switchingProfile = remember { mutableStateOf(false) }
-  val incognito = remember {
-    chatModel.showingInvitation.value?.conn?.incognito ?: controller.appPrefs.incognito.get()
-  }
-  val selectedProfile by remember { chatModel.currentUser }
-  val searchTextOrPassword = rememberSaveable { search }
-  val profiles = remember {
-    chatModel.users.map { it.user }.sortedBy { !it.activeUser }
-  }
-  val filteredProfiles by remember {
-    derivedStateOf { filteredProfiles(profiles, searchTextOrPassword.value) }
-  }
-
-  var progressByTimeout by rememberSaveable { mutableStateOf(false) }
-
-  LaunchedEffect(switchingProfile.value) {
-    progressByTimeout = if (switchingProfile.value) {
-      delay(500)
-      switchingProfile.value
-    } else {
-      false
-    }
-  }
-
-  @Composable
-  fun ProfilePickerUserOption(user: User) {
-    val selected = selectedProfile?.userId == user.userId && !incognito
-
-    ProfilePickerOption(
-      title = user.chatViewName,
-      disabled = switchingProfile.value || selected,
-      selected = selected,
-      onSelected = {
-        switchingProfile.value = true
-        withApi {
-          try {
-            if (contactConnection != null) {
-              val conn = controller.apiChangeConnectionUser(rhId, contactConnection.pccConnId, user.userId)
-              if (conn != null) {
-                withChats {
-                  updateContactConnection(rhId, conn)
-                  updateShownConnection(conn)
-                }
-                controller.changeActiveUser_(
-                  rhId = user.remoteHostId,
-                  toUserId = user.userId,
-                  viewPwd = if (user.hidden) searchTextOrPassword.value else null
-                )
-
-                if (chatModel.currentUser.value?.userId != user.userId) {
-                  AlertManager.shared.showAlertMsg(generalGetString(
-                    MR.strings.switching_profile_error_title),
-                    String.format(generalGetString(MR.strings.switching_profile_error_message), user.chatViewName)
-                  )
-                }
-
-                withChats {
-                  updateContactConnection(user.remoteHostId, conn)
-                }
-                close.invoke()
-              }
-            }
-          } finally {
-            switchingProfile.value = false
-          }
-        }
-      },
-        image = { ProfileImage(size = 42.dp, image = user.image) }
-    )
-  }
-
-  @Composable
-  fun IncognitoUserOption() {
-    ProfilePickerOption(
-      disabled = switchingProfile.value,
-      title = stringResource(MR.strings.incognito),
-      selected = incognito,
-      onSelected = {
-        if (!incognito) {
-          switchingProfile.value = true
-          withApi {
-            try {
-              if (contactConnection != null) {
-                val conn = controller.apiSetConnectionIncognito(rhId, contactConnection.pccConnId, true)
-
-                if (conn != null) {
-                  withChats {
-                    updateContactConnection(rhId, conn)
-                    updateShownConnection(conn)
-                  }
-                  close.invoke()
-                }
-              }
-            } finally {
-              switchingProfile.value = false
-            }
-          }
-        }
-      },
-      image = {
-        Spacer(Modifier.width(8.dp))
-        Icon(
-          painterResource(MR.images.ic_theater_comedy_filled),
-          contentDescription = stringResource(MR.strings.incognito),
-          Modifier.size(32.dp),
-          tint = Indigo,
-        )
-        Spacer(Modifier.width(2.dp))
-      },
-      onInfo = { ModalManager.start.showModal { IncognitoView() } },
-    )
-  }
-
-  BoxWithConstraints {
-    Column(
-      Modifier
-        .fillMaxSize()
-        .alpha(if (progressByTimeout) 0.6f else 1f)
-    ) {
-      LazyColumnWithScrollBar(userScrollEnabled = !switchingProfile.value) {
-        item {
-          AppBarTitle(stringResource(MR.strings.select_chat_profile), hostDevice(rhId), bottomPadding = DEFAULT_PADDING)
-        }
-        val activeProfile = filteredProfiles.firstOrNull { it.activeUser }
-
-        if (activeProfile != null) {
-          val otherProfiles = filteredProfiles.filter { it.userId != activeProfile.userId }
-
-          if (incognito) {
-            item {
-              IncognitoUserOption()
-            }
-            item {
-              ProfilePickerUserOption(activeProfile)
-            }
-          } else {
-            item {
-              ProfilePickerUserOption(activeProfile)
-            }
-            item {
-              IncognitoUserOption()
-            }
-          }
-
-          itemsIndexed(otherProfiles) { _, p ->
-            ProfilePickerUserOption(p)
-          }
-        } else {
-          item {
-            IncognitoUserOption()
-          }
-          itemsIndexed(filteredProfiles) { _, p ->
-            ProfilePickerUserOption(p)
-          }
-        }
-      }
-    }
-    if (progressByTimeout) {
-      DefaultProgressView("")
-    }
-  }
-}
-
 @Composable
 private fun InviteView(rhId: Long?, connReqInvitation: String, contactConnection: MutableState<PendingContactConnection?>) {
   SectionView(stringResource(MR.strings.share_this_1_time_link).uppercase(), headerBottomPadding = 5.dp) {
@@ -461,72 +204,23 @@ private fun InviteView(rhId: Long?, connReqInvitation: String, contactConnection
     SimpleXLinkQRCode(connReqInvitation, onShare = { chatModel.markShowingInvitationUsed() })
   }
 
-  Spacer(Modifier.height(DEFAULT_PADDING))
-  val incognito by remember(chatModel.showingInvitation.value?.conn?.incognito, controller.appPrefs.incognito.get()) {
-    derivedStateOf {
-      chatModel.showingInvitation.value?.conn?.incognito ?: controller.appPrefs.incognito.get()
-    }
+  Spacer(Modifier.height(10.dp))
+  val incognito = remember { mutableStateOf(controller.appPrefs.incognito.get()) }
+  IncognitoToggle(controller.appPrefs.incognito, incognito) {
+    ModalManager.start.showModal { IncognitoView() }
   }
-  val currentUser = remember { chatModel.currentUser }.value
-
-  if (currentUser != null) {
-    SectionView(stringResource(MR.strings.new_chat_share_profile).uppercase(), headerBottomPadding = 5.dp) {
-      SectionItemView(
-        padding = PaddingValues(
-          top = 0.dp,
-          bottom = 0.dp,
-          start = 16.dp,
-          end = 16.dp
-        ),
-        click = {
-          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 = {
-                ActiveProfilePicker(
-                  search = search,
-                  close = close,
-                  rhId = rhId,
-                  contactConnection = contactConnection.value
-                )
-              })
-          }
-        }
-      ) {
-        if (incognito) {
-          Spacer(Modifier.width(8.dp))
-          Icon(
-            painterResource(MR.images.ic_theater_comedy_filled),
-            contentDescription = stringResource(MR.strings.incognito),
-            tint = Indigo,
-            modifier = Modifier.size(32.dp)
-          )
-          Spacer(Modifier.width(2.dp))
-        } else {
-          ProfileImage(size = 42.dp, image = currentUser.image)
-        }
-        TextIconSpaced(false)
-        Text(
-          text = if (incognito) stringResource(MR.strings.incognito) else currentUser.chatViewName,
-          color = MaterialTheme.colors.onBackground
-        )
-        Column(modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.End) {
-          Icon(
-            painter = painterResource(MR.images.ic_arrow_forward_ios),
-            contentDescription = stringResource(MR.strings.new_chat_share_profile),
-            tint = MaterialTheme.colors.secondary,
-          )
-        }
+  KeyChangeEffect(incognito.value) {
+    withBGApi {
+      val contactConn = contactConnection.value ?: return@withBGApi
+      val conn = controller.apiSetConnectionIncognito(rhId, contactConn.pccConnId, incognito.value) ?: return@withBGApi
+      withChats {
+        contactConnection.value = conn
+        updateContactConnection(rhId, conn)
       }
     }
-    if (incognito) {
-      SectionTextFooter(generalGetString(MR.strings.connect__a_new_random_profile_will_be_shared))
-    }
+    chatModel.markShowingInvitationUsed()
   }
+  SectionTextFooter(sharedProfileInfo(chatModel, incognito.value))
 }
 
 @Composable
@@ -672,7 +366,7 @@ private fun createInvitation(
     if (r != null) {
       withChats {
         updateContactConnection(rhId, r.second)
-        chatModel.showingInvitation.value = ShowingInvitation(connId = r.second.id, connReq = simplexChatLink(r.first), connChatUsed = false, conn = r.second)
+        chatModel.showingInvitation.value = ShowingInvitation(connId = r.second.id, connReq = simplexChatLink(r.first), connChatUsed = false)
         contactConnection.value = r.second
       }
     } else {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/AdvancedNetworkSettings.kt

@@ -1,10 +1,10 @@
 package chat.simplex.common.views.usersettings
 
 import SectionBottomSpacer
-import SectionCustomFooter
 import SectionDividerSpaced
 import SectionItemView
 import SectionItemWithValue
+import SectionTextFooter
 import SectionView
 import SectionViewSelectableCards
 import androidx.compose.desktop.ui.tooling.preview.Preview
@@ -40,12 +40,10 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
   val currentCfg = remember { stateGetOrPut("currentCfg") { controller.getNetCfg() } }
   val currentCfgVal = currentCfg.value // used only on initialization
 
-  val onionHosts = remember { mutableStateOf(currentCfgVal.onionHosts) }
   val sessionMode = remember { mutableStateOf(currentCfgVal.sessionMode) }
   val smpProxyMode = remember { mutableStateOf(currentCfgVal.smpProxyMode) }
   val smpProxyFallback = remember { mutableStateOf(currentCfgVal.smpProxyFallback) }
 
-  val networkUseSocksProxy: MutableState<Boolean> = remember { mutableStateOf(currentCfgVal.useSocksProxy) }
   val networkTCPConnectTimeout = remember { mutableStateOf(currentCfgVal.tcpConnectTimeout) }
   val networkTCPTimeout = remember { mutableStateOf(currentCfgVal.tcpTimeout) }
   val networkTCPTimeoutPerKb = remember { mutableStateOf(currentCfgVal.tcpTimeoutPerKb) }
@@ -90,11 +88,10 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
       tcpKeepAlive = tcpKeepAlive,
       smpPingInterval = networkSMPPingInterval.value,
       smpPingCount = networkSMPPingCount.value
-    ).withOnionHosts(onionHosts.value)
+    ).withOnionHosts(currentCfg.value.onionHosts)
   }
 
   fun updateView(cfg: NetCfg) {
-    onionHosts.value = cfg.onionHosts
     sessionMode.value = cfg.sessionMode
     smpProxyMode.value = cfg.smpProxyMode
     smpProxyFallback.value = cfg.smpProxyFallback
@@ -148,10 +145,7 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
   ) {
     AdvancedNetworkSettingsLayout(
       currentRemoteHost = currentRemoteHost,
-      networkUseSocksProxy = networkUseSocksProxy,
       developerTools = developerTools,
-      onionHosts = onionHosts,
-      useOnion = { onionHosts.value = it; currentCfg.value = currentCfg.value.withOnionHosts(it) },
       sessionMode = sessionMode,
       smpProxyMode = smpProxyMode,
       smpProxyFallback = smpProxyFallback,
@@ -183,10 +177,7 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
 
 @Composable fun AdvancedNetworkSettingsLayout(
   currentRemoteHost: RemoteHostInfo?,
-  networkUseSocksProxy: State<Boolean>,
   developerTools: Boolean,
-  onionHosts: MutableState<OnionHosts>,
-  useOnion: (OnionHosts) -> Unit,
   sessionMode: MutableState<TransportSessionMode>,
   smpProxyMode: MutableState<SMPProxyMode>,
   smpProxyFallback: MutableState<SMPProxyFallback>,
@@ -223,21 +214,7 @@ fun ModalData.AdvancedNetworkSettingsView(showModal: (ModalData.() -> Unit) -> U
         SMPProxyFallbackPicker(smpProxyFallback, showModal, updateSMPProxyFallback, enabled = remember { derivedStateOf { smpProxyMode.value != SMPProxyMode.Never } })
         SettingsPreferenceItem(painterResource(MR.images.ic_arrow_forward), stringResource(MR.strings.private_routing_show_message_status), chatModel.controller.appPrefs.showSentViaProxy)
       }
-      SectionCustomFooter {
-        Text(stringResource(MR.strings.private_routing_explanation))
-      }
-      SectionDividerSpaced(maxTopPadding = true)
-    }
-
-    if (currentRemoteHost == null && networkUseSocksProxy.value) {
-      SectionView(stringResource(MR.strings.network_socks_proxy).uppercase()) {
-        UseOnionHosts(onionHosts, networkUseSocksProxy, showModal, useOnion)
-        SectionCustomFooter {
-          Column {
-            Text(annotatedStringResource(MR.strings.disable_onion_hosts_when_not_supported))
-          }
-        }
-      }
+      SectionTextFooter(stringResource(MR.strings.private_routing_explanation))
       SectionDividerSpaced(maxTopPadding = true)
     }
 
@@ -562,7 +539,6 @@ fun PreviewAdvancedNetworkSettingsLayout() {
   SimpleXTheme {
     AdvancedNetworkSettingsLayout(
       currentRemoteHost = null,
-      networkUseSocksProxy = remember { mutableStateOf(false) },
       developerTools = false,
       sessionMode = remember { mutableStateOf(TransportSessionMode.User) },
       smpProxyMode = remember { mutableStateOf(SMPProxyMode.Never) },
@@ -577,8 +553,6 @@ fun PreviewAdvancedNetworkSettingsLayout() {
       networkTCPKeepIdle = remember { mutableStateOf(10) },
       networkTCPKeepIntvl = remember { mutableStateOf(10) },
       networkTCPKeepCnt = remember { mutableStateOf(10) },
-      onionHosts = remember { mutableStateOf(OnionHosts.PREFER) },
-      useOnion = {},
       updateSessionMode = {},
       updateSMPProxyMode = {},
       updateSMPProxyFallback = {},

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt

@@ -1,10 +1,10 @@
 package chat.simplex.common.views.usersettings
 
 import SectionBottomSpacer
-import SectionCustomFooter
 import SectionDividerSpaced
 import SectionItemView
 import SectionItemWithValue
+import SectionTextFooter
 import SectionView
 import SectionViewSelectable
 import TextIconSpaced
@@ -37,10 +37,11 @@ fun NetworkAndServersView() {
   val netCfg = remember { chatModel.controller.getNetCfg() }
   val networkUseSocksProxy: MutableState<Boolean> = remember { mutableStateOf(netCfg.useSocksProxy) }
 
-  val proxyPort = remember { derivedStateOf { chatModel.controller.appPrefs.networkProxyHostPort.state.value?.split(":")?.lastOrNull()?.toIntOrNull() ?: 9050 } }
+  val proxyPort = remember { derivedStateOf { appPrefs.networkProxy.state.value.port } }
   NetworkAndServersLayout(
     currentRemoteHost = currentRemoteHost,
     networkUseSocksProxy = networkUseSocksProxy,
+    onionHosts = remember { mutableStateOf(netCfg.onionHosts) },
     toggleSocksProxy = { enable ->
       val def = NetCfg.defaults
       val proxyDef = NetCfg.proxyDefaults
@@ -51,7 +52,7 @@ fun NetworkAndServersView() {
           confirmText = generalGetString(MR.strings.confirm_verb),
           onConfirm = {
             withBGApi {
-              var conf = controller.getNetCfg().withHostPort(controller.appPrefs.networkProxyHostPort.get())
+              var conf = controller.getNetCfg().withProxy(controller.appPrefs.networkProxy.get())
               if (conf.tcpConnectTimeout == def.tcpConnectTimeout) {
                 conf = conf.copy(tcpConnectTimeout = proxyDef.tcpConnectTimeout)
               }
@@ -104,6 +105,7 @@ fun NetworkAndServersView() {
 @Composable fun NetworkAndServersLayout(
   currentRemoteHost: RemoteHostInfo?,
   networkUseSocksProxy: MutableState<Boolean>,
+  onionHosts: MutableState<OnionHosts>,
   toggleSocksProxy: (Boolean) -> Unit,
 ) {
   val m = chatModel
@@ -120,14 +122,10 @@ fun NetworkAndServersView() {
 
         if (currentRemoteHost == null) {
           UseSocksProxySwitch(networkUseSocksProxy, toggleSocksProxy)
-          SettingsActionItem(painterResource(MR.images.ic_settings_ethernet), stringResource(MR.strings.network_socks_proxy_settings), { showCustomModal { SocksProxySettings(networkUseSocksProxy.value, appPrefs.networkProxyHostPort, false, it) }})
+          SettingsActionItem(painterResource(MR.images.ic_settings_ethernet), stringResource(MR.strings.network_socks_proxy_settings), { showCustomModal { SocksProxySettings(networkUseSocksProxy.value, appPrefs.networkProxy, onionHosts, sessionMode = appPrefs.networkSessionMode.get(), false, it) }})
           SettingsActionItem(painterResource(MR.images.ic_cable), stringResource(MR.strings.network_settings), { ModalManager.start.showCustomModal { AdvancedNetworkSettingsView(showModal, it) } })
           if (networkUseSocksProxy.value) {
-            SectionCustomFooter {
-              Column {
-                Text(annotatedStringResource(MR.strings.socks_proxy_setting_limitations))
-              }
-            }
+            SectionTextFooter(annotatedStringResource(MR.strings.socks_proxy_setting_limitations))
             SectionDividerSpaced(maxTopPadding = true)
           } else {
             SectionDividerSpaced()
@@ -158,16 +156,14 @@ fun NetworkAndServersView() {
   networkUseSocksProxy: MutableState<Boolean>,
   onionHosts: MutableState<OnionHosts>,
   sessionMode: MutableState<TransportSessionMode>,
-  networkProxyHostPort: SharedPreference<String?>,
+  networkProxy: SharedPreference<NetworkProxy>,
   toggleSocksProxy: (Boolean) -> Unit,
-  useOnion: (OnionHosts) -> Unit,
   updateSessionMode: (TransportSessionMode) -> Unit,
 ) {
   val showModal = { it: @Composable ModalData.() -> Unit ->  ModalManager.fullscreen.showModal(content = it) }
   val showCustomModal = { it: @Composable (close: () -> Unit) -> Unit -> ModalManager.fullscreen.showCustomModal { close -> it(close) }}
   UseSocksProxySwitch(networkUseSocksProxy, toggleSocksProxy)
-  SettingsActionItem(painterResource(MR.images.ic_settings_ethernet), stringResource(MR.strings.network_socks_proxy_settings), { showCustomModal { SocksProxySettings(networkUseSocksProxy.value, networkProxyHostPort, true, it) } })
-  UseOnionHosts(onionHosts, networkUseSocksProxy, showModal, useOnion)
+  SettingsActionItem(painterResource(MR.images.ic_settings_ethernet), stringResource(MR.strings.network_socks_proxy_settings), { showCustomModal { SocksProxySettings(networkUseSocksProxy.value, networkProxy, onionHosts, sessionMode.value, true, it) } })
   if (developerTools) {
     SessionModePicker(sessionMode, showModal, updateSessionMode)
   }
@@ -205,46 +201,98 @@ fun UseSocksProxySwitch(
 @Composable
 fun SocksProxySettings(
   networkUseSocksProxy: Boolean,
-  networkProxyHostPort: SharedPreference<String?> = appPrefs.networkProxyHostPort,
+  networkProxy: SharedPreference<NetworkProxy>,
+  onionHosts: MutableState<OnionHosts>,
+  sessionMode: TransportSessionMode,
   migration: Boolean,
   close: () -> Unit
 ) {
-  val defaultHostPort = remember { "localhost:9050" }
-  val hostPortSaved by remember { networkProxyHostPort.state }
+  val networkProxySaved by remember { networkProxy.state }
+  val onionHostsSaved = remember { mutableStateOf(onionHosts.value) }
+
+  val usernameUnsaved = rememberSaveable(stateSaver = TextFieldValue.Saver) {
+    mutableStateOf(TextFieldValue(networkProxySaved.username))
+  }
+  val passwordUnsaved = rememberSaveable(stateSaver = TextFieldValue.Saver) {
+    mutableStateOf(TextFieldValue(networkProxySaved.password))
+  }
   val hostUnsaved = rememberSaveable(stateSaver = TextFieldValue.Saver) {
-    mutableStateOf(TextFieldValue(hostPortSaved?.split(":")?.firstOrNull() ?: "localhost"))
+    mutableStateOf(TextFieldValue(networkProxySaved.host))
   }
   val portUnsaved = rememberSaveable(stateSaver = TextFieldValue.Saver) {
-    mutableStateOf(TextFieldValue(hostPortSaved?.split(":")?.lastOrNull() ?: "9050"))
+    mutableStateOf(TextFieldValue(networkProxySaved.port.toString()))
   }
-  val save = {
-    val oldValue = networkProxyHostPort.get()
-    networkProxyHostPort.set(hostUnsaved.value.text + ":" + portUnsaved.value.text)
-    if (networkUseSocksProxy && !migration) {
-      withBGApi {
-        if (!controller.apiSetNetworkConfig(controller.getNetCfg())) {
-          networkProxyHostPort.set(oldValue)
-        }
+  val proxyAuthRandomUnsaved = rememberSaveable { mutableStateOf(networkProxySaved.auth == NetworkProxyAuth.ISOLATE) }
+  LaunchedEffect(proxyAuthRandomUnsaved.value) {
+    if (!proxyAuthRandomUnsaved.value && onionHosts.value != OnionHosts.NEVER) {
+      onionHosts.value = OnionHosts.NEVER
+    }
+  }
+  val proxyAuthModeUnsaved = remember(proxyAuthRandomUnsaved.value, usernameUnsaved.value.text, passwordUnsaved.value.text) {
+    derivedStateOf {
+      if (proxyAuthRandomUnsaved.value) {
+        NetworkProxyAuth.ISOLATE
+      } else {
+        NetworkProxyAuth.USERNAME
       }
     }
   }
-  val saveAndClose = {
-    val oldValue = networkProxyHostPort.get()
-    networkProxyHostPort.set(hostUnsaved.value.text + ":" + portUnsaved.value.text)
+
+  val save: (Boolean) -> Unit = { closeOnSuccess ->
+    val oldValue = networkProxy.get()
+    usernameUnsaved.value = usernameUnsaved.value.copy(if (proxyAuthModeUnsaved.value == NetworkProxyAuth.USERNAME) usernameUnsaved.value.text.trim() else "")
+    passwordUnsaved.value = passwordUnsaved.value.copy(if (proxyAuthModeUnsaved.value == NetworkProxyAuth.USERNAME) passwordUnsaved.value.text.trim() else "")
+    hostUnsaved.value = hostUnsaved.value.copy(hostUnsaved.value.text.trim())
+    portUnsaved.value = portUnsaved.value.copy(portUnsaved.value.text.trim())
+
+    networkProxy.set(
+      NetworkProxy(
+        username = usernameUnsaved.value.text,
+        password = passwordUnsaved.value.text,
+        host = hostUnsaved.value.text,
+        port = portUnsaved.value.text.toIntOrNull() ?: 9050,
+        auth = proxyAuthModeUnsaved.value
+      )
+    )
+    val oldCfg = controller.getNetCfg()
+    val cfg = oldCfg.withOnionHosts(onionHosts.value)
+    val oldOnionHosts = onionHostsSaved.value
+    onionHostsSaved.value = onionHosts.value
+
+    if (!migration) {
+      controller.setNetCfg(cfg)
+    }
     if (networkUseSocksProxy && !migration) {
       withBGApi {
-        if (controller.apiSetNetworkConfig(controller.getNetCfg())) {
-          close()
+        if (controller.apiSetNetworkConfig(cfg, showAlertOnError = false)) {
+          onionHosts.value = cfg.onionHosts
+          onionHostsSaved.value = onionHosts.value
+          if (closeOnSuccess) {
+            close()
+          }
         } else {
-          networkProxyHostPort.set(oldValue)
+          controller.setNetCfg(oldCfg)
+          networkProxy.set(oldValue)
+          onionHostsSaved.value = oldOnionHosts
+          showWrongProxyConfigAlert()
         }
       }
     }
   }
-  val saveDisabled = hostPortSaved == (hostUnsaved.value.text + ":" + portUnsaved.value.text) ||
-      remember { derivedStateOf { !validHost(hostUnsaved.value.text) } }.value ||
-      remember { derivedStateOf { !validPort(portUnsaved.value.text) } }.value
-  val resetDisabled = hostUnsaved.value.text + ":" + portUnsaved.value.text == defaultHostPort
+  val saveDisabled =
+    (
+        networkProxySaved.username == usernameUnsaved.value.text.trim() &&
+        networkProxySaved.password == passwordUnsaved.value.text.trim() &&
+        networkProxySaved.host == hostUnsaved.value.text.trim() &&
+        networkProxySaved.port.toString() == portUnsaved.value.text.trim() &&
+        networkProxySaved.auth == proxyAuthModeUnsaved.value &&
+        onionHosts.value == onionHostsSaved.value
+    ) ||
+        !validCredential(usernameUnsaved.value.text) ||
+        !validCredential(passwordUnsaved.value.text) ||
+        !validHost(hostUnsaved.value.text) ||
+        !validPort(portUnsaved.value.text)
+  val resetDisabled = hostUnsaved.value.text.trim() == "localhost" && portUnsaved.value.text.trim() == "9050" && proxyAuthRandomUnsaved.value && onionHosts.value == NetCfg.defaults.onionHosts
   ModalView(
     close = {
       if (saveDisabled) {
@@ -252,7 +300,7 @@ fun SocksProxySettings(
       } else {
         showUnsavedSocksHostPortAlert(
           confirmText = generalGetString(if (networkUseSocksProxy && !migration) MR.strings.network_options_save_and_reconnect else MR.strings.network_options_save),
-          save = saveAndClose,
+          save = { save(true) },
           close = close
         )
       }
@@ -263,38 +311,78 @@ fun SocksProxySettings(
         .fillMaxWidth()
     ) {
       AppBarTitle(generalGetString(MR.strings.network_socks_proxy_settings))
-      SectionView(contentPadding = PaddingValues(horizontal = DEFAULT_PADDING)) {
-        DefaultConfigurableTextField(
-          hostUnsaved,
-          stringResource(MR.strings.host_verb),
-          modifier = Modifier.fillMaxWidth(),
-          isValid = ::validHost,
-          keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
-          keyboardType = KeyboardType.Text,
-        )
-        DefaultConfigurableTextField(
-          portUnsaved,
-          stringResource(MR.strings.port_verb),
-          modifier = Modifier.fillMaxWidth(),
-          isValid = ::validPort,
-          keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done); save() }),
-          keyboardType = KeyboardType.Number,
-        )
+      SectionView(stringResource(MR.strings.network_socks_proxy).uppercase()) {
+        Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
+          DefaultConfigurableTextField(
+            hostUnsaved,
+            stringResource(MR.strings.host_verb),
+            modifier = Modifier.fillMaxWidth(),
+            isValid = ::validHost,
+            keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
+            keyboardType = KeyboardType.Text,
+          )
+          DefaultConfigurableTextField(
+            portUnsaved,
+            stringResource(MR.strings.port_verb),
+            modifier = Modifier.fillMaxWidth(),
+            isValid = ::validPort,
+            keyboardActions = KeyboardActions(onDone = { defaultKeyboardAction(ImeAction.Done); save(false) }),
+            keyboardType = KeyboardType.Number,
+          )
+        }
+
+        UseOnionHosts(onionHosts, rememberUpdatedState(networkUseSocksProxy && proxyAuthRandomUnsaved.value)) {
+          onionHosts.value = it
+        }
+        SectionTextFooter(annotatedStringResource(MR.strings.disable_onion_hosts_when_not_supported))
       }
 
-      SectionDividerSpaced(maxBottomPadding = false)
+      SectionDividerSpaced(maxTopPadding = true)
+
+      SectionView(stringResource(MR.strings.network_proxy_auth).uppercase()) {
+        PreferenceToggle(
+          stringResource(MR.strings.network_proxy_random_credentials),
+          checked = proxyAuthRandomUnsaved.value,
+          onChange = { proxyAuthRandomUnsaved.value = it }
+        )
+        if (!proxyAuthRandomUnsaved.value) {
+          Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
+            DefaultConfigurableTextField(
+              usernameUnsaved,
+              stringResource(MR.strings.network_proxy_username),
+              modifier = Modifier.fillMaxWidth(),
+              isValid = ::validCredential,
+              keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
+              keyboardType = KeyboardType.Text,
+            )
+            DefaultConfigurableTextField(
+              passwordUnsaved,
+              stringResource(MR.strings.network_proxy_password),
+              modifier = Modifier.fillMaxWidth(),
+              isValid = ::validCredential,
+              keyboardActions = KeyboardActions(onNext = { defaultKeyboardAction(ImeAction.Next) }),
+              keyboardType = KeyboardType.Password,
+            )
+          }
+        }
+        SectionTextFooter(proxyAuthFooter(usernameUnsaved.value.text, passwordUnsaved.value.text, proxyAuthModeUnsaved.value, sessionMode))
+      }
+
+      SectionDividerSpaced(maxBottomPadding = false, maxTopPadding = true)
 
       SectionView {
         SectionItemView({
-          val newHost = defaultHostPort.split(":").first()
-          val newPort = defaultHostPort.split(":").last()
-          hostUnsaved.value = hostUnsaved.value.copy(newHost, TextRange(newHost.length))
-          portUnsaved.value = portUnsaved.value.copy(newPort, TextRange(newPort.length))
+          hostUnsaved.value = hostUnsaved.value.copy("localhost", TextRange(9))
+          portUnsaved.value = portUnsaved.value.copy("9050", TextRange(4))
+          usernameUnsaved.value = TextFieldValue()
+          passwordUnsaved.value = TextFieldValue()
+          proxyAuthRandomUnsaved.value = true
+          onionHosts.value = NetCfg.defaults.onionHosts
         }, disabled = resetDisabled) {
           Text(stringResource(MR.strings.network_options_reset_to_defaults), color = if (resetDisabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
         }
         SectionItemView(
-          click = { if (networkUseSocksProxy && !migration) showUpdateNetworkSettingsDialog { save() } else save() },
+          click = { if (networkUseSocksProxy && !migration) showUpdateNetworkSettingsDialog { save(false) } else save(false) },
           disabled = saveDisabled
         ) {
           Text(stringResource(if (networkUseSocksProxy && !migration) MR.strings.network_options_save_and_reconnect else MR.strings.network_options_save), color = if (saveDisabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
@@ -305,6 +393,12 @@ fun SocksProxySettings(
   }
 }
 
+private fun proxyAuthFooter(username: String, password: String, auth: NetworkProxyAuth, sessionMode: TransportSessionMode): String = when {
+  auth == NetworkProxyAuth.ISOLATE -> generalGetString(if (sessionMode == TransportSessionMode.User) MR.strings.network_proxy_auth_mode_isolate_by_auth_user else MR.strings.network_proxy_auth_mode_isolate_by_auth_entity)
+  username.isBlank() && password.isBlank() -> generalGetString(MR.strings.network_proxy_auth_mode_no_auth)
+  else -> generalGetString(MR.strings.network_proxy_auth_mode_username_password)
+}
+
 private fun showUnsavedSocksHostPortAlert(confirmText: String, save: () -> Unit, close: () -> Unit) {
   AlertManager.shared.showAlertDialogStacked(
     title = generalGetString(MR.strings.update_network_settings_question),
@@ -319,7 +413,6 @@ private fun showUnsavedSocksHostPortAlert(confirmText: String, save: () -> Unit,
 fun UseOnionHosts(
   onionHosts: MutableState<OnionHosts>,
   enabled: State<Boolean>,
-  showModal: (@Composable ModalData.() -> Unit) -> Unit,
   useOnion: (OnionHosts) -> Unit,
 ) {
   val values = remember {
@@ -331,36 +424,29 @@ fun UseOnionHosts(
       }
     }
   }
-  val onSelected = {
-    showModal {
-      ColumnWithScrollBar(
-        Modifier.fillMaxWidth(),
-      ) {
-        AppBarTitle(stringResource(MR.strings.network_use_onion_hosts))
-        SectionViewSelectable(null, onionHosts, values, useOnion)
-      }
-    }
-  }
 
-  if (enabled.value) {
-    SectionItemWithValue(
-      generalGetString(MR.strings.network_use_onion_hosts),
-      onionHosts,
-      values,
-      icon = painterResource(MR.images.ic_security),
-      enabled = enabled,
-      onSelected = onSelected
-    )
-  } else {
-    // In reality, when socks proxy is disabled, this option acts like NEVER regardless of what was chosen before
-    SectionItemWithValue(
-      generalGetString(MR.strings.network_use_onion_hosts),
-      remember { mutableStateOf(OnionHosts.NEVER) },
-      listOf(ValueTitleDesc(OnionHosts.NEVER, generalGetString(MR.strings.network_use_onion_hosts_no), AnnotatedString(generalGetString(MR.strings.network_use_onion_hosts_no_desc)))),
-      icon = painterResource(MR.images.ic_security),
-      enabled = enabled,
-      onSelected = {}
-    )
+  Column {
+    if (enabled.value) {
+      ExposedDropDownSettingRow(
+        generalGetString(MR.strings.network_use_onion_hosts),
+        values.map { it.value to it.title },
+        onionHosts,
+        icon = painterResource(MR.images.ic_security),
+        enabled = enabled,
+        onSelected = useOnion
+      )
+    } else {
+      // In reality, when socks proxy is disabled, this option acts like NEVER regardless of what was chosen before
+      ExposedDropDownSettingRow(
+        generalGetString(MR.strings.network_use_onion_hosts),
+        listOf(OnionHosts.NEVER to generalGetString(MR.strings.network_use_onion_hosts_no)),
+        remember { mutableStateOf(OnionHosts.NEVER) },
+        icon = painterResource(MR.images.ic_security),
+        enabled = enabled,
+        onSelected = {}
+      )
+    }
+    SectionTextFooter(values.first { it.value == onionHosts.value }.description)
   }
 }
 
@@ -398,12 +484,8 @@ fun SessionModePicker(
   )
 }
 
-// https://stackoverflow.com/a/106223
-private fun validHost(s: String): Boolean {
-  val validIp = Regex("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])[.]){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$")
-  val validHostname = Regex("^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])[.])*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$");
-  return s.matches(validIp) || s.matches(validHostname)
-}
+private fun validHost(s: String): Boolean =
+  !s.contains('@')
 
 // https://ihateregex.io/expr/port/
 fun validPort(s: String): Boolean {
@@ -411,6 +493,16 @@ fun validPort(s: String): Boolean {
   return s.isNotBlank() && s.matches(validPort)
 }
 
+private fun validCredential(s: String): Boolean =
+  !s.contains(':') && !s.contains('@')
+
+fun showWrongProxyConfigAlert() {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(MR.strings.network_proxy_incorrect_config_title),
+    text = generalGetString(MR.strings.network_proxy_incorrect_config_desc),
+  )
+}
+
 fun showUpdateNetworkSettingsDialog(
   title: String,
   startsWith: String = "",
@@ -435,6 +527,7 @@ fun PreviewNetworkAndServersLayout() {
     NetworkAndServersLayout(
       currentRemoteHost = null,
       networkUseSocksProxy = remember { mutableStateOf(true) },
+      onionHosts = remember { mutableStateOf(OnionHosts.PREFER) },
       toggleSocksProxy = {},
     )
   }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt

@@ -1,12 +1,10 @@
 package chat.simplex.common.views.usersettings
 
 import SectionBottomSpacer
-import SectionCustomFooter
 import SectionDividerSpaced
 import SectionItemView
 import SectionTextFooter
 import SectionView
-import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
@@ -34,8 +32,6 @@ import chat.simplex.common.views.onboarding.ReadableText
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.*
-import kotlin.math.min
-import kotlin.math.roundToInt
 
 enum class LAMode {
   SYSTEM,
@@ -374,7 +370,8 @@ fun SimplexLockView(
   currentLAMode: SharedPreference<LAMode>,
   setPerformLA: (Boolean) -> Unit
 ) {
-  val performLA = remember { chatModel.performLA }
+  val showAuthScreen = remember { chatModel.showAuthScreen }
+  val performLA = remember { appPrefs.performLA.state }
   val laMode = remember { chatModel.controller.appPrefs.laMode.state }
   val laLockDelay = remember { chatModel.controller.appPrefs.laLockDelay }
   val showChangePasscode = remember { derivedStateOf { performLA.value && currentLAMode.state.value == LAMode.PASSCODE } }
@@ -382,13 +379,9 @@ fun SimplexLockView(
   val selfDestructDisplayName = remember { mutableStateOf(chatModel.controller.appPrefs.selfDestructDisplayName.get() ?: "") }
   val selfDestructDisplayNamePref = remember { chatModel.controller.appPrefs.selfDestructDisplayName }
 
-  fun resetLAEnabled(onOff: Boolean) {
-    chatModel.controller.appPrefs.performLA.set(onOff)
-    chatModel.performLA.value = onOff
-  }
-
   fun disableUnavailableLA() {
-    resetLAEnabled(false)
+    chatModel.controller.appPrefs.performLA.set(false)
+    chatModel.showAuthScreen.value = false
     currentLAMode.set(LAMode.default)
     laUnavailableInstructionAlert()
   }
@@ -405,7 +398,8 @@ fun SimplexLockView(
       } else {
         generalGetString(MR.strings.chat_lock)
       },
-      generalGetString(MR.strings.change_lock_mode)
+      generalGetString(MR.strings.change_lock_mode),
+      oneTime = true,
     ) { laResult ->
       when (laResult) {
         is LAResult.Error -> {
@@ -415,7 +409,7 @@ fun SimplexLockView(
         LAResult.Success -> {
           when (toLAMode) {
             LAMode.SYSTEM -> {
-              authenticate(generalGetString(MR.strings.auth_enable_simplex_lock), promptSubtitle = "", usingLAMode = toLAMode) { laResult ->
+              authenticate(generalGetString(MR.strings.auth_enable_simplex_lock), promptSubtitle = "", usingLAMode = toLAMode, oneTime = true) { laResult ->
                 when (laResult) {
                   LAResult.Success -> {
                     currentLAMode.set(toLAMode)
@@ -451,7 +445,7 @@ fun SimplexLockView(
   }
 
   fun toggleSelfDestruct(selfDestruct: SharedPreference<Boolean>) {
-    authenticate(generalGetString(MR.strings.la_current_app_passcode), generalGetString(MR.strings.change_self_destruct_mode)) { laResult ->
+    authenticate(generalGetString(MR.strings.la_current_app_passcode), generalGetString(MR.strings.change_self_destruct_mode), oneTime = true) { laResult ->
       when (laResult) {
         is LAResult.Error -> laFailedAlert()
         is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
@@ -470,7 +464,7 @@ fun SimplexLockView(
   }
 
   fun changeLAPassword() {
-    authenticate(generalGetString(MR.strings.la_current_app_passcode), generalGetString(MR.strings.la_change_app_passcode)) { laResult ->
+    authenticate(generalGetString(MR.strings.la_current_app_passcode), generalGetString(MR.strings.la_change_app_passcode), oneTime = true) { laResult ->
       when (laResult) {
         LAResult.Success -> {
           ModalManager.fullscreen.showCustomModal { close ->
@@ -494,7 +488,7 @@ fun SimplexLockView(
   }
 
   fun changeSelfDestructPassword() {
-    authenticate(generalGetString(MR.strings.la_current_app_passcode), generalGetString(MR.strings.change_self_destruct_passcode)) { laResult ->
+    authenticate(generalGetString(MR.strings.la_current_app_passcode), generalGetString(MR.strings.change_self_destruct_passcode), oneTime = true) { laResult ->
       when (laResult) {
         LAResult.Success -> {
           ModalManager.fullscreen.showCustomModal { close ->
@@ -525,8 +519,8 @@ fun SimplexLockView(
   ) {
     AppBarTitle(stringResource(MR.strings.chat_lock))
     SectionView {
-      EnableLock(performLA) { performLAToggle ->
-        performLA.value = performLAToggle
+      EnableLock(remember { appPrefs.performLA.state }) { performLAToggle ->
+        showAuthScreen.value = performLAToggle
         chatModel.controller.appPrefs.laNoticeShown.set(true)
         if (performLAToggle) {
           when (currentLAMode.state.value) {
@@ -543,7 +537,9 @@ fun SimplexLockView(
                       passcodeAlert(generalGetString(MR.strings.passcode_set))
                     },
                     cancel = {
-                      resetLAEnabled(false)
+                      chatModel.showAuthScreen.value = false
+                      // Don't drop auth pref in case of state inconsistency (eg, you have set passcode but somehow bypassed toggle and turned it off and then on)
+                      // chatModel.controller.appPrefs.performLA.set(false)
                     },
                     close = close
                   )
@@ -660,7 +656,7 @@ private fun EnableSelfDestruct(
 }
 
 @Composable
-private fun EnableLock(performLA: MutableState<Boolean>, onCheckedChange: (Boolean) -> Unit) {
+private fun EnableLock(performLA: State<Boolean>, onCheckedChange: (Boolean) -> Unit) {
   SectionItemView {
     Row(verticalAlignment = Alignment.CenterVertically) {
       Text(

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SettingsView.kt

@@ -22,6 +22,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.CreateProfile
@@ -234,7 +235,7 @@ fun ChatLockItem(
   showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
   setPerformLA: (Boolean) -> Unit
 ) {
-  val performLA = remember { ChatModel.performLA }
+  val performLA = remember { appPrefs.performLA.state }
   val currentLAMode = remember { ChatModel.controller.appPrefs.laMode }
   SettingsActionItemWithContent(
     click = showSettingsModal { SimplexLockView(ChatModel, currentLAMode, setPerformLA) },
@@ -505,6 +506,7 @@ private fun runAuth(title: String, desc: String, onFinish: (success: Boolean) ->
   authenticate(
     title,
     desc,
+    oneTime = true,
     completed = { laResult ->
       onFinish(laResult == LAResult.Success || laResult is LAResult.Unavailable)
     }