Merge branch 'master' into master-android

* Revert "raise lower bound on mtl to a real version (#3499)"

This reverts commit f94c0311c1.

* Revert "core: expand ranges to fit ghc 8.10 & 9.6 (#3496)"

This reverts commit 9a1c7f41f7.

* update simplexmq

* remove netword-transport fork

* compatibility with GHC 8.10.7

* simplexmq

* fix test

* simplexmq, deps

* update sqlcipher deps in sha256nix

* fix index-state in cabal.project

* index-state

* remove import

* add cabal.project.freeze

* simplexmq

* remove freeze

* simplexmq

* bytestring,simplexmq

* template-haskell, simplexmq

* simplexmq

* simplexmq

* simplexmq

* mtl

* simplexmq

* remove duplicate index-state

.github/workflows/build.yml

@@ -5,22 +5,12 @@ 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:

apps/ios/Shared/AppDelegate.swift

@@ -15,12 +15,31 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         logger.debug("AppDelegate: didFinishLaunchingWithOptions")
         application.registerForRemoteNotifications()
+        if #available(iOS 17.0, *) { trackKeyboard() }
         NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
         removePasscodesIfReinstalled()
         prepareForLaunch()
         return true
     }
 
+    @available(iOS 17.0, *)
+    private func trackKeyboard() {
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
+    }
+
+    @available(iOS 17.0, *)
+    @objc func keyboardWillShow(_ notification: Notification) {
+        if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
+            ChatModel.shared.keyboardHeight = keyboardFrame.cgRectValue.height
+        }
+    }
+
+    @available(iOS 17.0, *)
+    @objc func keyboardWillHide(_ notification: Notification) {
+        ChatModel.shared.keyboardHeight = 0
+    }
+
     @objc func pasteboardChanged() {
         ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
     }

apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,33 +1,153 @@
 {
   "images" : [
     {
-      "filename" : "any.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+      "filename" : "40.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "dark.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+      "filename" : "60.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "tinted"
-        }
-      ],
-      "filename" : "tinted.png",
-      "idiom" : "universal",
-      "platform" : "ios",
+      "filename" : "29.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "87.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "80.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "57.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "114.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "20.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "40.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "29.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "40.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "80.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "50.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "50x50"
+    },
+    {
+      "filename" : "100.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "50x50"
+    },
+    {
+      "filename" : "72.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "144.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "76.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "152.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "167.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
       "size" : "1024x1024"
     }
   ],

apps/ios/Shared/Assets.xcassets/DarkAppIcon.appiconset/Contents.json

@@ -1,9 +1,153 @@
 {
   "images" : [
+    {
+      "filename" : "40.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "60.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "29.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "87.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "80.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "57.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "114.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "20.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "40.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "29.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "40.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "80.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "50.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "50x50"
+    },
+    {
+      "filename" : "100.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "50x50"
+    },
+    {
+      "filename" : "72.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "144.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "76.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "152.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "167.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
     {
       "filename" : "1024.png",
-      "idiom" : "universal",
-      "platform" : "ios",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
       "size" : "1024x1024"
     }
   ],

apps/ios/Shared/ContentView.swift

@@ -36,7 +36,7 @@ struct ContentView: View {
     @State private var waitingForOrPassedAuth = true
     @State private var chatListActionSheet: ChatListActionSheet? = nil
 
-    private let callTopPadding: CGFloat = 40
+    private let callTopPadding: CGFloat = 50
 
     private enum ChatListActionSheet: Identifiable {
         case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
@@ -151,12 +151,12 @@ struct ContentView: View {
             }
         }
         .onAppear {
-            reactOnDarkThemeChanges(systemInDarkThemeCurrently)
+            reactOnDarkThemeChanges()
         }
         .onChange(of: colorScheme) { scheme in
             // It's needed to update UI colors when iOS wants to make screenshot after going to background,
             // so when a user changes his global theme from dark to light or back, the app will adapt to it
-            reactOnDarkThemeChanges(scheme == .dark)
+            reactOnDarkThemeChanges()
         }
         .onChange(of: theme.name) { _ in
             ThemeManager.adjustWindowStyle()
@@ -207,7 +207,7 @@ struct ContentView: View {
             CallDuration(call: call)
         }
         .padding(.horizontal)
-        .frame(height: callTopPadding)
+        .frame(height: callTopPadding - 10)
         .background(Color(uiColor: UIColor(red: 47/255, green: 208/255, blue: 88/255, alpha: 1)))
         .onTapGesture {
             chatModel.activeCallViewIsCollapsed = false

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
@@ -151,7 +143,7 @@ final class ChatModel: ObservableObject {
     @Published var contentViewAccessAuthenticated: Bool = false
     @Published var laRequest: LocalAuthRequest?
     // list of chat "previews"
-    @Published private(set) var chats: [Chat] = []
+    @Published var chats: [Chat] = []
     @Published var deletedChats: Set<String> = []
     // current chat
     @Published var chatId: String?
@@ -191,6 +183,8 @@ final class ChatModel: ObservableObject {
     @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
     @Published var draft: ComposeState?
     @Published var draftChatId: String?
+    // tracks keyboard height via subscription in AppDelegate
+    @Published var keyboardHeight: CGFloat = 0
     @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
     @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)
 
@@ -365,8 +359,25 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateChats(_ newChats: [ChatData]) {
-        chats = newChats.map { Chat($0) }
+    func updateChats(with newChats: [ChatData]) {
+        for i in 0..<newChats.count {
+            let c = newChats[i]
+            if let j = getChatIndex(c.id)   {
+                let chat = chats[j]
+                chat.chatInfo = c.chatInfo
+                chat.chatItems = c.chatItems
+                chat.chatStats = c.chatStats
+                if i != j {
+                    if chatId != c.chatInfo.id  {
+                        popChat_(j, to: i)
+                    }  else if i == 0 {
+                        chatToTop = c.chatInfo.id
+                    }
+                }
+            } else {
+                addChat_(Chat(c), at: i)
+            }
+        }
         NtfManager.shared.setNtfBadgeCount(totalUnreadCountForAllUsers())
         popChatCollector.clear()
     }
@@ -436,17 +447,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
         }
 
@@ -888,6 +901,35 @@ final class ChatModel: ObservableObject {
             _ = upsertGroupMember(groupInfo, updatedMember)
         }
     }
+
+    func unreadChatItemCounts(itemsInView: Set<String>) -> UnreadChatItemCounts {
+        var i = 0
+        var totalBelow = 0
+        var unreadBelow = 0
+        while i < im.reversedChatItems.count - 1 && !itemsInView.contains(im.reversedChatItems[i].viewId) {
+            totalBelow += 1
+            if im.reversedChatItems[i].isRcvNew {
+                unreadBelow += 1
+            }
+            i += 1
+        }
+        return UnreadChatItemCounts(
+            // TODO these thresholds account for the fact that items are still "visible" while
+            // covered by compose area, they should be replaced with the actual height in pixels below the screen.
+            isNearBottom: totalBelow < 15,
+            isReallyNearBottom: totalBelow < 2,
+            unreadBelow: unreadBelow
+        )
+    }
+
+    func topItemInView(itemsInView: Set<String>) -> ChatItem? {
+        let maxIx = im.reversedChatItems.count - 1
+        var i = 0
+        let inView = { itemsInView.contains(self.im.reversedChatItems[$0].viewId) }
+        while i < maxIx && !inView(i) { i += 1 }
+        while i < maxIx && inView(i) { i += 1 }
+        return im.reversedChatItems[min(i - 1, maxIx)]
+    }
 }
 
 struct ShowingInvitation {
@@ -900,6 +942,12 @@ struct NTFContactRequest {
     var chatId: String
 }
 
+struct UnreadChatItemCounts: Equatable {
+    var isNearBottom: Bool
+    var isReallyNearBottom: Bool
+    var unreadBelow: Int
+}
+
 final class Chat: ObservableObject, Identifiable, ChatLike {
     @Published var chatInfo: ChatInfo
     @Published var chatItems: [ChatItem]

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -112,9 +112,9 @@ func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? =
     return resp
 }
 
-func chatSendCmd(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil, log: Bool = true) async -> ChatResponse {
+func chatSendCmd(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil) async -> ChatResponse {
     await withCheckedContinuation { cont in
-        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl, log: log))
+        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl))
     }
 }
 
@@ -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))"
@@ -585,13 +582,13 @@ func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) throws -> (Gro
     throw r
 }
 
-func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
+func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, QueueInfo) {
     let r = await chatSendCmd(.apiContactQueueInfo(contactId: contactId))
     if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
     throw r
 }
 
-func apiGroupMemberQueueInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
+func apiGroupMemberQueueInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (RcvMsgInfo?, QueueInfo) {
     let r = await chatSendCmd(.apiGroupMemberQueueInfo(groupId: groupId, groupMemberId: groupMemberId))
     if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
     throw 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))
@@ -1228,18 +1218,12 @@ func apiEndCall(_ contact: Contact) async throws {
     try await sendCommandOkResp(.apiEndCall(contact: contact))
 }
 
-func apiGetCallInvitationsSync() throws -> [RcvCallInvitation] {
+func apiGetCallInvitations() throws -> [RcvCallInvitation] {
     let r = chatSendCmdSync(.apiGetCallInvitations)
     if case let .callInvitations(invs) = r { return invs }
     throw r
 }
 
-func apiGetCallInvitations() async throws -> [RcvCallInvitation] {
-    let r = await chatSendCmd(.apiGetCallInvitations)
-    if case let .callInvitations(invs) = r { return invs }
-    throw r
-}
-
 func apiCallStatus(_ contact: Contact, _ status: String) async throws {
     if let callStatus = WebRTCCallStatus.init(rawValue: status) {
         try await sendCommandOkResp(.apiCallStatus(contact: contact, callStatus: callStatus))
@@ -1436,9 +1420,9 @@ func apiGetVersion() throws -> CoreVersionInfo {
     throw r
 }
 
-func getAgentSubsTotal() async throws -> (SMPServerSubs, Bool) {
+func getAgentSubsTotal() throws -> (SMPServerSubs, Bool) {
     let userId = try currentUserId("getAgentSubsTotal")
-    let r = await chatSendCmd(.getAgentSubsTotal(userId: userId), log: false)
+    let r = chatSendCmdSync(.getAgentSubsTotal(userId: userId), log: false)
     if case let .agentSubsTotal(_, subsTotal, hasSession) = r { return (subsTotal, hasSession) }
     logger.error("getAgentSubsTotal error: \(String(describing: r))")
     throw r
@@ -1533,7 +1517,7 @@ func startChat(refreshInvitations: Bool = true) throws {
         try getUserChatData()
         NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
         if (refreshInvitations) {
-            Task { try await refreshCallInvitations() }
+            try refreshCallInvitations()
         }
         (m.savedToken, m.tokenStatus, m.notificationMode, m.notificationServer) = apiGetNtfToken()
         _ = try apiStartChat()
@@ -1607,7 +1591,8 @@ func getUserChatData() throws {
     m.userAddress = try apiGetUserAddress()
     m.chatItemTTL = try getChatItemTTL()
     let chats = try apiGetChats()
-    m.updateChats(chats)
+    m.chats = chats.map { Chat.init($0) }
+    m.popChatCollector.clear()
 }
 
 private func getUserChatDataAsync() async throws {
@@ -1619,12 +1604,14 @@ private func getUserChatDataAsync() async throws {
         await MainActor.run {
             m.userAddress = userAddress
             m.chatItemTTL = chatItemTTL
-            m.updateChats(chats)
+            m.chats = chats.map { Chat.init($0) }
+            m.popChatCollector.clear()
         }
     } else {
         await MainActor.run {
             m.userAddress = nil
-            m.updateChats([])
+            m.chats = []
+            m.popChatCollector.clear()
         }
     }
 }
@@ -1785,26 +1772,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 +1798,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):
@@ -2184,42 +2164,32 @@ func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
     }
 }
 
-func refreshCallInvitations() async throws {
+func refreshCallInvitations() throws {
     let m = ChatModel.shared
-    let callInvitations = try await apiGetCallInvitations()
-    await MainActor.run {
-        m.callInvitations = callsByChat(callInvitations)
-        if let (chatId, ntfAction) = m.ntfCallInvitationAction,
-           let invitation = m.callInvitations.removeValue(forKey: chatId) {
-            m.ntfCallInvitationAction = nil
-            CallController.shared.callAction(invitation: invitation, action: ntfAction)
-        } else if let invitation = callInvitations.last(where: { $0.user.showNotifications }) {
-            activateCall(invitation)
-        }
+    let callInvitations = try justRefreshCallInvitations()
+    if let (chatId, ntfAction) = m.ntfCallInvitationAction,
+       let invitation = m.callInvitations.removeValue(forKey: chatId) {
+        m.ntfCallInvitationAction = nil
+        CallController.shared.callAction(invitation: invitation, action: ntfAction)
+    } else if let invitation = callInvitations.last(where: { $0.user.showNotifications }) {
+        activateCall(invitation)
     }
 }
 
-func justRefreshCallInvitations() async throws {
-    let callInvitations = try apiGetCallInvitationsSync()
-    await MainActor.run {
-        ChatModel.shared.callInvitations = callsByChat(callInvitations)
-    }
-}
-
-private func callsByChat(_ callInvitations: [RcvCallInvitation]) -> [ChatId: RcvCallInvitation] {
-    callInvitations.reduce(into: [ChatId: RcvCallInvitation]()) {
-        result, inv in result[inv.contact.id] = inv
-    }
+func justRefreshCallInvitations() throws -> [RcvCallInvitation] {
+    let m = ChatModel.shared
+    let callInvitations = try apiGetCallInvitations()
+    m.callInvitations = callInvitations.reduce(into: [ChatId: RcvCallInvitation]()) { result, inv in result[inv.contact.id] = inv }
+    return callInvitations
 }
 
 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]?.callUUID = nil
+                m.callInvitations[callInvitation.contact.id]?.callkitUUID = nil
             }
             logger.error("reportNewIncomingCall error: \(error.localizedDescription)")
         } else {

apps/ios/Shared/SimpleXApp.swift

@@ -83,11 +83,9 @@ struct SimpleXApp: App {
                         if appState != .stopped {
                             startChatAndActivate {
                                 if appState.inactive && chatModel.chatRunning == true {
-                                    Task {
-                                        await updateChats()
-                                        if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                            await updateCallInvitations()
-                                        }
+                                    updateChats()
+                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                        updateCallInvitations()
                                     }
                                 }
                             }
@@ -132,16 +130,16 @@ struct SimpleXApp: App {
         }
     }
 
-    private func updateChats() async {
+    private func updateChats() {
         do {
-            let chats = try await apiGetChatsAsync()
-            await MainActor.run { chatModel.updateChats(chats) }
+            let chats = try apiGetChats()
+            chatModel.updateChats(with: chats)
             if let id = chatModel.chatId,
                let chat = chatModel.getChat(id) {
                 Task { await loadChat(chat: chat, clearItems: false) }
             }
             if let ncr = chatModel.ntfContactRequest {
-                await MainActor.run { chatModel.ntfContactRequest = nil }
+                chatModel.ntfContactRequest = nil
                 if case let .contactRequest(contactRequest) = chatModel.getChat(ncr.chatId)?.chatInfo {
                     Task { await acceptContactRequest(incognito: ncr.incognito, contactRequest: contactRequest) }
                 }
@@ -151,9 +149,9 @@ struct SimpleXApp: App {
         }
     }
 
-    private func updateCallInvitations() async {
+    private func updateCallInvitations() {
         do {
-            try await refreshCallInvitations()
+            try refreshCallInvitations()
         } catch let error {
             logger.error("apiGetCallInvitations: cannot update call invitations \(responseError(error))")
         }

apps/ios/Shared/Theme/Theme.swift

@@ -91,8 +91,8 @@ var systemInDarkThemeCurrently: Bool {
     return UITraitCollection.current.userInterfaceStyle == .dark
 }
 
-func reactOnDarkThemeChanges(_ inDarkNow: Bool) {
-    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.colors.isLight == inDarkNow {
+func reactOnDarkThemeChanges() {
+    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.colors.isLight == systemInDarkThemeCurrently {
         // Change active colors from light to dark and back based on system theme
         ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
     }

apps/ios/Shared/Theme/ThemeManager.swift

@@ -53,7 +53,7 @@ class ThemeManager {
             return perUserTheme
         }
         let defaultTheme = defaultActiveTheme(appSettingsTheme)
-        return ThemeModeOverride(mode: CurrentColors.base.mode, colors: defaultTheme?.colors ?? ThemeColors(), wallpaper: defaultTheme?.wallpaper ?? ThemeWallpaper.from(PresetWallpaper.school.toType(CurrentColors.base), nil, nil))
+        return ThemeModeOverride(mode: CurrentColors.base.mode, colors: defaultTheme?.colors ?? ThemeColors(), wallpaper: defaultTheme?.wallpaper)
     }
 
     static func currentColors(_ themeOverridesForType: WallpaperType?, _ perChatTheme: ThemeModeOverride?, _ perUserTheme: ThemeModeOverrides?, _ appSettingsTheme: [ThemeOverrides]) -> ActiveTheme {

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.callUUID {
+                if let uuid = call.callkitUUID {
                     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.callUUID {
+            if let uuid = call.callkitUUID {
                 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, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, localMedia: .video), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .video), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
                 .background(.black)
-            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)))
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), 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.uuidString.lowercased()) {
+        if callManager.startOutgoingCall(callUUID: action.callUUID) {
             action.fulfill()
             provider.reportOutgoingCall(with: action.callUUID, startedConnectingAt: nil)
         } else {
@@ -61,30 +61,12 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
         logger.debug("CallController.provider CXAnswerCallAction")
-        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()
-                }
-            }
+        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()
         }
     }
 
@@ -93,7 +75,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.uuidString.lowercased()) { ok in
+        callManager.endCall(callUUID: action.callUUID) { ok in
             if ok {
                 action.fulfill()
             } else {
@@ -104,7 +86,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.uuidString.lowercased()) {
+        if callManager.enableMedia(media: .audio, enable: !action.isMuted, callUUID:  action.callUUID) {
             action.fulfill()
         } else {
             action.fail()
@@ -174,19 +156,6 @@ 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)")
@@ -202,19 +171,32 @@ 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 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 {
+           let invitation = m.callInvitations[contactId] {
+            let update = self.cxCallUpdate(invitation: invitation)
+            if let uuid = invitation.callkitUUID {
                 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)
@@ -223,31 +205,11 @@ 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,
@@ -277,8 +239,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     }
 
     func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callUUID))")
-        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID))")
+        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
             if invitation.callTs.timeIntervalSinceNow >= -180 {
                 let update = cxCallUpdate(invitation: invitation)
                 provider.reportNewIncomingCall(with: uuid, update: update, completion: completion)
@@ -299,14 +261,6 @@ 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() {
@@ -318,14 +272,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 callUUID = call.callUUID, let uuid = UUID(uuidString: callUUID) {
+        if CallController.useCallKit(), let uuid = call.callkitUUID {
             provider.reportOutgoingCall(with: uuid, connectedAt: dateConnected)
         }
     }
 
     func reportCallRemoteEnded(invitation: RcvCallInvitation) {
         logger.debug("CallController: reporting remote ended")
-        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
+        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
             provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
         } else if invitation.contact.id == activeCallInvitation?.contact.id {
             activeCallInvitation = nil
@@ -334,17 +288,14 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func reportCallRemoteEnded(call: Call) {
         logger.debug("CallController: reporting remote ended")
-        if CallController.useCallKit(), let callUUID = call.callUUID, let uuid = UUID(uuidString: callUUID) {
+        if CallController.useCallKit(), let uuid = call.callkitUUID {
             provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
         }
     }
 
     func startCall(_ contact: Contact, _ media: CallMediaType) {
         logger.debug("CallController.startCall")
-        let callUUID = callManager.newOutgoingCall(contact, media)
-        guard let uuid = UUID(uuidString: callUUID) else {
-            return
-        }
+        let uuid = callManager.newOutgoingCall(contact, media)
         if CallController.useCallKit() {
             let handle = CXHandle(type: .generic, value: contact.id)
             let action = CXStartCallAction(call: uuid, handle: handle)
@@ -356,8 +307,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                 update.localizedCallerName = contact.displayName
                 self.provider.reportCall(with: uuid, updated: update)
             }
-        } else if callManager.startOutgoingCall(callUUID: callUUID) {
-            if callManager.startOutgoingCall(callUUID: callUUID) {
+        } else if callManager.startOutgoingCall(callUUID: uuid) {
+            if callManager.startOutgoingCall(callUUID: uuid) {
                 logger.debug("CallController.startCall: call started")
             } else {
                 logger.error("CallController.startCall: no active call")
@@ -367,8 +318,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func answerCall(invitation: RcvCallInvitation) {
         logger.debug("CallController: answering a call")
-        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
-            requestTransaction(with: CXAnswerCallAction(call: uuid))
+        if CallController.useCallKit(), let callUUID = invitation.callkitUUID {
+            requestTransaction(with: CXAnswerCallAction(call: callUUID))
         } else {
             callManager.answerIncomingCall(invitation: invitation)
         }
@@ -377,13 +328,10 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         }
     }
 
-    func endCall(callUUID: String) {
-        let uuid = UUID(uuidString: callUUID)
-        logger.debug("CallController: ending the call with UUID \(callUUID)")
+    func endCall(callUUID: UUID) {
+        logger.debug("CallController: ending the call with UUID \(callUUID.uuidString)")
         if CallController.useCallKit() {
-            if let uuid {
-                requestTransaction(with: CXEndCallAction(call: uuid))
-            }
+            requestTransaction(with: CXEndCallAction(call: callUUID))
         } 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) -> String {
-        let uuid = UUID().uuidString.lowercased()
-        let call = Call(direction: .outgoing, contact: contact, callUUID: uuid, callState: .waitCapabilities, localMedia: media)
+    func newOutgoingCall(_ contact: Contact, _ media: CallMediaType) -> UUID {
+        let uuid = UUID()
+        let call = Call(direction: .outgoing, contact: contact, callkitUUID: uuid, callState: .waitCapabilities, localMedia: media)
         call.speakerEnabled = media == .video
         ChatModel.shared.activeCall = call
         return uuid
     }
 
-    func startOutgoingCall(callUUID: String) -> Bool {
+    func startOutgoingCall(callUUID: UUID) -> Bool {
         let m = ChatModel.shared
-        if let call = m.activeCall, call.callUUID == callUUID {
+        if let call = m.activeCall, call.callkitUUID == 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: String) -> Bool {
+    func answerIncomingCall(callUUID: UUID) -> 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,
-            callUUID: invitation.callUUID,
+            callkitUUID: invitation.callkitUUID,
             callState: .invitationAccepted,
             localMedia: invitation.callType.media,
             sharedKey: invitation.sharedKey
@@ -68,8 +68,8 @@ class CallManager {
         }
     }
 
-    func enableMedia(media: CallMediaType, enable: Bool, callUUID: String) -> Bool {
-        if let call = ChatModel.shared.activeCall, call.callUUID == callUUID {
+    func enableMedia(media: CallMediaType, enable: Bool, callUUID: UUID) -> Bool {
+        if let call = ChatModel.shared.activeCall, call.callkitUUID == 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: String, completed: @escaping (Bool) -> Void) {
-        if let call = ChatModel.shared.activeCall, call.callUUID == callUUID {
+    func endCall(callUUID: UUID, completed: @escaping (Bool) -> Void) {
+        if let call = ChatModel.shared.activeCall, call.callkitUUID == 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: String) -> RcvCallInvitation? {
-        if let (_, invitation) = ChatModel.shared.callInvitations.first(where: { (_, inv) in inv.callUUID == callUUID }) {
+    private func getCallInvitation(_ callUUID: UUID) -> RcvCallInvitation? {
+        if let (_, invitation) = ChatModel.shared.callInvitations.first(where: { (_, inv) in inv.callkitUUID == 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 callUUID: String?
+    var callkitUUID: UUID?
     var localMedia: CallMediaType
     @Published var callState: CallState
     @Published var localCapabilities: CallCapabilities?
@@ -33,14 +33,14 @@ class Call: ObservableObject, Equatable {
     init(
         direction: CallDirection,
         contact: Contact,
-        callUUID: String?,
+        callkitUUID: UUID?,
         callState: CallState,
         localMedia: CallMediaType,
         sharedKey: String? = nil
     ) {
         self.direction = direction
         self.contact = contact
-        self.callUUID = callUUID
+        self.callkitUUID = callkitUUID
         self.callState = callState
         self.localMedia = localMedia
         self.sharedKey = sharedKey

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

@@ -411,15 +411,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     }
 
     func endCall() {
-        if #available(iOS 16.0, *) {
-            _endCall()
-        } else {
-            // Fixes `connection.close()` getting locked up in iOS15
-            DispatchQueue.global(qos: .utility).async { self._endCall() }
-        }
-    }
-
-    private func _endCall() {
         guard let call = activeCall.wrappedValue else { return }
         logger.debug("WebRTCClient: ending the call")
         activeCall.wrappedValue = nil

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

@@ -671,14 +671,7 @@ private struct CallButton: View {
 
         InfoViewButton(image: image, title: title, disabledLook: !canCall, width: width) {
             if canCall {
-                if CallController.useCallKit() {
-                    CallController.shared.startCall(contact, mediaType)
-                } else {
-                    // When CallKit is not used, colorscheme will be changed and it will be visible if not hiding sheets first
-                    dismissAllSheets(animated: true) {
-                        CallController.shared.startCall(contact, mediaType)
-                    }
-                }
+                CallController.shared.startCall(contact, mediaType)
             } else if contact.nextSendGrpInv {
                 showAlert(SomeAlert(
                     alert: mkAlert(
@@ -942,7 +935,7 @@ func syncConnectionForceAlert(_ syncConnectionForce: @escaping () -> Void) -> Al
     )
 }
 
-func queueInfoText(_ info: (RcvMsgInfo?, ServerQueueInfo)) -> String {
+func queueInfoText(_ info: (RcvMsgInfo?, QueueInfo)) -> String {
     let (rcvMsgInfo, qInfo) = info
     var msgInfo: String
     if let rcvMsgInfo { msgInfo = encodeJSON(rcvMsgInfo) } else { msgInfo = "none" }

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 {
@@ -294,6 +294,7 @@ struct FramedItemView: View {
         .padding(.horizontal, 12)
         .overlay(DetermineWidth())
         .frame(minWidth: 0, alignment: .leading)
+        .textSelection(.enabled)
 
         if let mediaWidth = maxMediaWidth(), mediaWidth < maxWidth {
             v.frame(maxWidth: mediaWidth, alignment: .leading)

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()
@@ -53,6 +53,7 @@ struct ChatView: View {
         if #available(iOS 16.0, *) {
             viewBody
                 .scrollDismissesKeyboard(.immediately)
+                .keyboardPadding()
                 .toolbarBackground(.hidden, for: .navigationBar)
         } else {
             viewBody
@@ -76,8 +77,7 @@ struct ChatView: View {
             VStack(spacing: 0) {
                 ZStack(alignment: .bottomTrailing) {
                     chatItemsList()
-                    // TODO: Extract into a separate view, to reduce the scope of `FloatingButtonModel` updates
-                    floatingButtons(unreadBelow: floatingButtonModel.unreadBelow, isNearBottom: floatingButtonModel.isNearBottom)
+                    floatingButtons(counts: floatingButtonModel.unreadChatItemCounts)
                 }
                 connectingText()
                 if selectedChatItems == nil {
@@ -414,6 +414,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)
@@ -424,10 +430,13 @@ 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
-                    if floatingButtonModel.isReallyNearBottom {
+                    if floatingButtonModel.unreadChatItemCounts.isReallyNearBottom {
                         scrollModel.scrollToBottom()
                     }
                 }
@@ -450,43 +459,57 @@ struct ChatView: View {
     }
 
     class FloatingButtonModel: ObservableObject {
-        static let shared = FloatingButtonModel()
-        @Published var unreadBelow: Int = 0
-        @Published var isNearBottom: Bool = true
-        var isReallyNearBottom: Bool { scrollOffset.value > 0 && scrollOffset.value < 500 }
-        let visibleItems = PassthroughSubject<[String], Never>()
-        let scrollOffset = CurrentValueSubject<Double, Never>(0)
+        private enum Event {
+            case appeared(String)
+            case disappeared(String)
+            case chatItemsChanged
+        }
+
+        @Published var unreadChatItemCounts: UnreadChatItemCounts
+
+        private let events = PassthroughSubject<Event, Never>()
         private var bag = Set<AnyCancellable>()
 
         init() {
-            visibleItems
+            unreadChatItemCounts = UnreadChatItemCounts(
+                isNearBottom: true,
+                isReallyNearBottom: true,
+                unreadBelow: 0
+            )
+            events
                 .receive(on: DispatchQueue.global(qos: .background))
-                .map { itemIds in
-                    if let viewId = itemIds.first,
-                       let index = ItemsModel.shared.reversedChatItems.firstIndex(where: { $0.viewId == viewId }) {
-                        ItemsModel.shared.reversedChatItems[..<index].reduce(into: 0) { unread, chatItem in
-                            if chatItem.isRcvNew { unread += 1 }
-                        }
-                    } else { 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()
-                .receive(on: DispatchQueue.main)
-                .assign(to: \.unreadBelow, on: self)
+                .throttle(for: .seconds(0.2), scheduler: DispatchQueue.main, latest: true)
+                .assign(to: \.unreadChatItemCounts, on: self)
                 .store(in: &bag)
+        }
 
-            scrollOffset
-                .map { $0 < 800 }
-                .removeDuplicates()
-                // Delay the state change until scroll to bottom animation is finished
-                .delay(for: 0.35, scheduler: DispatchQueue.main)
-                .assign(to: \.isNearBottom, on: self)
-                .store(in: &bag)
+        func appeared(viewId: String) {
+            events.send(.appeared(viewId))
+        }
+
+        func disappeared(viewId: String) {
+            events.send(.disappeared(viewId))
+        }
+
+        func chatItemsChanged() {
+            events.send(.chatItemsChanged)
         }
     }
 
-    private func floatingButtons(unreadBelow: Int, isNearBottom: Bool) -> some View {
+    private func floatingButtons(counts: UnreadChatItemCounts) -> some View {
         VStack {
-            let unreadAbove = chat.chatStats.unreadCount - unreadBelow
+            let unreadAbove = chat.chatStats.unreadCount - counts.unreadBelow
             if unreadAbove > 0 {
                 circleButton {
                     unreadCountText(unreadAbove)
@@ -507,16 +530,16 @@ struct ChatView: View {
                 }
             }
             Spacer()
-            if unreadBelow > 0 {
+            if counts.unreadBelow > 0 {
                 circleButton {
-                    unreadCountText(unreadBelow)
+                    unreadCountText(counts.unreadBelow)
                         .font(.callout)
                         .foregroundColor(theme.colors.primary)
                 }
                 .onTapGesture {
                     scrollModel.scrollToBottom()
                 }
-            } else if !isNearBottom {
+            } else if !counts.isNearBottom {
                 circleButton {
                     Image(systemName: "chevron.down")
                         .foregroundColor(theme.colors.primary)
@@ -546,8 +569,8 @@ struct ChatView: View {
 
     private func endCallButton(_ call: Call) -> some View {
         Button {
-            if CallController.useCallKit(), let callUUID = call.callUUID {
-                CallController.shared.endCall(callUUID: callUUID)
+            if let uuid = call.callkitUUID {
+                CallController.shared.endCall(callUUID: uuid)
             } else {
                 CallController.shared.endCall(call: call) {}
             }
@@ -674,7 +697,6 @@ struct ChatView: 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
@@ -688,72 +710,38 @@ struct ChatView: View {
         @State private var showChatItemInfoSheet: Bool = false
         @State private var chatItemInfo: ChatItemInfo?
         @State private var showForwardingSheet: Bool = false
-        @State private var msgWidth: CGFloat = 0
-        
+
         @Binding var selectedChatItems: Set<Int64>?
 
         @State private var allowMenu: Bool = true
 
         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 {
-                            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)
-                            .padding(8)
-                        }
-                    }
+                    chatItemView(chatItem, range, prevItem)
                     .overlay {
                         if let selected = selectedChatItems, chatItem.canBeDeletedForSelf {
                             Color.clear
@@ -803,54 +791,8 @@ struct ChatView: View {
                 }
             }
         }
-        
 
-        @available(iOS 16.0, *)
-        struct MemberLayout: Layout {
-            let spacing: Double
-            let msgWidth: Double
-
-            private func sizes(subviews: Subviews, proposal: ProposedViewSize) -> (CGSize, CGSize) {
-                assert(subviews.count == 2, "member layout must contain exactly two subviews")
-                let roleSize = subviews[1].sizeThatFits(proposal)
-                let memberSize = subviews[0].sizeThatFits(
-                    ProposedViewSize(
-                        width: (proposal.width ?? msgWidth) - roleSize.width,
-                        height: proposal.height
-                    )
-                )
-                return (memberSize, roleSize)
-            }
-
-            func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) -> CGSize {
-                let (memberSize, roleSize) = sizes(subviews: subviews, proposal: proposal)
-                return CGSize(
-                    width: min(
-                        proposal.width ?? msgWidth,
-                        max(msgWidth, roleSize.width + spacing + memberSize.width)
-                    ),
-                    height: max(memberSize.height, roleSize.height)
-                )
-            }
-
-            func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) {
-                let (memberSize, roleSize) = sizes(subviews: subviews, proposal: proposal)
-                subviews[0].place(
-                    at: CGPoint(x: bounds.minX, y: bounds.midY - memberSize.height / 2),
-                    proposal: ProposedViewSize(memberSize)
-                )
-                subviews[1].place(
-                    at: CGPoint(
-                        x: bounds.minX + max(memberSize.width + spacing, msgWidth - roleSize.width),
-                        y: bounds.midY - roleSize.height / 2
-                    ),
-                    proposal: ProposedViewSize(roleSize)
-                )
-            }
-        }
-
-        @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) =
@@ -862,49 +804,24 @@ struct ChatView: View {
                 if prevItem == nil || showMemberImage(member, prevItem) || prevMember != nil {
                     VStack(alignment: .leading, spacing: 4) {
                         if ci.content.showMemberName {
-                            Group {
-                                if memCount == 1 && member.memberRole > .member {
-                                    Group {
-                                        if #available(iOS 16.0, *) {
-                                            MemberLayout(spacing: 16, msgWidth: msgWidth) {
-                                                Text(member.chatViewName)
-                                                    .lineLimit(1)
-                                                Text(member.memberRole.text)
-                                                    .fontWeight(.semibold)
-                                                    .lineLimit(1)
-                                                    .padding(.trailing, 8)
-                                            }
-                                        } else {
-                                            HStack(spacing: 16) {
-                                                Text(member.chatViewName)
-                                                    .lineLimit(1)
-                                                Text(member.memberRole.text)
-                                                    .fontWeight(.semibold)
-                                                    .lineLimit(1)
-                                                    .layoutPriority(1)
-                                            }
-                                        }
-                                    }
-                                    .frame(
-                                        maxWidth: maxWidth,
-                                        alignment: chatItem.chatDir.sent ? .trailing : .leading
-                                    )
-                                } else {
-                                    Text(memberNames(member, prevMember, memCount))
-                                        .lineLimit(2)
-                                }
+                            let t = if memCount == 1 && member.memberRole > .member {
+                                Text(member.memberRole.text + " ").fontWeight(.semibold) + Text(member.displayName)
+                            } else {
+                                Text(memberNames(member, prevMember, memCount))
                             }
+                            t
                                 .font(.caption)
                                 .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) {
@@ -917,12 +834,11 @@ struct ChatView: View {
                                             }
                                         }
                                     }
-                                chatItemWithMenu(ci, range, maxWidth, itemSeparation)
-                                    .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }
+                                chatItemWithMenu(ci, range, maxWidth)
                             }
                         }
                     }
-                    .padding(.bottom, bottomPadding)
+                    .padding(.bottom, 5)
                     .padding(.trailing)
                     .padding(.leading, 12)
                 } else {
@@ -931,11 +847,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) {
@@ -948,10 +864,10 @@ struct ChatView: View {
                                 .padding(.leading)
                         }
                     }
-                    chatItemWithMenu(ci, range, maxWidth, itemSeparation)
+                    chatItemWithMenu(ci, range, maxWidth)
                         .padding(.horizontal)
                 }
-                .padding(.bottom, bottomPadding)
+                .padding(.bottom, 5)
             }
         }
 
@@ -966,7 +882,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(
@@ -976,8 +892,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

@@ -382,11 +382,7 @@ struct ComposeView: View {
                 }
             }
         }
-        .background {
-            Color.clear
-                .overlay(ToolbarMaterial.material(toolbarMaterial))
-                .ignoresSafeArea(.all, edges: .bottom)
-        }
+        .background(ToolbarMaterial.material(toolbarMaterial))
         .onChange(of: composeState.message) { msg in
             if composeState.linkPreviewAllowed {
                 if msg.count > 0 {
@@ -751,7 +747,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 +883,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 +907,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/Group/GroupChatInfoView.swift

@@ -185,6 +185,7 @@ struct GroupChatInfoView: View {
                 logger.error("GroupChatInfoView apiGetGroupLink: \(responseError(error))")
             }
         }
+         .keyboardPadding()
     }
 
     private func groupInfoHeader() -> some View {

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,9 +25,7 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
     }
 
     func updateUIViewController(_ controller: Controller, context: Context) {
-        controller.representer = self
         if case let .scrollingTo(destination) = scrollState, !items.isEmpty {
-            controller.view.layer.removeAllAnimations()
             switch destination {
             case .nextPage:
                 controller.scrollToNextPage()
@@ -45,10 +42,9 @@ 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 let updateFloatingButtons = PassthroughSubject<Void, Never>()
         private var bag = Set<AnyCancellable>()
 
         init(representer: ReverseList) {
@@ -75,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 {
@@ -107,10 +103,6 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
                     name: notificationName,
                     object: nil
                 )
-            updateFloatingButtons
-                .throttle(for: 0.2, scheduler: DispatchQueue.main, latest: true)
-                .sink { self.updateVisibleItems() }
-                .store(in: &bag)
         }
 
         @available(*, unavailable)
@@ -179,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
@@ -188,40 +180,7 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
                 snapshot,
                 animatingDifferences: itemCount != 0 && abs(items.count - itemCount) == 1
             )
-            // Sets content offset on initial load
-            if itemCount == 0 {
-                tableView.setContentOffset(
-                    CGPoint(x: 0, y: -InvertedTableView.inset),
-                    animated: false
-                )
-            }
             itemCount = items.count
-            updateFloatingButtons.send()
-        }
-
-        override func scrollViewDidScroll(_ scrollView: UIScrollView) {
-            updateFloatingButtons.send()
-        }
-
-        private func updateVisibleItems() {
-            let fbm = ChatView.FloatingButtonModel.shared
-            fbm.scrollOffset.send(tableView.contentOffset.y + InvertedTableView.inset)
-            fbm.visibleItems.send(
-                (tableView.indexPathsForVisibleRows ?? [])
-                    .compactMap { indexPath -> String? in
-                        guard let relativeFrame = tableView.superview?.convert(
-                            tableView.rectForRow(at: indexPath),
-                            from: tableView
-                        ) else { return nil }
-                        // 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
-                    }
-            )
         }
     }
 
@@ -266,12 +225,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
         }
 
@@ -289,7 +248,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/ChatListNavLink.swift

@@ -355,7 +355,6 @@ struct ChatListNavLink: View {
             .tint(.red)
         }
         .frame(height: dynamicRowHeight)
-        .contentShape(Rectangle())
         .onTapGesture { showContactRequestDialog = true }
         .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
             Button("Accept") { Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) } }
@@ -393,7 +392,6 @@ struct ChatListNavLink: View {
                 }
             }
         }
-        .contentShape(Rectangle())
         .onTapGesture {
             showContactConnectionInfo = true
         }

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

@@ -217,31 +217,14 @@ struct ChatListView: View {
                             .listRowSeparator(.hidden)
                             .listRowBackground(Color.clear)
                     }
-                    if #available(iOS 16.0, *) {
-                        ForEach(cs, id: \.viewId) { chat in
-                            ChatListNavLink(chat: chat)
-                                .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                                .padding(.trailing, -16)
-                                .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
-                                .listRowBackground(Color.clear)
-                        }
-                        .offset(x: -8)
-                    } else {
-                        ForEach(cs, id: \.viewId) { chat in
-                            VStack(spacing: .zero) {
-                                Divider()
-                                    .padding(.leading, 16)
-                                ChatListNavLink(chat: chat)
-                                    .padding(.horizontal, 8)
-                                    .padding(.vertical, 6)
-                            }
+                    ForEach(cs, id: \.viewId) { chat in
+                        ChatListNavLink(chat: chat)
                             .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                            .listRowSeparator(.hidden)
-                            .listRowInsets(EdgeInsets())
-                            .background { theme.colors.background } // Hides default list selection colour
+                            .padding(.trailing, -16)
                             .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
-                        }
+                            .listRowBackground(Color.clear)
                     }
+                    .offset(x: -8)
                 }
                 .listStyle(.plain)
                 .onChange(of: chatModel.chatId) { currentChatId in
@@ -341,7 +324,7 @@ struct ChatListView: View {
 struct SubsStatusIndicator: View {
     @State private var subs: SMPServerSubs = SMPServerSubs.newSMPServerSubs
     @State private var hasSess: Bool = false
-    @State private var task: Task<Void, Never>?
+    @State private var timer: Timer? = nil
     @State private var showServersSummary = false
 
     @AppStorage(DEFAULT_SHOW_SUBSCRIPTION_PERCENTAGE) private var showSubscriptionPercentage = false
@@ -360,10 +343,10 @@ struct SubsStatusIndicator: View {
         }
         .disabled(ChatModel.shared.chatRunning != true)
         .onAppear {
-            startTask()
+            startTimer()
         }
         .onDisappear {
-            stopTask()
+            stopTimer()
         }
         .appSheet(isPresented: $showServersSummary) {
             ServersSummaryView()
@@ -371,28 +354,25 @@ struct SubsStatusIndicator: View {
         }
     }
 
-    private func startTask() {
-        task = Task {
-            while !Task.isCancelled {
-                if AppChatState.shared.value == .active {
-                    do {
-                        let (subs, hasSess) = try await getAgentSubsTotal()
-                        await MainActor.run {
-                            self.subs = subs
-                            self.hasSess = hasSess
-                        }
-                    } catch let error {
-                        logger.error("getSubsTotal error: \(responseError(error))")
-                    }
-                }
-                try? await Task.sleep(nanoseconds: 1_000_000_000) // Sleep for 1 second
+    private func startTimer() {
+        timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { _ in
+            if AppChatState.shared.value == .active {
+                getSubsTotal()
             }
         }
     }
 
-    func stopTask() {
-        task?.cancel()
-        task = nil
+    func stopTimer() {
+        timer?.invalidate()
+        timer = nil
+    }
+
+    private func getSubsTotal() {
+        do {
+            (subs, hasSess) = try getAgentSubsTotal()
+        } catch let error {
+            logger.error("getSubsTotal error: \(responseError(error))")
+        }
     }
 }
 
@@ -518,21 +498,21 @@ func chatStoppedIcon() -> some View {
 struct ChatListView_Previews: PreviewProvider {
     static var previews: some View {
         let chatModel = ChatModel()
-        chatModel.updateChats([
-            ChatData(
+        chatModel.chats = [
+            Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
             ),
-            ChatData(
+            Chat(
                 chatInfo: ChatInfo.sampleData.group,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")]
             ),
-            ChatData(
+            Chat(
                 chatInfo: ChatInfo.sampleData.contactRequest,
                 chatItems: []
             )
 
-        ])
+        ]
         return Group {
             ChatListView(showSettings: Binding.constant(false))
                 .environmentObject(chatModel)

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/ContactConnectionView.swift

@@ -16,6 +16,7 @@ struct ContactConnectionView: View {
     @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
     @State private var localAlias = ""
     @FocusState private var aliasTextFieldFocused: Bool
+    @State private var showContactConnectionInfo = false
 
     var body: some View {
         if case let .contactConnection(conn) = chat.chatInfo {
@@ -31,6 +32,7 @@ struct ContactConnectionView: View {
                     .scaledToFill()
                     .frame(width: 48, height: 48)
                     .foregroundColor(Color(uiColor: .tertiarySystemGroupedBackground).asAnotherColorFromSecondaryVariant(theme))
+                    .onTapGesture { showContactConnectionInfo = true }
             }
             .frame(width: 63, height: 63)
             .padding(.leading, 4)
@@ -70,6 +72,9 @@ struct ContactConnectionView: View {
                 Spacer()
             }
             .frame(maxHeight: .infinity)
+            .appSheet(isPresented: $showContactConnectionInfo) {
+                ContactConnectionInfo(contactConnection: contactConnection)
+            }
         }
     }
 }

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

@@ -85,18 +85,15 @@ struct UserPicker: View {
         .padding(8)
         .opacity(userPickerVisible ? 1.0 : 0.0)
         .onAppear {
-             // This check prevents the call of listUsers after the app is suspended, and the database is closed.
-             if case .active = scenePhase {
-                 Task {
-                     do {
-                         let users = try await listUsersAsync()
-                         await MainActor.run { m.users = users }
-                     } catch {
-                         logger.error("Error loading users \(responseError(error))")
-                     }
-                 }
-             }
-         }
+            do {
+                // This check prevents the call of listUsers after the app is suspended, and the database is closed.
+                if case .active = scenePhase {
+                    m.users = try listUsers()
+                }
+            } catch let error {
+                logger.error("Error loading users \(responseError(error))")
+            }
+        }
     }
 
     private func userView(_ u: UserInfo) -> some View {

apps/ios/Shared/Views/Database/DatabaseView.swift

@@ -491,7 +491,7 @@ struct DatabaseView: View {
         appFilesCountAndSize = directoryFileCountAndSize(getAppFilesDirectory())
         do {
             let chats = try apiGetChats()
-            m.updateChats(chats)
+            m.updateChats(with: chats)
         } catch let error {
             logger.error("apiGetChats: cannot update chats \(responseError(error))")
         }

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
-    }
-    
-    private func shapeStyle() -> ChatItemShape.Style {
-        if let ci = chatItem {
-            switch ci.content {
-            case
-                    .sndMsgContent,
-                    .rcvMsgContent,
-                    .rcvDecryptionError,
-                    .sndDeleted,
-                    .rcvDeleted,
-                    .rcvIntegrityError,
-                    .sndModerated,
-                    .rcvModerated,
-                    .rcvBlocked,
-                    .invalidJSON:
-                let tail = if let mc = ci.content.msgContent, mc.isImageOrVideo && mc.text.isEmpty {
-                    false
-                } else {
-                    tailVisible
-                }
-                return tailEnabled
-                ? .bubble(
-                    padding: ci.chatDir.sent ? .trailing : .leading,
-                    tailVisible: tail
-                )
-                : .roundRect(radius: msgRectMaxRadius)
-            case .rcvGroupInvitation, .sndGroupInvitation:
-                return .roundRect(radius: msgRectMaxRadius)
-            default: return .roundRect(radius: 8)
-            }
-        } else {
-            return .roundRect(radius: msgRectMaxRadius)
+    struct ClipShape: Shape {
+        let maxCornerRadius: Double
+        
+        func path(in rect: CGRect) -> Path {
+            Path(
+                roundedRect: rect,
+                cornerRadius: min((rect.height / 2), maxCornerRadius), 
+                style: .circular
+            )
         }
     }
-
-    func body(content: Content) -> some View {
-        let clipShape = ChatItemShape(
-            roundness: roundness,
-            style: shapeStyle()
+    
+    init() {
+        clipShape = ClipShape(
+            maxCornerRadius: 18
         )
+    }
+    
+    init(_ chatItem: ChatItem) {
+        clipShape = ClipShape(
+            maxCornerRadius: {
+                switch chatItem.content {
+                case 
+                    .sndMsgContent, 
+                    .rcvMsgContent,
+                    .rcvDecryptionError,
+                    .rcvGroupInvitation,
+                    .sndGroupInvitation,
+                    .sndDeleted, 
+                    .rcvDeleted,
+                    .rcvIntegrityError,
+                    .sndModerated, 
+                    .rcvModerated, 
+                    .rcvBlocked,
+                    .invalidJSON: 18
+                default: 8
+                }
+            }()
+        )
+    }
+    
+    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/Helpers/ChatWallpaper.swift

@@ -100,7 +100,7 @@ extension PresetWallpaper {
             scale
         } else if let type = ChatModel.shared.currentUser?.uiThemes?.preferredMode(base.mode == DefaultThemeMode.dark)?.wallpaper?.toAppWallpaper().type, type.sameType(WallpaperType.preset(filename, nil)) {
             type.scale
-        } else if let scale = themeOverridesDefault.get().first(where: { $0.wallpaper != nil && $0.wallpaper!.preset == filename && $0.base == base })?.wallpaper?.scale {
+        } else if let scale = themeOverridesDefault.get().first(where: { $0.wallpaper != nil && $0.wallpaper!.preset == filename })?.wallpaper?.scale {
             scale
         } else {
             Float(1.0)

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

@@ -0,0 +1,21 @@
+//
+//  KeyboardPadding.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 10/07/2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+extension View {
+    @ViewBuilder func keyboardPadding() -> some View {
+        if #available(iOS 17.0, *) {
+            GeometryReader { g in
+                self.padding(.bottom, max(0, ChatModel.shared.keyboardHeight - g.safeAreaInsets.bottom))
+            }
+        } else {
+            self
+        }
+    }
+}

apps/ios/Shared/Views/LocalAuth/LocalAuthView.swift

@@ -65,7 +65,8 @@ struct LocalAuthView: View {
                 // Clear sensitive data on screen just in case app fails to hide its views while new database is created
                 m.chatId = nil
                 ItemsModel.shared.reversedChatItems = []
-                m.updateChats([])
+                m.chats = []
+                m.popChatCollector.clear()
                 m.users = []
                 _ = kcAppPassword.set(password)
                 _ = kcSelfDestructPassword.remove()

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/AddGroupView.swift

@@ -59,7 +59,7 @@ struct AddGroupView: View {
                 .navigationBarTitle("Group link")
             }
         } else {
-            createGroupView()
+            createGroupView().keyboardPadding()
         }
     }
 

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)

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
@@ -1264,12 +975,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/Onboarding/CreateProfile.swift

@@ -77,6 +77,7 @@ struct CreateProfile: View {
                 focusDisplayName = true
             }
         }
+        .keyboardPadding()
     }
 }
 
@@ -127,6 +128,7 @@ struct CreateFirstProfile: View {
         }
         .padding()
         .frame(maxWidth: .infinity, alignment: .leading)
+        .keyboardPadding()
     }
 
     func onboardingButtons() -> some View {

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/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"
@@ -77,8 +75,6 @@ let DEFAULT_THEME_OVERRIDES = "themeOverrides"
 
 let ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN = "androidCallOnLockScreen"
 
-let defaultChatItemRoundness: Double = 0.75
-
 let appDefaults: [String: Any] = [
     DEFAULT_SHOW_LA_NOTICE: false,
     DEFAULT_LA_NOTICE_SHOWN: false,
@@ -102,8 +98,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,

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>
@@ -806,7 +802,7 @@
       </trans-unit>
       <trans-unit id="Allow to send SimpleX links." xml:space="preserve">
         <source>Allow to send SimpleX links.</source>
-        <target>Se permite enviar enlaces SimpleX.</target>
+        <target>Permitir enviar enlaces SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -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>
@@ -2414,7 +2406,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Do not send history to new members." xml:space="preserve">
         <source>Do not send history to new members.</source>
-        <target>No se envía el historial a los miembros nuevos.</target>
+        <target>No enviar historial a miembros nuevos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
@@ -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>
@@ -5092,7 +5068,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Prohibit sending SimpleX links." xml:space="preserve">
         <source>Prohibit sending SimpleX links.</source>
-        <target>No se permite enviar enlaces SimpleX.</target>
+        <target>No permitir el envío de enlaces SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit sending direct messages to members." xml:space="preserve">
@@ -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>
@@ -5869,7 +5841,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
         <source>Send up to 100 last messages to new members.</source>
-        <target>Se envían hasta 100 mensajes más recientes a los miembros nuevos.</target>
+        <target>Enviar hasta 100 últimos mensajes a los miembros nuevos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
@@ -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>
@@ -7485,7 +7449,7 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You can change it in Appearance settings." xml:space="preserve">
         <source>You can change it in Appearance settings.</source>
-        <target>Puedes cambiar la posición de la barra desde el menú Apariencia.</target>
+        <target>Puede cambiarlo desde el menú Apariencia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can create it later" xml:space="preserve">
@@ -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>
@@ -1046,7 +1042,7 @@
       </trans-unit>
       <trans-unit id="Bad message hash" xml:space="preserve">
         <source>Bad message hash</source>
-        <target>Hibás az üzenet ellenőrzőösszege</target>
+        <target>Téves üzenet hash</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
@@ -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>
@@ -2139,7 +2131,7 @@ Ez az egyszer használatos hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
-        <target>Csoporttag üzenetének törlése?</target>
+        <target>Csoporttag üzenet törlése?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete message?" xml:space="preserve">
@@ -2229,7 +2221,7 @@ Ez az egyszer használatos hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delivery receipts!" xml:space="preserve">
         <source>Delivery receipts!</source>
-        <target>Üzenet kézbesítési jelentések!</target>
+        <target>Kézbesítési igazolások!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Description" xml:space="preserve">
@@ -2689,12 +2681,12 @@ Ez az egyszer használatos hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
-        <target>Üdvözlő üzenet megadása…</target>
+        <target>Üdvözlő üzenetet megadása…</target>
         <note>placeholder</note>
       </trans-unit>
       <trans-unit id="Enter welcome message… (optional)" xml:space="preserve">
         <source>Enter welcome message… (optional)</source>
-        <target>Üdvözlő üzenet megadása… (opcionális)</target>
+        <target>Üdvözlő üzenetet megadása… (opcionális)</target>
         <note>placeholder</note>
       </trans-unit>
       <trans-unit id="Enter your name…" xml:space="preserve">
@@ -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>
@@ -4151,7 +4131,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Message delivery receipts!" xml:space="preserve">
         <source>Message delivery receipts!</source>
-        <target>Üzenet kézbesítési jelentések!</target>
+        <target>Üzenetkézbesítési bizonylatok!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message delivery warning" xml:space="preserve">
@@ -4196,7 +4176,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Message reception" xml:space="preserve">
         <source>Message reception</source>
-        <target>Üzenet kézbesítési jelentés</target>
+        <target>Üzenetjelentés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message servers" xml:space="preserve">
@@ -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>
@@ -6609,7 +6573,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
-        <target>Az előző üzenet ellenőrzőösszege különbözik.</target>
+        <target>Az előző üzenet hash-e más.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The message will be deleted for all members." xml:space="preserve">
@@ -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>
@@ -7928,7 +7888,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
       </trans-unit>
       <trans-unit id="bad message hash" xml:space="preserve">
         <source>bad message hash</source>
-        <target>hibás az üzenet ellenőrzőösszege</target>
+        <target>téves üzenet hash</target>
         <note>integrity error chat item</note>
       </trans-unit>
       <trans-unit id="blocked" xml:space="preserve">
@@ -8530,7 +8490,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
       </trans-unit>
       <trans-unit id="removed %@" xml:space="preserve">
         <source>removed %@</source>
-        <target>eltávolította őt: %@</target>
+        <target>%@ eltávolítva</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="removed contact address" xml:space="preserve">

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>
@@ -1621,7 +1617,7 @@ Questo è il tuo link una tantum!</target>
       </trans-unit>
       <trans-unit id="Connection and servers status." xml:space="preserve">
         <source>Connection and servers status.</source>
-        <target>Stato della connessione e dei server.</target>
+        <target>Stato di connessione e server.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
@@ -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>
@@ -3926,7 +3906,7 @@ Dit is jouw link voor groep %@!</target>
       </trans-unit>
       <trans-unit id="Keep conversation" xml:space="preserve">
         <source>Keep conversation</source>
-        <target>Behoud het gesprek</target>
+        <target>Blijf in gesprek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
@@ -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>
@@ -756,7 +752,6 @@
       </trans-unit>
       <trans-unit id="Allow calls?" xml:space="preserve">
         <source>Allow calls?</source>
-        <target>Zezwolić na połączenia?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve">
@@ -796,7 +791,6 @@
       </trans-unit>
       <trans-unit id="Allow sharing" xml:space="preserve">
         <source>Allow sharing</source>
-        <target>Zezwól na udostępnianie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
@@ -951,12 +945,10 @@
       </trans-unit>
       <trans-unit id="Archive contacts to chat later." xml:space="preserve">
         <source>Archive contacts to chat later.</source>
-        <target>Archiwizuj kontakty aby porozmawiać później.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
-        <target>Zarchiwizowane kontakty</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archiving database" xml:space="preserve">
@@ -1061,7 +1053,6 @@
       </trans-unit>
       <trans-unit id="Better networking" xml:space="preserve">
         <source>Better networking</source>
-        <target>Lepsze sieciowanie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
@@ -1106,12 +1097,10 @@
       </trans-unit>
       <trans-unit id="Blur for better privacy." xml:space="preserve">
         <source>Blur for better privacy.</source>
-        <target>Rozmycie dla lepszej prywatności.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Blur media" xml:space="preserve">
         <source>Blur media</source>
-        <target>Rozmycie mediów</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
@@ -1161,7 +1150,6 @@
       </trans-unit>
       <trans-unit id="Calls prohibited!" xml:space="preserve">
         <source>Calls prohibited!</source>
-        <target>Połączenia zakazane!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Camera not available" xml:space="preserve">
@@ -1171,12 +1159,10 @@
       </trans-unit>
       <trans-unit id="Can't call contact" xml:space="preserve">
         <source>Can't call contact</source>
-        <target>Nie można zadzwonić do kontaktu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't call member" xml:space="preserve">
         <source>Can't call member</source>
-        <target>Nie można zadzwonić do członka</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't invite contact!" xml:space="preserve">
@@ -1191,7 +1177,6 @@
       </trans-unit>
       <trans-unit id="Can't message member" xml:space="preserve">
         <source>Can't message member</source>
-        <target>Nie można wysłać wiadomości do członka</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cancel" xml:space="preserve">
@@ -1307,7 +1292,6 @@
       </trans-unit>
       <trans-unit id="Chat database exported" xml:space="preserve">
         <source>Chat database exported</source>
-        <target>Wyeksportowano bazę danych czatu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
@@ -1332,7 +1316,6 @@
       </trans-unit>
       <trans-unit id="Chat list" xml:space="preserve">
         <source>Chat list</source>
-        <target>Lista czatów</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat migrated!" xml:space="preserve">
@@ -1422,7 +1405,6 @@
       </trans-unit>
       <trans-unit id="Color chats with the new themes." xml:space="preserve">
         <source>Color chats with the new themes.</source>
-        <target>Koloruj czaty z nowymi motywami.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Color mode" xml:space="preserve">
@@ -1467,7 +1449,6 @@
       </trans-unit>
       <trans-unit id="Confirm contact deletion?" xml:space="preserve">
         <source>Confirm contact deletion?</source>
-        <target>Potwierdzić usunięcie kontaktu?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm database upgrades" xml:space="preserve">
@@ -1527,7 +1508,6 @@
       </trans-unit>
       <trans-unit id="Connect to your friends faster." xml:space="preserve">
         <source>Connect to your friends faster.</source>
-        <target>Szybciej łącz się ze znajomymi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect to yourself?" xml:space="preserve">
@@ -1606,7 +1586,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Connecting to contact, please wait or check later!" xml:space="preserve">
         <source>Connecting to contact, please wait or check later!</source>
-        <target>Łączenie z kontaktem, poczekaj lub sprawdź później!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting to desktop" xml:space="preserve">
@@ -1621,7 +1600,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Connection and servers status." xml:space="preserve">
         <source>Connection and servers status.</source>
-        <target>Stan połączenia i serwerów.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
@@ -1636,7 +1614,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Connection notifications" xml:space="preserve">
         <source>Connection notifications</source>
-        <target>Powiadomienia o połączeniu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection request sent!" xml:space="preserve">
@@ -1676,7 +1653,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Contact deleted!" xml:space="preserve">
         <source>Contact deleted!</source>
-        <target>Kontakt usunięty!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
@@ -1691,7 +1667,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Contact is deleted." xml:space="preserve">
         <source>Contact is deleted.</source>
-        <target>Kontakt jest usunięty.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact name" xml:space="preserve">
@@ -1706,7 +1681,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Contact will be deleted - this cannot be undone!" xml:space="preserve">
         <source>Contact will be deleted - this cannot be undone!</source>
-        <target>Kontakt zostanie usunięty – nie można tego cofnąć!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contacts" xml:space="preserve">
@@ -1726,7 +1700,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Conversation deleted!" xml:space="preserve">
         <source>Conversation deleted!</source>
-        <target>Rozmowa usunięta!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Copy" xml:space="preserve">
@@ -1744,10 +1717,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>
@@ -2009,7 +1978,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Delete %lld messages of members?" xml:space="preserve">
         <source>Delete %lld messages of members?</source>
-        <target>Usunąć %lld wiadomości członków?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete %lld messages?" xml:space="preserve">
@@ -2074,7 +2042,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Delete contact?" xml:space="preserve">
         <source>Delete contact?</source>
-        <target>Usunąć kontakt?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -2184,7 +2151,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
-        <target>Usuń do 20 wiadomości na raz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete user profile?" xml:space="preserve">
@@ -2194,7 +2160,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Delete without notification" xml:space="preserve">
         <source>Delete without notification</source>
-        <target>Usuń bez powiadomienia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Deleted" xml:space="preserve">
@@ -2254,7 +2219,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Destination server address of %@ is incompatible with forwarding server %@ settings." xml:space="preserve">
         <source>Destination server address of %@ is incompatible with forwarding server %@ settings.</source>
-        <target>Adres serwera docelowego %@ jest niekompatybilny z ustawieniami serwera przekazującego %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Destination server error: %@" xml:space="preserve">
@@ -2264,7 +2228,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Destination server version of %@ is incompatible with forwarding server %@." xml:space="preserve">
         <source>Destination server version of %@ is incompatible with forwarding server %@.</source>
-        <target>Wersja serwera docelowego %@ jest niekompatybilna z serwerem przekierowującym %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Detailed statistics" xml:space="preserve">
@@ -2284,7 +2247,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Developer options" xml:space="preserve">
         <source>Developer options</source>
-        <target>Opcje deweloperskie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Developer tools" xml:space="preserve">
@@ -2339,7 +2301,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Disabled" xml:space="preserve">
         <source>Disabled</source>
-        <target>Wyłączony</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disappearing message" xml:space="preserve">
@@ -2569,7 +2530,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Enabled" xml:space="preserve">
         <source>Enabled</source>
-        <target>Włączony</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Enabled for" xml:space="preserve">
@@ -2732,10 +2692,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,13 +2702,8 @@ 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>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error creating address" xml:space="preserve">
@@ -2970,10 +2921,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>
@@ -3262,17 +3209,14 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
-        <target>Serwer przekazujący %@ nie mógł połączyć się z serwerem docelowym %@. Spróbuj ponownie później.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarding server address is incompatible with network settings: %@." xml:space="preserve">
         <source>Forwarding server address is incompatible with network settings: %@.</source>
-        <target>Adres serwera przekierowującego jest niekompatybilny z ustawieniami sieciowymi: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarding server version is incompatible with network settings: %@." xml:space="preserve">
         <source>Forwarding server version is incompatible with network settings: %@.</source>
-        <target>Wersja serwera przekierowującego jest niekompatybilna z ustawieniami sieciowymi: %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Forwarding server: %@&#10;Destination server error: %@" xml:space="preserve">
@@ -3859,7 +3803,6 @@ Błąd: %2$@</target>
       </trans-unit>
       <trans-unit id="It protects your IP address and connections." xml:space="preserve">
         <source>It protects your IP address and connections.</source>
-        <target>Chroni Twój adres IP i połączenia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="It seems like you are already connected via this link. If it is not the case, there was an error (%@)." xml:space="preserve">
@@ -3926,7 +3869,6 @@ To jest twój link do grupy %@!</target>
       </trans-unit>
       <trans-unit id="Keep conversation" xml:space="preserve">
         <source>Keep conversation</source>
-        <target>Zachowaj rozmowę</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
@@ -4106,12 +4048,10 @@ To jest twój link do grupy %@!</target>
       </trans-unit>
       <trans-unit id="Media &amp; file servers" xml:space="preserve">
         <source>Media &amp; file servers</source>
-        <target>Serwery mediów i plików</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
         <source>Medium</source>
-        <target>Średni</target>
         <note>blur media</note>
       </trans-unit>
       <trans-unit id="Member" xml:space="preserve">
@@ -4201,11 +4141,6 @@ To jest twój link do grupy %@!</target>
       </trans-unit>
       <trans-unit id="Message servers" xml:space="preserve">
         <source>Message servers</source>
-        <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">
@@ -4420,7 +4355,6 @@ To jest twój link do grupy %@!</target>
       </trans-unit>
       <trans-unit id="New chat experience 🎉" xml:space="preserve">
         <source>New chat experience 🎉</source>
-        <target>Nowe możliwości czatu 🎉</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New contact request" xml:space="preserve">
@@ -4455,7 +4389,6 @@ To jest twój link do grupy %@!</target>
       </trans-unit>
       <trans-unit id="New media options" xml:space="preserve">
         <source>New media options</source>
-        <target>Nowe opcje mediów</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New member role" xml:space="preserve">
@@ -4550,7 +4483,6 @@ To jest twój link do grupy %@!</target>
       </trans-unit>
       <trans-unit id="Nothing selected" xml:space="preserve">
         <source>Nothing selected</source>
-        <target>Nic nie jest zaznaczone</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
@@ -4628,7 +4560,6 @@ Wymaga włączenia VPN.</target>
       </trans-unit>
       <trans-unit id="Only delete conversation" xml:space="preserve">
         <source>Only delete conversation</source>
-        <target>Usuń tylko rozmowę</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only group owners can change group preferences." xml:space="preserve">
@@ -4868,12 +4799,10 @@ Wymaga włączenia VPN.</target>
       </trans-unit>
       <trans-unit id="Play from the chat list." xml:space="preserve">
         <source>Play from the chat list.</source>
-        <target>Odtwórz z listy czatów.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable calls." xml:space="preserve">
         <source>Please ask your contact to enable calls.</source>
-        <target>Poproś kontakt o włącznie połączeń.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable sending voice messages." xml:space="preserve">
@@ -5179,7 +5108,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Reachable chat toolbar" xml:space="preserve">
         <source>Reachable chat toolbar</source>
-        <target>Osiągalny pasek narzędzi czatu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="React…" xml:space="preserve">
@@ -5455,7 +5383,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Reset all hints" xml:space="preserve">
         <source>Reset all hints</source>
-        <target>Zresetuj wszystkie wskazówki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reset all statistics" xml:space="preserve">
@@ -5590,7 +5517,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Save and reconnect" xml:space="preserve">
         <source>Save and reconnect</source>
-        <target>Zapisz i połącz ponownie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
@@ -5753,13 +5679,8 @@ 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>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Selected chat preferences prohibit this message." xml:space="preserve">
@@ -5829,7 +5750,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Send message to enable calls." xml:space="preserve">
         <source>Send message to enable calls.</source>
-        <target>Wyślij wiadomość aby włączyć połączenia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
@@ -6119,7 +6039,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Share from other apps." xml:space="preserve">
         <source>Share from other apps.</source>
-        <target>Udostępnij z innych aplikacji.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share link" xml:space="preserve">
@@ -6127,10 +6046,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>
@@ -6138,7 +6053,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Share to SimpleX" xml:space="preserve">
         <source>Share to SimpleX</source>
-        <target>Udostępnij do SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share with contacts" xml:space="preserve">
@@ -6293,12 +6207,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Soft" xml:space="preserve">
         <source>Soft</source>
-        <target>Łagodny</target>
         <note>blur media</note>
       </trans-unit>
       <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
         <source>Some file(s) were not exported:</source>
-        <target>Niektóre plik(i) nie zostały wyeksportowane:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
@@ -6308,7 +6220,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
         <source>Some non-fatal errors occurred during import:</source>
-        <target>Podczas importu wystąpiły niekrytyczne błędy:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
@@ -6408,7 +6319,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Strong" xml:space="preserve">
         <source>Strong</source>
-        <target>Silne</target>
         <note>blur media</note>
       </trans-unit>
       <trans-unit id="Submit" xml:space="preserve">
@@ -6448,7 +6358,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="TCP connection" xml:space="preserve">
         <source>TCP connection</source>
-        <target>Połączenie TCP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
@@ -6471,10 +6380,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>
@@ -6624,12 +6529,10 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
       </trans-unit>
       <trans-unit id="The messages will be deleted for all members." xml:space="preserve">
         <source>The messages will be deleted for all members.</source>
-        <target>Wiadomości zostaną usunięte dla wszystkich członków.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The messages will be marked as moderated for all members." xml:space="preserve">
         <source>The messages will be marked as moderated for all members.</source>
-        <target>Wiadomości zostaną oznaczone jako moderowane dla wszystkich członków.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The next generation of private messaging" xml:space="preserve">
@@ -6816,7 +6719,6 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
       </trans-unit>
       <trans-unit id="Toggle chat list:" xml:space="preserve">
         <source>Toggle chat list:</source>
-        <target>Przełącz listę czatów:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
@@ -6826,7 +6728,6 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
       </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
-        <target>Nieprzezroczystość paska narzędzi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Total" xml:space="preserve">
@@ -7013,7 +6914,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
       </trans-unit>
       <trans-unit id="Update settings?" xml:space="preserve">
         <source>Update settings?</source>
-        <target>Zaktualizować ustawienia?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -7123,7 +7023,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
       </trans-unit>
       <trans-unit id="Use the app with one hand." xml:space="preserve">
         <source>Use the app with one hand.</source>
-        <target>Korzystaj z aplikacji jedną ręką.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="User profile" xml:space="preserve">
@@ -7485,7 +7384,6 @@ Powtórzyć prośbę dołączenia?</target>
       </trans-unit>
       <trans-unit id="You can change it in Appearance settings." xml:space="preserve">
         <source>You can change it in Appearance settings.</source>
-        <target>Możesz to zmienić w ustawieniach wyglądu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can create it later" xml:space="preserve">
@@ -7525,7 +7423,6 @@ Powtórzyć prośbę dołączenia?</target>
       </trans-unit>
       <trans-unit id="You can send messages to %@ from Archived contacts." xml:space="preserve">
         <source>You can send messages to %@ from Archived contacts.</source>
-        <target>Możesz wysyłać wiadomości do %@ ze zarchiwizowanych kontaktów.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can set lock screen notification preview via settings." xml:space="preserve">
@@ -7555,7 +7452,6 @@ Powtórzyć prośbę dołączenia?</target>
       </trans-unit>
       <trans-unit id="You can still view conversation with %@ in the list of chats." xml:space="preserve">
         <source>You can still view conversation with %@ in the list of chats.</source>
-        <target>Nadal możesz przeglądać rozmowę z %@ na liście czatów.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can turn on SimpleX Lock via Settings." xml:space="preserve">
@@ -7622,12 +7518,10 @@ Powtórzyć prośbę połączenia?</target>
       </trans-unit>
       <trans-unit id="You may migrate the exported database." xml:space="preserve">
         <source>You may migrate the exported database.</source>
-        <target>Możesz zmigrować wyeksportowaną bazy danych.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You may save the exported archive." xml:space="preserve">
         <source>You may save the exported archive.</source>
-        <target>Możesz zapisać wyeksportowane archiwum.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
@@ -7637,7 +7531,6 @@ Powtórzyć prośbę połączenia?</target>
       </trans-unit>
       <trans-unit id="You need to allow your contact to call to be able to call them." xml:space="preserve">
         <source>You need to allow your contact to call to be able to call them.</source>
-        <target>Aby móc dzwonić, musisz zezwolić kontaktowi na połączenia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You need to allow your contact to send voice messages to be able to send them." xml:space="preserve">
@@ -7755,10 +7648,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>
@@ -7953,7 +7842,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
       </trans-unit>
       <trans-unit id="call" xml:space="preserve">
         <source>call</source>
-        <target>zadzwoń</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="call error" xml:space="preserve">
@@ -8328,7 +8216,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
       </trans-unit>
       <trans-unit id="invite" xml:space="preserve">
         <source>invite</source>
-        <target>zaproś</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="invited" xml:space="preserve">
@@ -8388,7 +8275,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
       </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
-        <target>wiadomość</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="message received" xml:space="preserve">
@@ -8423,7 +8309,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
       </trans-unit>
       <trans-unit id="mute" xml:space="preserve">
         <source>mute</source>
-        <target>wycisz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="never" xml:space="preserve">
@@ -8560,7 +8445,6 @@ Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
       </trans-unit>
       <trans-unit id="search" xml:space="preserve">
         <source>search</source>
-        <target>szukaj</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="sec" xml:space="preserve">
@@ -8649,7 +8533,6 @@ ostatnia otrzymana wiadomość: %2$@</target>
       </trans-unit>
       <trans-unit id="unmute" xml:space="preserve">
         <source>unmute</source>
-        <target>wyłącz wyciszenie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
@@ -8699,7 +8582,6 @@ ostatnia otrzymana wiadomość: %2$@</target>
       </trans-unit>
       <trans-unit id="video" xml:space="preserve">
         <source>video</source>
-        <target>wideo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="video call (not e2e encrypted)" xml:space="preserve">
@@ -8880,17 +8762,14 @@ ostatnia otrzymana wiadomość: %2$@</target>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">
         <source>SimpleX SE</source>
-        <target>SimpleX SE</target>
         <note>Bundle display name</note>
       </trans-unit>
       <trans-unit id="CFBundleName" xml:space="preserve">
         <source>SimpleX SE</source>
-        <target>SimpleX SE</target>
         <note>Bundle name</note>
       </trans-unit>
       <trans-unit id="NSHumanReadableCopyright" xml:space="preserve">
         <source>Copyright © 2024 SimpleX Chat. All rights reserved.</source>
-        <target>Copyright © 2024 SimpleX Chat. Wszelkie prawa zastrzeżone.</target>
         <note>Copyright (human-readable)</note>
       </trans-unit>
     </body>
@@ -8902,187 +8781,150 @@ ostatnia otrzymana wiadomość: %2$@</target>
     <body>
       <trans-unit id="%@" xml:space="preserve">
         <source>%@</source>
-        <target>%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App is locked!" xml:space="preserve">
         <source>App is locked!</source>
-        <target>Aplikacja zablokowana!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cancel" xml:space="preserve">
         <source>Cancel</source>
-        <target>Anuluj</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cannot access keychain to save database password" xml:space="preserve">
         <source>Cannot access keychain to save database password</source>
-        <target>Nie można uzyskać dostępu do pęku kluczy aby zapisać hasło do bazy danych</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cannot forward message" xml:space="preserve">
         <source>Cannot forward message</source>
-        <target>Nie można przekazać wiadomości</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Comment" xml:space="preserve">
         <source>Comment</source>
-        <target>Komentarz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Currently maximum supported file size is %@." xml:space="preserve">
         <source>Currently maximum supported file size is %@.</source>
-        <target>Obecnie maksymalny obsługiwany rozmiar pliku to %@.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database downgrade required" xml:space="preserve">
         <source>Database downgrade required</source>
-        <target>Wymagane obniżenie wersji bazy danych</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database encrypted!" xml:space="preserve">
         <source>Database encrypted!</source>
-        <target>Baza danych zaszyfrowana!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database error" xml:space="preserve">
         <source>Database error</source>
-        <target>Błąd bazy danych</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve">
         <source>Database passphrase is different from saved in the keychain.</source>
-        <target>Hasło bazy danych jest inne niż zapisane w pęku kluczy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
         <source>Database passphrase is required to open chat.</source>
-        <target>Hasło do bazy danych jest wymagane do otwarcia czatu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database upgrade required" xml:space="preserve">
         <source>Database upgrade required</source>
-        <target>Wymagana aktualizacja bazy danych</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error preparing file" xml:space="preserve">
         <source>Error preparing file</source>
-        <target>Błąd przygotowania pliku</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error preparing message" xml:space="preserve">
         <source>Error preparing message</source>
-        <target>Błąd przygotowania wiadomości</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
-        <target>Błąd: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="File error" xml:space="preserve">
         <source>File error</source>
-        <target>Błąd pliku</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incompatible database version" xml:space="preserve">
         <source>Incompatible database version</source>
-        <target>Niekompatybilna wersja bazy danych</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Invalid migration confirmation" xml:space="preserve">
         <source>Invalid migration confirmation</source>
-        <target>Nieprawidłowe potwierdzenie migracji</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Keychain error" xml:space="preserve">
         <source>Keychain error</source>
-        <target>Błąd pęku kluczy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Large file!" xml:space="preserve">
         <source>Large file!</source>
-        <target>Duży plik!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No active profile" xml:space="preserve">
         <source>No active profile</source>
-        <target>Brak aktywnego profilu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
-        <target>Ok</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open the app to downgrade the database." xml:space="preserve">
         <source>Open the app to downgrade the database.</source>
-        <target>Otwórz aplikację aby obniżyć wersję bazy danych.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Open the app to upgrade the database." xml:space="preserve">
         <source>Open the app to upgrade the database.</source>
-        <target>Otwórz aplikację aby zaktualizować bazę danych.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Passphrase" xml:space="preserve">
         <source>Passphrase</source>
-        <target>Hasło</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please create a profile in the SimpleX app" xml:space="preserve">
         <source>Please create a profile in the SimpleX app</source>
-        <target>Proszę utworzyć profil w aplikacji SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Selected chat preferences prohibit this message." xml:space="preserve">
         <source>Selected chat preferences prohibit this message.</source>
-        <target>Wybrane preferencje czatu zabraniają tej wiadomości.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending a message takes longer than expected." xml:space="preserve">
         <source>Sending a message takes longer than expected.</source>
-        <target>Wysłanie wiadomości trwa dłużej niż oczekiwano.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending message…" xml:space="preserve">
         <source>Sending message…</source>
-        <target>Wysyłanie wiadomości…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share" xml:space="preserve">
         <source>Share</source>
-        <target>Udostępnij</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Slow network?" xml:space="preserve">
         <source>Slow network?</source>
-        <target>Wolna sieć?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unknown database error: %@" xml:space="preserve">
         <source>Unknown database error: %@</source>
-        <target>Nieznany błąd bazy danych: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unsupported format" xml:space="preserve">
         <source>Unsupported format</source>
-        <target>Niewspierany format</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wait" xml:space="preserve">
         <source>Wait</source>
-        <target>Czekaj</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
-        <target>Nieprawidłowe hasło bazy danych</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can allow sharing in Privacy &amp; Security / SimpleX Lock settings." xml:space="preserve">
         <source>You can allow sharing in Privacy &amp; Security / SimpleX Lock settings.</source>
-        <target>Możesz zezwolić na udostępnianie w ustawieniach Prywatność i bezpieczeństwo / Blokada SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
     </body>