adapt code

README.md

@@ -18,7 +18,7 @@
 2. ↔️ [Connect to the team](#connect-to-the-team), [join user groups](#join-user-groups) and [follow our updates](#follow-our-updates).
 3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
 4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
-5. ⚡️ [Contribute](#contribute) and [support us with donations](#please-support-us-with-your-donations).
+5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
 
 [Learn more about SimpleX Chat](#contents).
 
@@ -150,7 +150,7 @@ We would love to have you join the development! You can help us with:
 - contributing to SimpleX Chat knowledge-base.
 - developing features - please connect to us via chat so we can help you get started.
 
-## Please support us with your donations
+## Help us with donations
 
 Huge thank you to everybody who donated to SimpleX Chat!
 
@@ -233,8 +233,6 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 Recent and important updates:
 
-[Aug 14, 2024. SimpleX network: the investment from Jack Dorsey and Asymmetric, v6.0 released with the new user experience and private message routing](./blog/20240814-simplex-chat-vision-funding-v6-private-routing-new-user-experience.md)
-
 [Jun 4, 2024. SimpleX network: private message routing, v5.8 released with IP address protection and chat themes](./blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.md)
 
 [Apr 26, 2024. SimpleX network: legally binding transparency, v5.7 released with better calls and messages.](./blog/20240426-simplex-legally-binding-transparency-v5-7-better-user-experience.md)

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/Model/ChatModel.swift

@@ -50,77 +50,12 @@ class ItemsModel: ObservableObject {
     var reversedChatItems: [ChatItem] = [] {
         willSet { publisher.send() }
     }
-    var itemAdded = false {
-        willSet { publisher.send() }
-    }
-    
-    // Publishes directly to `objectWillChange` publisher,
-    // this will cause reversedChatItems to be rendered without throttling
-    @Published var isLoading = false
-    @Published var showLoadingProgress = false
-
     init() {
         publisher
             .throttle(for: 0.25, scheduler: DispatchQueue.main, latest: true)
             .sink { self.objectWillChange.send() }
             .store(in: &bag)
     }
-
-    func loadOpenChat(_ chatId: ChatId, willNavigate: @escaping () -> Void = {}) {
-        let navigationTimeout = Task {
-            do {
-                try await Task.sleep(nanoseconds: 250_000000)
-                await MainActor.run {
-                    willNavigate()
-                    ChatModel.shared.chatId = chatId
-                }
-            } catch {}
-        }
-        let progressTimeout = Task {
-            do {
-                try await Task.sleep(nanoseconds: 1500_000000)
-                await MainActor.run { showLoadingProgress = true }
-            } catch {}
-        }
-        Task {
-            if let chat = ChatModel.shared.getChat(chatId) {
-                await MainActor.run { self.isLoading = true }
-//                try? await Task.sleep(nanoseconds: 5000_000000)
-                await loadChat(chat: chat)
-                navigationTimeout.cancel()
-                progressTimeout.cancel()
-                await MainActor.run {
-                    self.isLoading = false
-                    self.showLoadingProgress = false
-                    willNavigate()
-                    ChatModel.shared.chatId = chatId
-                }
-            }
-        }
-    }
-}
-
-class NetworkModel: ObservableObject {
-    // map of connections network statuses, key is agent connection id
-    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
-
-    static let shared = NetworkModel()
-
-    private init() { }
-
-    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] = status
-        }
-    }
-
-    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] ?? .unknown
-        } else {
-            .unknown
-        }
-    }
 }
 
 final class ChatModel: ObservableObject {
@@ -145,6 +80,8 @@ final class ChatModel: ObservableObject {
     // list of chat "previews"
     @Published var chats: [Chat] = []
     @Published var deletedChats: Set<String> = []
+    // map of connections network statuses, key is agent connection id
+    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
     // current chat
     @Published var chatId: String?
     var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
@@ -183,6 +120,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)
 
@@ -289,17 +228,10 @@ final class ChatModel: ObservableObject {
         chats.firstIndex(where: { $0.id == id })
     }
 
-    func addChat(_ chat: Chat) {
-        if chatId == nil {
-            withAnimation { addChat_(chat, at: 0) }
-        } else {
-            addChat_(chat, at: 0)
+    func addChat(_ chat: Chat, at position: Int = 0) {
+        withAnimation {
+            chats.insert(chat, at: position)
         }
-        popChatCollector.throttlePopChat(chat.chatInfo.id, currentPosition: 0)
-    }
-
-    func addChat_(_ chat: Chat, at position: Int = 0) {
-        chats.insert(chat, at: position)
     }
 
     func updateChatInfo(_ cInfo: ChatInfo) {
@@ -373,11 +305,10 @@ final class ChatModel: ObservableObject {
                     }
                 }
             } else {
-                addChat_(Chat(c), at: i)
+                addChat(Chat(c), at: i)
             }
         }
         NtfManager.shared.setNtfBadgeCount(totalUnreadCountForAllUsers())
-        popChatCollector.clear()
     }
 
 //    func addGroup(_ group: SimpleXChat.Group) {
@@ -385,12 +316,6 @@ final class ChatModel: ObservableObject {
 //    }
 
     func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
-        // mark chat non deleted
-        if case let .direct(contact) = cInfo, contact.chatDeleted {
-            var updatedContact = contact
-            updatedContact.chatDeleted = false
-            updateContact(updatedContact)
-        }
         // update previews
         if let i = getChatIndex(cInfo.id) {
             chats[i].chatItems = switch cInfo {
@@ -408,9 +333,18 @@ final class ChatModel: ObservableObject {
                 [cItem]
             }
             if case .rcvNew = cItem.meta.itemStatus {
-                unreadCollector.changeUnreadCounter(cInfo.id, by: 1)
+                chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
+                increaseUnreadCounter(user: currentUser!)
+            }
+            if i > 0 {
+                if chatId == nil {
+                    withAnimation { popChat_(i) }
+                } else if chatId == cInfo.id  {
+                    chatToTop = cInfo.id
+                } else {
+                    popChat_(i)
+                }
             }
-            popChatCollector.throttlePopChat(cInfo.id, currentPosition: i)
         } else {
             addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
         }
@@ -456,7 +390,6 @@ final class ChatModel: ObservableObject {
                     ci.meta.itemStatus = status
                 }
                 im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
-                im.itemAdded = true
             }
             return true
         }
@@ -489,8 +422,8 @@ final class ChatModel: ObservableObject {
     }
 
     func removeChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
-        if cItem.isRcvNew {
-            unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
+        if cItem.isRcvNew, let chatIndex = getChatIndex(cInfo.id) {
+            decreaseUnreadCounter(chatIndex)
         }
         // update previews
         if let chat = getChat(cInfo.id) {
@@ -551,7 +484,6 @@ final class ChatModel: ObservableObject {
         let cItem = ChatItem.liveDummy(chatInfo.chatType)
         withAnimation {
             im.reversedChatItems.insert(cItem, at: 0)
-            im.itemAdded = true
         }
         return cItem
     }
@@ -640,13 +572,14 @@ final class ChatModel: ObservableObject {
     func markChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) async {
         if chatId == cInfo.id,
            let itemIndex = getChatItemIndex(cItem),
+           let chatIndex = getChatIndex(cInfo.id),
            im.reversedChatItems[itemIndex].isRcvNew {
             await MainActor.run {
                 withTransaction(Transaction()) {
                     // update current chat
                     markChatItemRead_(itemIndex)
                     // update preview
-                    unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
+                    unreadCollector.decreaseUnreadCounter(chatIndex)
                 }
             }
         }
@@ -655,92 +588,26 @@ final class ChatModel: ObservableObject {
     private let unreadCollector = UnreadCollector()
 
     class UnreadCollector {
-        private let subject = PassthroughSubject<Void, Never>()
+        private let subject = PassthroughSubject<Int, Never>()
         private var bag = Set<AnyCancellable>()
-        private var unreadCounts: [ChatId: Int] = [:]
+        private var dictionary = Dictionary<Int, Int>()
 
         init() {
             subject
                 .debounce(for: 1, scheduler: DispatchQueue.main)
-                .sink {
-                    let m = ChatModel.shared
-                    for (chatId, count) in self.unreadCounts {
-                        if let i = m.getChatIndex(chatId) {
-                            m.changeUnreadCounter(i, by: count)
-                        }
+                .sink { _ in
+                    self.dictionary.forEach { key, value in
+                        ChatModel.shared.decreaseUnreadCounter(key, by: value)
                     }
-                    self.unreadCounts = [:]
+                    self.dictionary = Dictionary<Int, Int>()
                 }
                 .store(in: &bag)
         }
-
-        func changeUnreadCounter(_ chatId: ChatId, by count: Int) {
-            DispatchQueue.main.async {
-                self.unreadCounts[chatId] = (self.unreadCounts[chatId] ?? 0) + count
-            }
-            subject.send()
-        }
-    }
-
-    let popChatCollector = PopChatCollector()
-    
-    class PopChatCollector {
-        private let subject = PassthroughSubject<Void, Never>()
-        private var bag = Set<AnyCancellable>()
-        private var chatsToPop: [ChatId: Date] = [:]
-        private let popTsComparator = KeyPathComparator<Chat>(\.popTs, order: .reverse)
-
-        init() {
-            subject
-                .throttle(for: 2, scheduler: DispatchQueue.main, latest: true)
-                .sink { self.popCollectedChats() }
-                .store(in: &bag)
-        }
         
-        func throttlePopChat(_ chatId: ChatId, currentPosition: Int) {
-            let m = ChatModel.shared
-            if currentPosition > 0 && m.chatId == chatId {
-                m.chatToTop = chatId
-            }
-            if currentPosition > 0 || !chatsToPop.isEmpty {
-                chatsToPop[chatId] = Date.now
-                subject.send()
-            }
-        }
-        
-        func clear() {
-            chatsToPop = [:]
-        }
-
-        func popCollectedChats() {
-            let m = ChatModel.shared
-            var ixs: IndexSet = []
-            var chs: [Chat] = []
-            // collect chats that received updates
-            for (chatId, popTs) in self.chatsToPop {
-                // Currently opened chat is excluded, removing it from the list would navigate out of it
-                // It will be popped to top later when user exits from the list.
-                if m.chatId != chatId, let i = m.getChatIndex(chatId) {
-                    ixs.insert(i)
-                    let ch = m.chats[i]
-                    ch.popTs = popTs
-                    chs.append(ch)
-                }
-            }
-
-            let removeInsert = {
-                m.chats.remove(atOffsets: ixs)
-                // sort chats by pop timestamp in descending order
-                m.chats.insert(contentsOf: chs.sorted(using: self.popTsComparator), at: 0)
-            }
-
-            if m.chatId == nil {
-                withAnimation { removeInsert() }
-            } else {
-                removeInsert()
-            }
-
-            self.chatsToPop = [:]
+        // Only call from main thread
+        func decreaseUnreadCounter(_ chatIndex: Int) {
+            dictionary[chatIndex] = (dictionary[chatIndex] ?? 0) + 1
+            subject.send(chatIndex)
         }
     }
 
@@ -755,24 +622,25 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func changeUnreadCounter(_ chatIndex: Int, by count: Int) {
-        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount + count
-        changeUnreadCounter(user: currentUser!, by: count)
+    func decreaseUnreadCounter(_ chatIndex: Int, by count: Int = 1) {
+        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount - count
+        decreaseUnreadCounter(user: currentUser!, by: count)
     }
 
     func increaseUnreadCounter(user: any UserLike) {
         changeUnreadCounter(user: user, by: 1)
+        NtfManager.shared.incNtfBadgeCount()
     }
 
     func decreaseUnreadCounter(user: any UserLike, by: Int = 1) {
         changeUnreadCounter(user: user, by: -by)
+        NtfManager.shared.decNtfBadgeCount(by: by)
     }
 
     private func changeUnreadCounter(user: any UserLike, by: Int) {
         if let i = users.firstIndex(where: { $0.user.userId == user.userId }) {
             users[i].unreadCount += by
         }
-        NtfManager.shared.changeNtfBadgeCount(by: by)
     }
 
     func totalUnreadCountForAllUsers() -> Int {
@@ -838,7 +706,6 @@ final class ChatModel: ObservableObject {
 
     func popChat(_ id: String) {
         if let i = getChatIndex(id) {
-            // no animation here, for it not to look like it just moved when leaving the chat
             popChat_(i)
         }
     }
@@ -911,13 +778,7 @@ final class ChatModel: ObservableObject {
             }
             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
-        )
+        return UnreadChatItemCounts(isNearBottom: totalBelow < 16, unreadBelow: unreadBelow)
     }
 
     func topItemInView(itemsInView: Set<String>) -> ChatItem? {
@@ -928,6 +789,20 @@ final class ChatModel: ObservableObject {
         while i < maxIx && inView(i) { i += 1 }
         return im.reversedChatItems[min(i - 1, maxIx)]
     }
+
+    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] = status
+        }
+    }
+
+    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] ?? .unknown
+        } else {
+            .unknown
+        }
+    }
 }
 
 struct ShowingInvitation {
@@ -942,7 +817,6 @@ struct NTFContactRequest {
 
 struct UnreadChatItemCounts: Equatable {
     var isNearBottom: Bool
-    var isReallyNearBottom: Bool
     var unreadBelow: Int
 }
 
@@ -951,7 +825,6 @@ final class Chat: ObservableObject, Identifiable, ChatLike {
     @Published var chatItems: [ChatItem]
     @Published var chatStats: ChatStats
     var created = Date.now
-    fileprivate var popTs: Date?
 
     init(_ cData: ChatData) {
         self.chatInfo = cData.chatInfo

apps/ios/Shared/Model/NtfManager.swift

@@ -57,9 +57,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                 chatModel.ntfCallInvitationAction = (chatId, ntfAction)
             }
         } else {
-            if let chatId = content.targetContentIdentifier {
-                ItemsModel.shared.loadOpenChat(chatId)
-            }
+            chatModel.chatId = content.targetContentIdentifier
         }
         handler()
     }
@@ -240,8 +238,12 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         ntfBadgeCountGroupDefault.set(count)
     }
 
-    func changeNtfBadgeCount(by count: Int = 1) {
-        setNtfBadgeCount(max(0, UIApplication.shared.applicationIconBadgeNumber + count))
+    func decNtfBadgeCount(by count: Int = 1) {
+        setNtfBadgeCount(max(0, UIApplication.shared.applicationIconBadgeNumber - count))
+    }
+
+    func incNtfBadgeCount(by count: Int = 1) {
+        setNtfBadgeCount(UIApplication.shared.applicationIconBadgeNumber + count)
     }
 
     private func addNotification(_ content: UNMutableNotificationContent) {

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -137,8 +137,8 @@ func apiGetActiveUser(ctrl: chat_ctrl? = nil) throws -> User? {
     }
 }
 
-func apiCreateActiveUser(_ p: Profile?, pastTimestamp: Bool = false, ctrl: chat_ctrl? = nil) throws -> User {
-    let r = chatSendCmdSync(.createActiveUser(profile: p, pastTimestamp: pastTimestamp), ctrl)
+func apiCreateActiveUser(_ p: Profile?, sameServers: Bool = false, pastTimestamp: Bool = false, ctrl: chat_ctrl? = nil) throws -> User {
+    let r = chatSendCmdSync(.createActiveUser(profile: p, sameServers: sameServers, pastTimestamp: pastTimestamp), ctrl)
     if case let .activeUser(user) = r { return user }
     throw r
 }
@@ -279,10 +279,8 @@ func apiGetAppSettings(settings: AppSettings) throws -> AppSettings {
     throw r
 }
 
-func apiExportArchive(config: ArchiveConfig) async throws -> [ArchiveError] {
-    let r = await chatSendCmd(.apiExportArchive(config: config))
-    if case let .archiveExported(archiveErrors) = r { return archiveErrors }
-    throw r
+func apiExportArchive(config: ArchiveConfig) async throws {
+    try await sendCommandOkResp(.apiExportArchive(config: config))
 }
 
 func apiImportArchive(config: ArchiveConfig) async throws -> [ArchiveError] {
@@ -320,8 +318,8 @@ private func apiChatsResponse(_ r: ChatResponse) throws -> [ChatData] {
 
 let loadItemsPerPage = 50
 
-func apiGetChat(type: ChatType, id: Int64, search: String = "") async throws -> Chat {
-    let r = await chatSendCmd(.apiGetChat(type: type, id: id, pagination: .last(count: loadItemsPerPage), search: search))
+func apiGetChat(type: ChatType, id: Int64, search: String = "") throws -> Chat {
+    let r = chatSendCmdSync(.apiGetChat(type: type, id: id, pagination: .last(count: loadItemsPerPage), search: search))
     if case let .apiChat(_, chat) = r { return Chat.init(chat) }
     throw r
 }
@@ -332,20 +330,16 @@ func apiGetChatItems(type: ChatType, id: Int64, pagination: ChatPagination, sear
     throw r
 }
 
-func loadChat(chat: Chat, search: String = "", clearItems: Bool = true) async {
+func loadChat(chat: Chat, search: String = "") {
     do {
         let cInfo = chat.chatInfo
         let m = ChatModel.shared
         let im = ItemsModel.shared
         m.chatItemStatuses = [:]
-        if clearItems {
-            await MainActor.run { im.reversedChatItems = [] }
-        }
-        let chat = try await apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
-        await MainActor.run {
-            im.reversedChatItems = chat.chatItems.reversed()
-            m.updateChatInfo(chat.chatInfo)
-        }
+        im.reversedChatItems = []
+        let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
+        m.updateChatInfo(chat.chatInfo)
+        im.reversedChatItems = chat.chatItems.reversed()
     } catch let error {
         logger.error("loadChat error: \(responseError(error))")
     }
@@ -705,7 +699,7 @@ func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, Pendi
         return ((.contact, connection), nil)
     case let .contactAlreadyExists(_, contact):
         if let c = m.getContactChat(contact.contactId) {
-            ItemsModel.shared.loadOpenChat(c.id)
+            await MainActor.run { m.chatId = c.id }
         }
         let alert = contactAlreadyExistsAlert(contact)
         return (nil, alert)
@@ -765,38 +759,22 @@ func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Co
     return (nil, alert)
 }
 
-func apiDeleteChat(type: ChatType, id: Int64, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async throws {
+func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
     let chatId = type.rawValue + id.description
     DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
     defer { DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) } }
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
+    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
     if case .direct = type, case .contactDeleted = r { return }
     if case .contactConnection = type, case .contactConnectionDeleted = r { return }
     if case .group = type, case .groupDeletedUser = r { return }
     throw r
 }
 
-func apiDeleteContact(id: Int64, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async throws -> Contact {
-    let type: ChatType = .direct
-    let chatId = type.rawValue + id.description
-    if case .full = chatDeleteMode {
-        DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
-    }
-    defer {
-        if case .full = chatDeleteMode {
-            DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) }
-        }
-    }
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
-    if case let .contactDeleted(_, contact) = r { return contact }
-    throw r
-}
-
-func deleteChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async {
+func deleteChat(_ chat: Chat, notify: Bool? = nil) async {
     do {
         let cInfo = chat.chatInfo
-        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, chatDeleteMode: chatDeleteMode)
-        await MainActor.run { ChatModel.shared.removeChat(cInfo.id) }
+        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, notify: notify)
+        DispatchQueue.main.async { ChatModel.shared.removeChat(cInfo.id) }
     } catch let error {
         logger.error("deleteChat apiDeleteChat error: \(responseError(error))")
         AlertManager.shared.showAlertMsg(
@@ -806,39 +784,6 @@ func deleteChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: tru
     }
 }
 
-func deleteContactChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async -> Alert? {
-    do {
-        let cInfo = chat.chatInfo
-        let ct = try await apiDeleteContact(id: cInfo.apiId, chatDeleteMode: chatDeleteMode)
-        await MainActor.run {
-            switch chatDeleteMode {
-            case .full:
-                ChatModel.shared.removeChat(cInfo.id)
-            case .entity:
-                ChatModel.shared.removeChat(cInfo.id)
-                ChatModel.shared.addChat(Chat(
-                    chatInfo: .direct(contact: ct),
-                    chatItems: chat.chatItems
-                ))
-            case .messages:
-                ChatModel.shared.removeChat(cInfo.id)
-                ChatModel.shared.addChat(Chat(
-                    chatInfo: .direct(contact: ct),
-                    chatItems: []
-                ))
-            }
-        }
-    } catch let error {
-        logger.error("deleteContactChat apiDeleteContact error: \(responseError(error))")
-        return mkAlert(
-            title: "Error deleting chat!",
-            message: "Error: \(responseError(error))"
-        )
-    }
-    return nil
-}
-
-
 func apiClearChat(type: ChatType, id: Int64) async throws -> ChatInfo {
     let r = await chatSendCmd(.apiClearChat(type: type, id: id), bgTask: false)
     if case let .chatCleared(_, updatedChatInfo) = r { return updatedChatInfo }
@@ -1167,16 +1112,9 @@ func networkErrorAlert(_ r: ChatResponse) -> Alert? {
 func acceptContactRequest(incognito: Bool, contactRequest: UserContactRequest) async {
     if let contact = await apiAcceptContactRequest(incognito: incognito, contactReqId: contactRequest.apiId) {
         let chat = Chat(chatInfo: ChatInfo.direct(contact: contact), chatItems: [])
-        await MainActor.run {
+        DispatchQueue.main.async {
             ChatModel.shared.replaceChat(contactRequest.id, chat)
-            NetworkModel.shared.setContactNetworkStatus(contact, .connected)
-        }
-        if contact.sndReady {
-            DispatchQueue.main.async {
-                dismissAllSheets(animated: true) {
-                    ItemsModel.shared.loadOpenChat(chat.id)
-                }
-            }
+            ChatModel.shared.setContactNetworkStatus(contact, .connected)
         }
     }
 }
@@ -1420,9 +1358,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))
+    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
@@ -1592,7 +1530,6 @@ func getUserChatData() throws {
     m.chatItemTTL = try getChatItemTTL()
     let chats = try apiGetChats()
     m.chats = chats.map { Chat.init($0) }
-    m.popChatCollector.clear()
 }
 
 private func getUserChatDataAsync() async throws {
@@ -1605,13 +1542,11 @@ private func getUserChatDataAsync() async throws {
             m.userAddress = userAddress
             m.chatItemTTL = chatItemTTL
             m.chats = chats.map { Chat.init($0) }
-            m.popChatCollector.clear()
         }
     } else {
         await MainActor.run {
             m.userAddress = nil
             m.chats = []
-            m.popChatCollector.clear()
         }
     }
 }
@@ -1661,7 +1596,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
         await TerminalItems.shared.add(.resp(.now, res))
     }
     let m = ChatModel.shared
-    let n = NetworkModel.shared
     logger.debug("processReceivedMsg: \(res.responseType)")
     switch res {
     case let .contactDeletedByContact(user, contact):
@@ -1684,7 +1618,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
             NtfManager.shared.notifyContactConnected(user, contact)
         }
         await MainActor.run {
-            n.setContactNetworkStatus(contact, .connected)
+            m.setContactNetworkStatus(contact, .connected)
         }
     case let .contactConnecting(user, contact):
         if active(user) && contact.directOrUsed {
@@ -1707,7 +1641,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
             }
         }
         await MainActor.run {
-            n.setContactNetworkStatus(contact, .connected)
+            m.setContactNetworkStatus(contact, .connected)
         }
     case let .receivedContactRequest(user, contactRequest):
         if active(user) {
@@ -1741,7 +1675,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
         if active(user) && m.hasChat(mergedContact.id) {
             await MainActor.run {
                 if m.chatId == mergedContact.id {
-                    ItemsModel.shared.loadOpenChat(mergedContact.id)
+                    m.chatId = intoContact.id
                 }
                 m.removeChat(mergedContact.id)
             }
@@ -1749,27 +1683,27 @@ func processReceivedMsg(_ res: ChatResponse) async {
     case let .networkStatus(status, connections):
         // dispatch queue to synchronize access
         networkStatusesLock.sync {
-            var ns = n.networkStatuses
+            var ns = m.networkStatuses
             // slow loop is on the background thread
             for cId in connections {
                 ns[cId] = status
             }
             // fast model update is on the main thread
             DispatchQueue.main.sync {
-                n.networkStatuses = ns
+                m.networkStatuses = ns
             }
         }
     case let .networkStatuses(_, statuses): ()
         // dispatch queue to synchronize access
         networkStatusesLock.sync {
-            var ns = n.networkStatuses
+            var ns = m.networkStatuses
             // slow loop is on the background thread
             for s in statuses {
                 ns[s.agentConnId] = s.networkStatus
             }
             // fast model update is on the main thread
             DispatchQueue.main.sync {
-                n.networkStatuses = ns
+                m.networkStatuses = ns
             }
         }
     case let .newChatItem(user, aChatItem):
@@ -1910,7 +1844,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
         }
         if let contact = memberContact {
             await MainActor.run {
-                n.setContactNetworkStatus(contact, .connected)
+                m.setContactNetworkStatus(contact, .connected)
             }
         }
     case let .groupUpdated(user, toGroup):
@@ -2091,8 +2025,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.remoteCtrlSession = nil
                 dismissAllSheets() {
                     switch rcStopReason {
-                    case .disconnected:
-                        ()
                     case .connectionFailed(.errorAgent(.RCP(.identity))):
                         AlertManager.shared.showAlertMsg(
                             title: "Connection with desktop stopped",
@@ -2135,13 +2067,12 @@ func processReceivedMsg(_ res: ChatResponse) async {
 
 func switchToLocalSession() {
     let m = ChatModel.shared
-    let n = NetworkModel.shared
     m.remoteCtrlSession = nil
     do {
         m.users = try listUsers()
         try getUserChatData()
         let statuses = (try apiGetNetworkStatuses()).map { s in (s.agentConnId, s.networkStatus) }
-        n.networkStatuses = Dictionary(uniqueKeysWithValues: statuses)
+        m.networkStatuses = Dictionary(uniqueKeysWithValues: statuses)
     } catch let error {
         logger.debug("error updating chat data: \(responseError(error))")
     }

apps/ios/Shared/SimpleXApp.swift

@@ -58,7 +58,6 @@ struct SimpleXApp: App {
                 }
                 .onChange(of: scenePhase) { phase in
                     logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
-                    AppSheetState.shared.scenePhaseActive = phase == .active
                     switch (phase) {
                     case .background:
                         // --- authentication
@@ -136,7 +135,7 @@ struct SimpleXApp: App {
             chatModel.updateChats(with: chats)
             if let id = chatModel.chatId,
                let chat = chatModel.getChat(id) {
-                Task { await loadChat(chat: chat, clearItems: false) }
+                loadChat(chat: chat)
             }
             if let ncr = chatModel.ntfContactRequest {
                 chatModel.ntfContactRequest = nil

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

@@ -92,23 +92,19 @@ struct ChatInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
-    @ObservedObject var networkModel = NetworkModel.shared
     @ObservedObject var chat: Chat
     @State var contact: Contact
+    @Binding var connectionStats: ConnectionStats?
+    @Binding var customUserProfile: Profile?
     @State var localAlias: String
-    var onSearch: () -> Void
-    @State private var connectionStats: ConnectionStats? = nil
-    @State private var customUserProfile: Profile? = nil
-    @State private var connectionCode: String? = nil
+    @Binding var connectionCode: String?
     @FocusState private var aliasTextFieldFocused: Bool
     @State private var alert: ChatInfoViewAlert? = nil
-    @State private var actionSheet: SomeActionSheet? = nil
-    @State private var sheet: SomeSheet<AnyView>? = nil
-    @State private var showConnectContactViaAddressDialog = false
+    @State private var showDeleteContactActionSheet = false
     @State private var sendReceipts = SendReceipts.userDefault(true)
     @State private var sendReceiptsUserDefault = true
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    
+
     enum ChatInfoViewAlert: Identifiable {
         case clearChatAlert
         case networkStatusAlert
@@ -116,7 +112,6 @@ struct ChatInfoView: View {
         case abortSwitchAddressAlert
         case syncConnectionForceAlert
         case queueInfo(info: String)
-        case someAlert(alert: SomeAlert)
         case error(title: LocalizedStringKey, error: LocalizedStringKey?)
 
         var id: String {
@@ -127,12 +122,11 @@ struct ChatInfoView: View {
             case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
             case .syncConnectionForceAlert: return "syncConnectionForceAlert"
             case let .queueInfo(info): return "queueInfo \(info)"
-            case let .someAlert(alert): return "chatInfoSomeAlert \(alert.id)"
             case let .error(title, _): return "error \(title)"
             }
         }
     }
-    
+
     var body: some View {
         NavigationView {
             List {
@@ -142,29 +136,12 @@ struct ChatInfoView: View {
                     .onTapGesture {
                         aliasTextFieldFocused = false
                     }
-                
+
                 Group {
                     localAliasTextEdit()
                 }
                 .listRowBackground(Color.clear)
                 .listRowSeparator(.hidden)
-                .padding(.bottom, 18)
-                
-                GeometryReader { g in
-                    HStack(alignment: .center, spacing: 8) {
-                        let buttonWidth = g.size.width / 4
-                        searchButton(width: buttonWidth)
-                        AudioCallButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                        VideoButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                        muteButton(width: buttonWidth)
-                    }
-                }
-                .padding(.trailing)
-                .frame(maxWidth: .infinity)
-                .frame(height: infoViewActionButtonHeight)
-                .listRowBackground(Color.clear)
-                .listRowSeparator(.hidden)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 8))
 
                 if let customUserProfile = customUserProfile {
                     Section(header: Text("Incognito").foregroundColor(theme.colors.secondary)) {
@@ -176,7 +153,7 @@ struct ChatInfoView: View {
                         }
                     }
                 }
-                
+
                 Section {
                     Group {
                         if let code = connectionCode { verifyCodeButton(code) }
@@ -196,18 +173,14 @@ struct ChatInfoView: View {
                     } label: {
                         Label("Chat theme", systemImage: "photo")
                     }
-                    //                    } else if developerTools {
-                    //                        synchronizeConnectionButtonForce()
-                    //                    }
                 }
-                .disabled(!contact.ready || !contact.active)
-                
+
                 if let conn = contact.activeConn {
                     Section {
                         infoRow(Text(String("E2E encryption")), conn.connPQEnabled ? "Quantum resistant" : "Standard")
                     }
                 }
-                
+
                 if let contactLink = contact.contactLink {
                     Section {
                         SimpleXLinkQRCode(uri: contactLink)
@@ -224,7 +197,7 @@ struct ChatInfoView: View {
                             .foregroundColor(theme.colors.secondary)
                     }
                 }
-                
+
                 if contact.ready && contact.active {
                     Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
                         networkStatusRow()
@@ -253,12 +226,12 @@ struct ChatInfoView: View {
                         }
                     }
                 }
-                
+
                 Section {
                     clearChatButton()
                     deleteContactButton()
                 }
-                
+
                 if developerTools {
                     Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
                         infoRow("Local name", chat.chatInfo.localDisplayName)
@@ -287,24 +260,6 @@ struct ChatInfoView: View {
                 sendReceiptsUserDefault = currentUser.sendRcptsContacts
             }
             sendReceipts = SendReceipts.fromBool(contact.chatSettings.sendRcpts, userDefault: sendReceiptsUserDefault)
-            
-            
-            Task {
-                do {
-                    let (stats, profile) = try await apiContactInfo(chat.chatInfo.apiId)
-                    let (ct, code) = try await apiGetContactCode(chat.chatInfo.apiId)
-                    await MainActor.run {
-                        connectionStats = stats
-                        customUserProfile = profile
-                        connectionCode = code
-                        if contact.activeConn?.connectionCode != ct.activeConn?.connectionCode {
-                            chat.chatInfo = .direct(contact: ct)
-                        }
-                    }
-                } catch let error {
-                    logger.error("apiContactInfo or apiGetContactCode error: \(responseError(error))")
-                }
-            }
         }
         .alert(item: $alert) { alertItem in
             switch(alertItem) {
@@ -314,26 +269,37 @@ struct ChatInfoView: View {
             case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchContactAddress)
             case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncContactConnection(force: true) })
             case let .queueInfo(info): return queueInfoAlert(info)
-            case let .someAlert(a): return a.alert
             case let .error(title, error): return mkAlert(title: title, message: error)
             }
         }
-        .actionSheet(item: $actionSheet) { $0.actionSheet }
-        .sheet(item: $sheet) { 
-            if #available(iOS 16.0, *) {
-                $0.content
-                    .presentationDetents([.fraction(0.4)])
+        .actionSheet(isPresented: $showDeleteContactActionSheet) {
+            if contact.sndReady && contact.active {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete and notify contact")) { deleteContact(notify: true) },
+                        .destructive(Text("Delete")) { deleteContact(notify: false) },
+                        .cancel()
+                    ]
+                )
             } else {
-                $0.content
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete")) { deleteContact() },
+                        .cancel()
+                    ]
+                )
             }
         }
     }
-    
+
     private func contactInfoHeader() -> some View {
-        VStack(spacing: 8) {
+        VStack {
             let cInfo = chat.chatInfo
             ChatInfoImage(chat: chat, size: 192, color: Color(uiColor: .tertiarySystemFill))
-                .padding(.vertical, 12)
+                .padding(.top, 12)
+                .padding()
             if contact.verified {
                 (
                     Text(Image(systemName: "checkmark.shield"))
@@ -362,7 +328,7 @@ struct ChatInfoView: View {
         }
         .frame(maxWidth: .infinity, alignment: .center)
     }
-    
+
     private func localAliasTextEdit() -> some View {
         TextField("Set contact name…", text: $localAlias)
             .disableAutocorrection(true)
@@ -379,7 +345,7 @@ struct ChatInfoView: View {
             .multilineTextAlignment(.center)
             .foregroundColor(theme.colors.secondary)
     }
-    
+
     private func setContactAlias() {
         Task {
             do {
@@ -394,25 +360,6 @@ struct ChatInfoView: View {
         }
     }
 
-    private func searchButton(width: CGFloat) -> some View {
-        InfoViewButton(image: "magnifyingglass", title: "search", width: width) {
-            dismiss()
-            onSearch()
-        }
-        .disabled(!contact.ready || chat.chatItems.isEmpty)
-    }
-
-    private func muteButton(width: CGFloat) -> some View {
-        InfoViewButton(
-            image: chat.chatInfo.ntfsEnabled ? "speaker.slash.fill" : "speaker.wave.2.fill",
-            title: chat.chatInfo.ntfsEnabled ? "mute" : "unmute",
-            width: width
-        ) {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
-        }
-        .disabled(!contact.ready || !contact.active)
-    }
-
     private func verifyCodeButton(_ code: String) -> some View {
         NavigationLink {
             VerifyCodeView(
@@ -442,7 +389,7 @@ struct ChatInfoView: View {
             )
         }
     }
-    
+
     private func contactPreferencesButton() -> some View {
         NavigationLink {
             ContactPreferencesView(
@@ -457,7 +404,7 @@ struct ChatInfoView: View {
             Label("Contact preferences", systemImage: "switch.2")
         }
     }
-    
+
     private func sendReceiptsOption() -> some View {
         Picker(selection: $sendReceipts) {
             ForEach([.yes, .no, .userDefault(sendReceiptsUserDefault)]) { (opt: SendReceipts) in
@@ -471,13 +418,13 @@ struct ChatInfoView: View {
             setSendReceipts()
         }
     }
-    
+
     private func setSendReceipts() {
         var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
         chatSettings.sendRcpts = sendReceipts.bool()
         updateChatSettings(chat, chatSettings: chatSettings)
     }
-    
+
     private func synchronizeConnectionButton() -> some View {
         Button {
             syncContactConnection(force: false)
@@ -486,7 +433,7 @@ struct ChatInfoView: View {
                 .foregroundColor(.orange)
         }
     }
-    
+
     private func synchronizeConnectionButtonForce() -> some View {
         Button {
             alert = .syncConnectionForceAlert
@@ -495,7 +442,7 @@ struct ChatInfoView: View {
                 .foregroundColor(.red)
         }
     }
-    
+
     private func networkStatusRow() -> some View {
         HStack {
             Text("Network status")
@@ -503,35 +450,28 @@ struct ChatInfoView: View {
                 .foregroundColor(theme.colors.primary)
                 .font(.system(size: 14))
             Spacer()
-            Text(networkModel.contactNetworkStatus(contact).statusString)
+            Text(chatModel.contactNetworkStatus(contact).statusString)
                 .foregroundColor(theme.colors.secondary)
             serverImage()
         }
     }
-    
+
     private func serverImage() -> some View {
-        let status = networkModel.contactNetworkStatus(contact)
+        let status = chatModel.contactNetworkStatus(contact)
         return Image(systemName: status.imageName)
             .foregroundColor(status == .connected ? .green : theme.colors.secondary)
             .font(.system(size: 12))
     }
-    
+
     private func deleteContactButton() -> some View {
         Button(role: .destructive) {
-            deleteContactDialog(
-                chat,
-                contact,
-                dismissToChatList: true,
-                showAlert: { alert = .someAlert(alert: $0) },
-                showActionSheet: { actionSheet = $0 },
-                showSheetContent: { sheet = $0 }
-            )
+            showDeleteContactActionSheet = true
         } label: {
-            Label("Delete contact", systemImage: "person.badge.minus")
+            Label("Delete contact", systemImage: "trash")
                 .foregroundColor(Color.red)
         }
     }
-    
+
     private func clearChatButton() -> some View {
         Button() {
             alert = .clearChatAlert
@@ -540,7 +480,26 @@ struct ChatInfoView: View {
                 .foregroundColor(Color.orange)
         }
     }
-    
+
+    private func deleteContact(notify: Bool? = nil) {
+        Task {
+            do {
+                try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, notify: notify)
+                await MainActor.run {
+                    dismiss()
+                    chatModel.chatId = nil
+                    chatModel.removeChat(chat.chatInfo.id)
+                }
+            } catch let error {
+                logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
+                let a = getErrorAlert(error, "Error deleting contact")
+                await MainActor.run {
+                    alert = .error(title: a.title, error: a.message)
+                }
+            }
+        }
+    }
+
     private func clearChatAlert() -> Alert {
         Alert(
             title: Text("Clear conversation?"),
@@ -554,14 +513,14 @@ struct ChatInfoView: View {
             secondaryButton: .cancel()
         )
     }
-    
+
     private func networkStatusAlert() -> Alert {
         Alert(
             title: Text("Network status"),
-            message: Text(networkModel.contactNetworkStatus(contact).statusExplanation)
+            message: Text(chatModel.contactNetworkStatus(contact).statusExplanation)
         )
     }
-    
+
     private func switchContactAddress() {
         Task {
             do {
@@ -580,7 +539,7 @@ struct ChatInfoView: View {
             }
         }
     }
-    
+
     private func abortSwitchContactAddress() {
         Task {
             do {
@@ -598,7 +557,7 @@ struct ChatInfoView: View {
             }
         }
     }
-    
+
     private func syncContactConnection(force: Bool) {
         Task {
             do {
@@ -619,153 +578,6 @@ struct ChatInfoView: View {
     }
 }
 
-struct AudioCallButton: View {
-    var chat: Chat
-    var contact: Contact
-    var width: CGFloat
-    var showAlert: (SomeAlert) -> Void
-
-    var body: some View {
-        CallButton(
-            chat: chat,
-            contact: contact,
-            image: "phone.fill",
-            title: "call",
-            mediaType: .audio,
-            width: width,
-            showAlert: showAlert
-        )
-    }
-}
-
-struct VideoButton: View {
-    var chat: Chat
-    var contact: Contact
-    var width: CGFloat
-    var showAlert: (SomeAlert) -> Void
-
-    var body: some View {
-        CallButton(
-            chat: chat,
-            contact: contact,
-            image: "video.fill",
-            title: "video",
-            mediaType: .video,
-            width: width,
-            showAlert: showAlert
-        )
-    }
-}
-
-private struct CallButton: View {
-    var chat: Chat
-    var contact: Contact
-    var image: String
-    var title: LocalizedStringKey
-    var mediaType: CallMediaType
-    var width: CGFloat
-    var showAlert: (SomeAlert) -> Void
-
-    var body: some View {
-        let canCall = contact.ready && contact.active && chat.chatInfo.featureEnabled(.calls) && ChatModel.shared.activeCall == nil
-
-        InfoViewButton(image: image, title: title, disabledLook: !canCall, width: width) {
-            if canCall {
-                CallController.shared.startCall(contact, mediaType)
-            } else if contact.nextSendGrpInv {
-                showAlert(SomeAlert(
-                    alert: mkAlert(
-                        title: "Can't call contact",
-                        message: "Send message to enable calls."
-                    ),
-                    id: "can't call contact, send message"
-                ))
-            } else if !contact.active {
-                showAlert(SomeAlert(
-                    alert: mkAlert(
-                        title: "Can't call contact",
-                        message: "Contact is deleted."
-                    ),
-                    id: "can't call contact, contact deleted"
-                ))
-            } else if !contact.ready {
-                showAlert(SomeAlert(
-                    alert: mkAlert(
-                        title: "Can't call contact",
-                        message: "Connecting to contact, please wait or check later!"
-                    ),
-                    id: "can't call contact, contact not ready"
-                ))
-            } else if !chat.chatInfo.featureEnabled(.calls) {
-                switch chat.chatInfo.showEnableCallsAlert {
-                case .userEnable:
-                    showAlert(SomeAlert(
-                        alert: Alert(
-                            title: Text("Allow calls?"),
-                            message: Text("You need to allow your contact to call to be able to call them."),
-                            primaryButton: .default(Text("Allow")) {
-                                allowFeatureToContact(contact, .calls)
-                            },
-                            secondaryButton: .cancel()
-                        ),
-                        id: "allow calls"
-                    ))
-                case .askContact:
-                    showAlert(SomeAlert(
-                        alert: mkAlert(
-                            title: "Calls prohibited!",
-                            message: "Please ask your contact to enable calls."
-                        ),
-                        id: "calls prohibited, ask contact"
-                    ))
-                case .other:
-                    showAlert(SomeAlert(
-                        alert: mkAlert(
-                            title: "Calls prohibited!",
-                            message: "Please check yours and your contact preferences."
-                        )
-                        , id: "calls prohibited, other"
-                    ))
-                }
-            } else {
-                showAlert(SomeAlert(
-                    alert: mkAlert(title: "Can't call contact"),
-                    id: "can't call contact"
-                ))
-            }
-        }
-        .disabled(ChatModel.shared.activeCall != nil)
-    }
-}
-
-let infoViewActionButtonHeight: CGFloat = 60
-
-struct InfoViewButton: View {
-    var image: String
-    var title: LocalizedStringKey
-    var disabledLook: Bool = false
-    var width: CGFloat
-    var action: () -> Void
-
-    var body: some View {
-        VStack(spacing: 4) {
-            Image(systemName: image)
-                .resizable()
-                .scaledToFit()
-                .frame(width: 20, height: 20)
-            Text(title)
-                .font(.caption)
-        }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
-        .foregroundColor(.accentColor)
-        .background(Color(.secondarySystemGroupedBackground))
-        .cornerRadius(10.0)
-        .frame(width: width, height: infoViewActionButtonHeight)
-        .disabled(disabledLook)
-        .onTapGesture(perform: action)
-    }
-}
-
 struct ChatWallpaperEditorSheet: View {
     @Environment(\.dismiss) var dismiss
     @EnvironmentObject var theme: AppTheme
@@ -951,222 +763,15 @@ func queueInfoAlert(_ info: String) -> Alert {
     )
 }
 
-func deleteContactDialog(
-    _ chat: Chat,
-    _ contact: Contact,
-    dismissToChatList: Bool,
-    showAlert: @escaping (SomeAlert) -> Void,
-    showActionSheet: @escaping (SomeActionSheet) -> Void,
-    showSheetContent: @escaping (SomeSheet<AnyView>) -> Void
-) {
-    if contact.sndReady && contact.active && !contact.chatDeleted {
-        deleteContactOrConversationDialog(chat, contact, dismissToChatList, showAlert, showActionSheet, showSheetContent)
-    } else if contact.sndReady && contact.active && contact.chatDeleted {
-        deleteContactWithoutConversation(chat, contact, dismissToChatList, showAlert, showActionSheet)
-    } else { // !(contact.sndReady && contact.active)
-        deleteNotReadyContact(chat, contact, dismissToChatList, showAlert, showActionSheet)
-    }
-}
-
-private func deleteContactOrConversationDialog(
-    _ chat: Chat,
-    _ contact: Contact,
-    _ dismissToChatList: Bool,
-    _ showAlert: @escaping (SomeAlert) -> Void,
-    _ showActionSheet: @escaping (SomeActionSheet) -> Void,
-    _ showSheetContent: @escaping (SomeSheet<AnyView>) -> Void
-) {
-    showActionSheet(SomeActionSheet(
-        actionSheet: ActionSheet(
-            title: Text("Delete contact?"),
-            buttons: [
-                .destructive(Text("Only delete conversation")) {
-                    deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: .messages, dismissToChatList, showAlert)
-                },
-                .destructive(Text("Delete contact")) {
-                    showSheetContent(SomeSheet(
-                        content: { AnyView(
-                            DeleteActiveContactDialog(
-                                chat: chat,
-                                contact: contact,
-                                dismissToChatList: dismissToChatList,
-                                showAlert: showAlert
-                            )
-                        ) },
-                        id: "DeleteActiveContactDialog"
-                    ))
-                },
-                .cancel()
-            ]
-        ),
-        id: "deleteContactOrConversationDialog"
-    ))
-}
-
-private func deleteContactMaybeErrorAlert(
-    _ chat: Chat,
-    _ contact: Contact,
-    chatDeleteMode: ChatDeleteMode,
-    _ dismissToChatList: Bool,
-    _ showAlert: @escaping (SomeAlert) -> Void
-) {
-    Task {
-        let alert_ = await deleteContactChat(chat, chatDeleteMode: chatDeleteMode)
-        if let alert = alert_ {
-            showAlert(SomeAlert(alert: alert, id: "deleteContactMaybeErrorAlert, error"))
-        } else {
-            if dismissToChatList {
-                await MainActor.run {
-                    ChatModel.shared.chatId = nil
-                }
-                DispatchQueue.main.async {
-                    dismissAllSheets(animated: true) {
-                        if case .messages = chatDeleteMode, showDeleteConversationNoticeDefault.get() {
-                            AlertManager.shared.showAlert(deleteConversationNotice(contact))
-                        } else if chatDeleteMode.isEntity, showDeleteContactNoticeDefault.get() {
-                            AlertManager.shared.showAlert(deleteContactNotice(contact))
-                        }
-                    }
-                }
-            } else {
-                if case .messages = chatDeleteMode, showDeleteConversationNoticeDefault.get() {
-                    showAlert(SomeAlert(alert: deleteConversationNotice(contact), id: "deleteContactMaybeErrorAlert, deleteConversationNotice"))
-                } else if chatDeleteMode.isEntity, showDeleteContactNoticeDefault.get() {
-                    showAlert(SomeAlert(alert: deleteContactNotice(contact), id: "deleteContactMaybeErrorAlert, deleteContactNotice"))
-                }
-            }
-        }
-    }
-}
-
-private func deleteConversationNotice(_ contact: Contact) -> Alert {
-    return Alert(
-        title: Text("Conversation deleted!"),
-        message: Text("You can send messages to \(contact.displayName) from Archived contacts."),
-        primaryButton: .default(Text("Don't show again")) {
-            showDeleteConversationNoticeDefault.set(false)
-        },
-        secondaryButton: .default(Text("Ok"))
-    )
-}
-
-private func deleteContactNotice(_ contact: Contact) -> Alert {
-    return Alert(
-        title: Text("Contact deleted!"),
-        message: Text("You can still view conversation with \(contact.displayName) in the list of chats."),
-        primaryButton: .default(Text("Don't show again")) {
-            showDeleteContactNoticeDefault.set(false)
-        },
-        secondaryButton: .default(Text("Ok"))
-    )
-}
-
-enum ContactDeleteMode {
-    case full
-    case entity
-
-    public func toChatDeleteMode(notify: Bool) -> ChatDeleteMode {
-        switch self {
-        case .full: .full(notify: notify)
-        case .entity: .entity(notify: notify)
-        }
-    }
-}
-
-struct DeleteActiveContactDialog: View {
-    @Environment(\.dismiss) var dismiss
-    @EnvironmentObject var theme: AppTheme
-    var chat: Chat
-    var contact: Contact
-    var dismissToChatList: Bool
-    var showAlert: (SomeAlert) -> Void
-    @State private var keepConversation = false
-
-    var body: some View {
-        NavigationView {
-            List {
-                Section {
-                    Toggle("Keep conversation", isOn: $keepConversation)
-
-                    Button(role: .destructive) {
-                        dismiss()
-                        deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: contactDeleteMode.toChatDeleteMode(notify: false), dismissToChatList, showAlert)
-                    } label: {
-                        Text("Delete without notification")
-                    }
-
-                    Button(role: .destructive) {
-                        dismiss()
-                        deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: contactDeleteMode.toChatDeleteMode(notify: true), dismissToChatList, showAlert)
-                    } label: {
-                        Text("Delete and notify contact")
-                    }
-                } footer: {
-                    Text("Contact will be deleted - this cannot be undone!")
-                        .foregroundColor(theme.colors.secondary)
-                }
-            }
-            .modifier(ThemedBackground(grouped: true))
-        }
-    }
-
-    var contactDeleteMode: ContactDeleteMode {
-        keepConversation ? .entity : .full
-    }
-}
-
-private func deleteContactWithoutConversation(
-    _ chat: Chat,
-    _ contact: Contact,
-    _ dismissToChatList: Bool,
-    _ showAlert: @escaping (SomeAlert) -> Void,
-    _ showActionSheet: @escaping (SomeActionSheet) -> Void
-) {
-    showActionSheet(SomeActionSheet(
-        actionSheet: ActionSheet(
-            title: Text("Confirm contact deletion?"),
-            buttons: [
-                .destructive(Text("Delete and notify contact")) {
-                    deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: .full(notify: true), dismissToChatList, showAlert)
-                },
-                .destructive(Text("Delete without notification")) {
-                    deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: .full(notify: false), dismissToChatList, showAlert)
-                },
-                .cancel()
-            ]
-        ),
-        id: "deleteContactWithoutConversation"
-    ))
-}
-
-private func deleteNotReadyContact(
-    _ chat: Chat,
-    _ contact: Contact,
-    _ dismissToChatList: Bool,
-    _ showAlert: @escaping (SomeAlert) -> Void,
-    _ showActionSheet: @escaping (SomeActionSheet) -> Void
-) {
-    showActionSheet(SomeActionSheet(
-        actionSheet: ActionSheet(
-            title: Text("Confirm contact deletion?"),
-            buttons: [
-                .destructive(Text("Confirm")) {
-                    deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: .full(notify: false), dismissToChatList, showAlert)
-                },
-                .cancel()
-            ]
-        ),
-        id: "deleteNotReadyContact"
-    ))
-}
-
 struct ChatInfoView_Previews: PreviewProvider {
     static var previews: some View {
         ChatInfoView(
             chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []),
             contact: Contact.sampleData,
+            connectionStats: Binding.constant(nil),
+            customUserProfile: Binding.constant(nil),
             localAlias: "",
-            onSearch: {}
+            connectionCode: Binding.constant(nil)
         )
     }
 }

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

@@ -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/ChatItemForwardingView.swift

@@ -97,7 +97,7 @@ struct ChatItemForwardingView: View {
                     )
                 } else {
                     composeState = ComposeState.init(forwardingItem: ci, fromChatInfo: fromChatInfo)
-                    ItemsModel.shared.loadOpenChat(chat.id)
+                    chatModel.chatId = chat.id
                 }
             }
         } label: {

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

@@ -351,7 +351,7 @@ struct ChatItemInfoView: View {
             Button {
                 Task {
                     await MainActor.run {
-                        ItemsModel.shared.loadOpenChat(forwardedFromItem.chatInfo.id)
+                        chatModel.chatId = forwardedFromItem.chatInfo.id
                         dismiss()
                     }
                 }
@@ -440,7 +440,7 @@ struct ChatItemInfoView: View {
 
     private func memberDeliveryStatusView(_ member: GroupMember, _ status: GroupSndStatus, _ sentViaProxy: Bool?) -> some View {
         HStack{
-            MemberProfileImage(member, size: 30)
+            ProfileImage(imageStr: member.image, size: 30)
                 .padding(.trailing, 2)
             Text(member.chatViewName)
                 .lineLimit(1)

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

@@ -47,69 +47,65 @@ struct ChatView: View {
     @State private var showDeleteSelectedMessages: Bool = false
     @State private var allowToDeleteSelectedMessagesForAll: Bool = false
 
-    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
-
     var body: some View {
         if #available(iOS 16.0, *) {
-            viewBody
-                .scrollDismissesKeyboard(.immediately)
-                .toolbarBackground(.hidden, for: .navigationBar)
+            let v = viewBody
+            .scrollDismissesKeyboard(.immediately)
+            .keyboardPadding()
+            if (searchMode) {
+                v.toolbarBackground(.thinMaterial, for: .navigationBar)
+            } else {
+                v.toolbarBackground(.visible, for: .navigationBar)
+            }
         } else {
             viewBody
         }
     }
 
-    @ViewBuilder
     private var viewBody: some View {
         let cInfo = chat.chatInfo
-        ZStack {
-            let wallpaperImage = theme.wallpaper.type.image
-            let wallpaperType = theme.wallpaper.type
-            let backgroundColor = theme.wallpaper.background ?? wallpaperType.defaultBackgroundColor(theme.base, theme.colors.background)
-            let tintColor = theme.wallpaper.tint ?? wallpaperType.defaultTintColor(theme.base)
-            Color.clear.ignoresSafeArea(.all)
-                .if(wallpaperImage != nil) { view in
-                    view.modifier(
-                        ChatViewBackground(image: wallpaperImage!, imageType: wallpaperType, background: backgroundColor, tint: tintColor)
-                    )
-            }
-            VStack(spacing: 0) {
-                ZStack(alignment: .bottomTrailing) {
-                    chatItemsList()
-                    floatingButtons(counts: floatingButtonModel.unreadChatItemCounts)
-                }
-                connectingText()
-                if selectedChatItems == nil {
-                    ComposeView(
-                        chat: chat,
-                        composeState: $composeState,
-                        keyboardVisible: $keyboardVisible
-                    )
-                    .disabled(!cInfo.sendMsgEnabled)
-                } else {
-                    SelectedItemsBottomToolbar(
-                        chatItems: ItemsModel.shared.reversedChatItems,
-                        selectedChatItems: $selectedChatItems,
-                        chatInfo: chat.chatInfo,
-                        deleteItems: { forAll in
-                            allowToDeleteSelectedMessagesForAll = forAll
-                            showDeleteSelectedMessages = true
-                        },
-                        moderateItems: {
-                            if case let .group(groupInfo) = chat.chatInfo {
-                                showModerateSelectedMessagesAlert(groupInfo)
-                            }
-                        }
-                    )
-                }
-            }
-        }
-        .safeAreaInset(edge: .top) {
-            VStack(spacing: .zero) {
-                if searchMode { searchToolbar() }
+        return VStack(spacing: 0) {
+            if searchMode {
+                searchToolbar()
                 Divider()
             }
-            .background(ToolbarMaterial.material(toolbarMaterial))
+            ZStack(alignment: .bottomTrailing) {
+                let wallpaperImage = theme.wallpaper.type.image
+                let wallpaperType = theme.wallpaper.type
+                let backgroundColor = theme.wallpaper.background ?? wallpaperType.defaultBackgroundColor(theme.base, theme.colors.background)
+                let tintColor = theme.wallpaper.tint ?? wallpaperType.defaultTintColor(theme.base)
+                chatItemsList()
+                    .if(wallpaperImage != nil) { view in
+                        view.modifier(
+                            ChatViewBackground(image: wallpaperImage!, imageType: wallpaperType, background: backgroundColor, tint: tintColor)
+                        )
+                }
+                floatingButtons(counts: floatingButtonModel.unreadChatItemCounts)
+            }
+            connectingText()
+            if selectedChatItems == nil {
+                ComposeView(
+                    chat: chat,
+                    composeState: $composeState,
+                    keyboardVisible: $keyboardVisible
+                )
+                .disabled(!cInfo.sendMsgEnabled)
+            } else {
+                SelectedItemsBottomToolbar(
+                    chatItems: ItemsModel.shared.reversedChatItems,
+                    selectedChatItems: $selectedChatItems,
+                    chatInfo: chat.chatInfo,
+                    deleteItems: { forAll in
+                        allowToDeleteSelectedMessagesForAll = forAll
+                        showDeleteSelectedMessages = true
+                    },
+                    moderateItems: {
+                        if case let .group(groupInfo) = chat.chatInfo {
+                            showModerateSelectedMessagesAlert(groupInfo)
+                        }
+                    }
+                )
+            }
         }
         .navigationTitle(cInfo.chatViewName)
         .background(theme.colors.background)
@@ -129,23 +125,16 @@ struct ChatView: View {
                 }
             }
         }
-        .appSheet(item: $selectedMember) { member in
-            Group {
-                if case let .group(groupInfo) = chat.chatInfo {
-                    GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
-                }
-            }
-        }
         .onAppear {
-            selectedChatItems = nil
+            loadChat(chat: chat)
             initChatView()
+            selectedChatItems = nil
         }
         .onChange(of: chatModel.chatId) { cId in
             showChatInfoSheet = false
-            selectedChatItems = nil
-            scrollModel.scrollToBottom()
             stopAudioPlayer()
             if let cId {
+                selectedChatItems = nil
                 if let c = chatModel.getChat(cId) {
                     chat = c
                 }
@@ -158,10 +147,8 @@ struct ChatView: View {
         .onChange(of: revealedChatItem) { _ in
             NotificationCenter.postReverseListNeedsLayout()
         }
-        .onChange(of: im.isLoading) { isLoading in
-            if !isLoading,
-               im.reversedChatItems.count <= loadItemsPerPage,
-               filtered(im.reversedChatItems).count < 10 {
+        .onChange(of: im.reversedChatItems) { reversedChatItems in
+            if reversedChatItems.count <= loadItemsPerPage && filtered(reversedChatItems).count < 10 {
                 loadChatItems(chat.chatInfo)
             }
         }
@@ -170,6 +157,7 @@ struct ChatView: View {
             VideoPlayerView.players.removeAll()
             stopAudioPlayer()
             if chatModel.chatId == cInfo.id && !presentationMode.wrappedValue.isPresented {
+                chatModel.chatId = nil
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
                     if chatModel.chatId == nil {
                         chatModel.chatItemStatuses = [:]
@@ -191,18 +179,32 @@ struct ChatView: View {
                 } else if case let .direct(contact) = cInfo {
                     Button {
                         Task {
-                            showChatInfoSheet = true
+                            do {
+                                let (stats, profile) = try await apiContactInfo(chat.chatInfo.apiId)
+                                let (ct, code) = try await apiGetContactCode(chat.chatInfo.apiId)
+                                await MainActor.run {
+                                    connectionStats = stats
+                                    customUserProfile = profile
+                                    connectionCode = code
+                                    if contact.activeConn?.connectionCode != ct.activeConn?.connectionCode {
+                                        chat.chatInfo = .direct(contact: ct)
+                                    }
+                                }
+                            } catch let error {
+                                logger.error("apiContactInfo or apiGetContactCode error: \(responseError(error))")
+                            }
+                            await MainActor.run { showChatInfoSheet = true }
                         }
                     } label: {
                         ChatInfoToolbar(chat: chat)
                     }
-                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
-                        ChatInfoView(
-                            chat: chat,
-                            contact: contact,
-                            localAlias: chat.chatInfo.localAlias,
-                            onSearch: { focusSearch() }
-                        )
+                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: {
+                        connectionStats = nil
+                        customUserProfile = nil
+                        connectionCode = nil
+                        theme = buildTheme()
+                    }) {
+                        ChatInfoView(chat: chat, contact: contact, connectionStats: $connectionStats, customUserProfile: $customUserProfile, localAlias: chat.chatInfo.localAlias, connectionCode: $connectionCode)
                     }
                 } else if case let .group(groupInfo) = cInfo {
                     Button {
@@ -220,8 +222,7 @@ struct ChatView: View {
                                     chat.chatInfo = .group(groupInfo: gInfo)
                                     chat.created = Date.now
                                 }
-                            ),
-                            onSearch: { focusSearch() }
+                            )
                         )
                     }
                 } else if case .local = cInfo {
@@ -229,7 +230,6 @@ struct ChatView: View {
                 }
             }
             ToolbarItem(placement: .navigationBarTrailing) {
-                let isLoading = im.isLoading && im.showLoadingProgress
                 if selectedChatItems != nil {
                     Button {
                         withAnimation {
@@ -252,23 +252,19 @@ struct ChatView: View {
                                 }
                             }
                             Menu {
-                                if !isLoading {
-                                    if callsPrefEnabled && chatModel.activeCall == nil {
-                                        Button {
-                                            CallController.shared.startCall(contact, .video)
-                                        } label: {
-                                            Label("Video call", systemImage: "video")
-                                        }
-                                        .disabled(!contact.ready || !contact.active)
+                                if callsPrefEnabled && chatModel.activeCall == nil {
+                                    Button {
+                                        CallController.shared.startCall(contact, .video)
+                                    } label: {
+                                        Label("Video call", systemImage: "video")
                                     }
-                                    searchButton()
-                                    ToggleNtfsButton(chat: chat)
-                                        .disabled(!contact.ready || !contact.active)
+                                    .disabled(!contact.ready || !contact.active)
                                 }
+                                searchButton()
+                                ToggleNtfsButton(chat: chat)
+                                    .disabled(!contact.ready || !contact.active)
                             } label: {
                                 Image(systemName: "ellipsis")
-                                    .tint(isLoading ? Color.clear : nil)
-                                    .overlay { if isLoading { ProgressView() } }
                             }
                         }
                     case let .group(groupInfo):
@@ -293,14 +289,10 @@ struct ChatView: View {
                                 }
                             }
                             Menu {
-                                if !isLoading {
-                                    searchButton()
-                                    ToggleNtfsButton(chat: chat)
-                                }
+                                searchButton()
+                                ToggleNtfsButton(chat: chat)
                             } label: {
                                 Image(systemName: "ellipsis")
-                                    .tint(isLoading ? Color.clear : nil)
-                                    .overlay { if isLoading { ProgressView() } }
                             }
                         }
                     case .local:
@@ -366,11 +358,14 @@ struct ChatView: View {
                 searchText = ""
                 searchMode = false
                 searchFocussed = false
-                Task { await loadChat(chat: chat) }
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
+                    loadChat(chat: chat)
+                }
             }
         }
         .padding(.horizontal)
         .padding(.vertical, 8)
+        .background(.thinMaterial)
     }
     
     private func voiceWithoutFrame(_ ci: ChatItem) -> Bool {
@@ -381,7 +376,7 @@ struct ChatView: View {
         reversedChatItems
             .enumerated()
             .filter { (index, chatItem) in
-                if let mergeCategory = chatItem.mergeCategory, index > 0 {
+                if let mergeCategory = chatItem.mergeCategory, index > .zero {
                     mergeCategory != reversedChatItems[index - 1].mergeCategory
                 } else {
                     true
@@ -404,42 +399,31 @@ struct ChatView: View {
                                 : voiceNoFrame
                                     ? (g.size.width - 32)
                                     : (g.size.width - 32) * 0.84
-                return ChatItemWithMenu(
-                    chat: $chat,
-                    chatItem: ci,
-                    maxWidth: maxWidth,
-                    composeState: $composeState,
-                    selectedMember: $selectedMember,
-                    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
+                return chatItemView(ci, maxWidth)
+                    .onAppear {
+                        floatingButtonModel.appeared(viewId: ci.viewId)
+                    }
+                    .onDisappear {
+                        floatingButtonModel.disappeared(viewId: ci.viewId)
+                    }
+                    .id(ci.id) // Required to trigger `onAppear` on iOS15
             } loadPage: {
                 loadChatItems(cInfo)
             }
-            .opacity(ItemsModel.shared.isLoading ? 0 : 1)
-            .padding(.vertical, -InvertedTableView.inset)
-            .onTapGesture { hideKeyboard() }
-            .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.unreadChatItemCounts.isReallyNearBottom {
-                        scrollModel.scrollToBottom()
+                .onTapGesture { hideKeyboard() }
+                .onChange(of: searchText) { _ in
+                    loadChat(chat: chat, search: searchText)
+                }
+                .onChange(of: chatModel.chatId) { chatId in
+                    if let chatId, let c = chatModel.getChat(chatId) {
+                        chat = c
+                        showChatInfoSheet = false
+                        loadChat(chat: c)
                     }
                 }
-            }
+                .onChange(of: im.reversedChatItems) { _ in
+                    floatingButtonModel.chatItemsChanged()
+                }
         }
     }
 
@@ -472,19 +456,19 @@ struct ChatView: View {
         init() {
             unreadChatItemCounts = UnreadChatItemCounts(
                 isNearBottom: true,
-                isReallyNearBottom: true,
-                unreadBelow: 0
+                unreadBelow: .zero
             )
             events
                 .receive(on: DispatchQueue.global(qos: .background))
                 .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 switch event {
+                    case let .appeared(viewId):
+                        itemsInView.union([viewId])
+                    case let .disappeared(viewId):
+                        itemsInView.subtracting([viewId])
+                    case .chatItemsChanged:
+                        itemsInView
                     }
-                    return updated
                 }
                 .map { ChatModel.shared.unreadChatItemCounts(itemsInView: $0) }
                 .removeDuplicates()
@@ -580,18 +564,14 @@ struct ChatView: View {
 
     private func searchButton() -> some View {
         Button {
-            focusSearch()
+            searchMode = true
+            searchFocussed = true
+            searchText = ""
         } label: {
             Label("Search", systemImage: "magnifyingglass")
         }
     }
 
-    private func focusSearch() {
-        searchMode = true
-        searchFocussed = true
-        searchText = ""
-    }
-
     private func addMembersButton() -> some View {
         Button {
             if case let .group(gInfo) = chat.chatInfo {
@@ -692,10 +672,22 @@ struct ChatView: View {
         VoiceItemState.chatView = [:]
     }
 
+    @ViewBuilder private func chatItemView(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
+        ChatItemWithMenu(
+            chat: chat,
+            chatItem: ci,
+            maxWidth: maxWidth,
+            composeState: $composeState,
+            selectedMember: $selectedMember,
+            revealedChatItem: $revealedChatItem,
+            selectedChatItems: $selectedChatItems
+        )
+    }
+
     private struct ChatItemWithMenu: View {
         @EnvironmentObject var m: ChatModel
         @EnvironmentObject var theme: AppTheme
-        @Binding @ObservedObject var chat: Chat
+        @ObservedObject var chat: Chat
         let chatItem: ChatItem
         let maxWidth: CGFloat
         @Binding var composeState: ComposeState
@@ -725,7 +717,7 @@ struct ChatView: View {
             Group {
                 if revealed, let range = range {
                     let items = Array(zip(Array(range), im.reversedChatItems[range]))
-                    ForEach(items.reversed(), id: \.1.viewId) { (i, ci) in
+                    ForEach(items, id: \.1.viewId) { (i, ci) in
                         let prev = i == prevHidden ? prevItem : im.reversedChatItems[i + 1]
                         chatItemView(ci, nil, prev)
                         .overlay {
@@ -821,10 +813,10 @@ struct ChatView: View {
                                     .padding(.trailing, 12)
                             }
                             HStack(alignment: .top, spacing: 8) {
-                                MemberProfileImage(member, size: memberImageSize, backgroundColor: theme.colors.background)
+                                ProfileImage(imageStr: member.memberProfile.image, size: memberImageSize, backgroundColor: theme.colors.background)
                                     .onTapGesture {
-                                        if let member =  m.getGroupMember(member.groupMemberId) {
-                                            selectedMember = member
+                                        if m.membersLoaded {
+                                            selectedMember = m.getGroupMember(member.groupMemberId)
                                         } else {
                                             Task {
                                                 await m.loadGroupMembers(groupInfo) {
@@ -833,6 +825,9 @@ struct ChatView: View {
                                             }
                                         }
                                     }
+                                    .appSheet(item: $selectedMember) { member in
+                                        GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
+                                    }
                                 chatItemWithMenu(ci, range, maxWidth)
                             }
                         }
@@ -1103,7 +1098,7 @@ struct ChatView: View {
         }
 
         func reactions(from: Int? = nil, till: Int? = nil) -> some View {
-            ForEach(availableReactions[(from ?? 0)..<(till ?? availableReactions.count)]) { reaction in
+            ForEach(availableReactions[(from ?? .zero)..<(till ?? availableReactions.count)]) { reaction in
                 Button(reaction.text) {
                     setReaction(chatItem, add: true, reaction: reaction)
                 }

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

@@ -55,7 +55,7 @@ struct ComposeLinkView: View {
                     .foregroundColor(theme.colors.secondary)
             }
             .padding(.vertical, 5)
-            .frame(maxWidth: .infinity, minHeight: 60)
+            .frame(maxWidth: .infinity, minHeight: 60, maxHeight: 60)
         }
     }
 }

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

@@ -281,7 +281,6 @@ struct ComposeView: View {
     @State private var stopPlayback: Bool = false
 
     @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
-    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
 
     var body: some View {
         VStack(spacing: 0) {
@@ -382,11 +381,7 @@ struct ComposeView: View {
                 }
             }
         }
-        .background {
-            Color.clear
-                .overlay(ToolbarMaterial.material(toolbarMaterial))
-                .ignoresSafeArea(.all, edges: .bottom)
-        }
+        .background(.thinMaterial)
         .onChange(of: composeState.message) { msg in
             if composeState.linkPreviewAllowed {
                 if msg.count > 0 {

apps/ios/Shared/Views/Chat/Group/AddGroupMembersView.swift

@@ -47,13 +47,14 @@ struct AddGroupMembersViewCommon: View {
 
     var body: some View {
         if creatingGroup {
-            addGroupMembersView()
-                .navigationBarBackButtonHidden()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarTrailing) {
-                        Button ("Skip") { addedMembersCb(selectedContacts) }
+            NavigationView {
+                addGroupMembersView()
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarTrailing) {
+                            Button ("Skip") { addedMembersCb(selectedContacts) }
+                        }
                     }
-                }
+            }
         } else {
             addGroupMembersView()
         }

apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift

@@ -17,12 +17,10 @@ struct GroupChatInfoView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @ObservedObject var chat: Chat
     @Binding var groupInfo: GroupInfo
-    var onSearch: () -> Void
     @State private var alert: GroupChatInfoViewAlert? = nil
     @State private var groupLink: String?
     @State private var groupLinkMemberRole: GroupMemberRole = .member
-    @State private var groupLinkNavLinkActive: Bool = false
-    @State private var addMembersNavLinkActive: Bool = false
+    @State private var showAddMembersSheet: Bool = false
     @State private var connectionStats: ConnectionStats?
     @State private var connectionCode: String?
     @State private var sendReceipts = SendReceipts.userDefault(true)
@@ -70,15 +68,6 @@ struct GroupChatInfoView: View {
             List {
                 groupInfoHeader()
                     .listRowBackground(Color.clear)
-                    .padding(.bottom, 18)
-
-                infoActionButtons()
-                    .padding(.horizontal)
-                    .frame(maxWidth: .infinity)
-                    .frame(height: infoViewActionButtonHeight)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
 
                 Section {
                     if groupInfo.canEdit {
@@ -185,6 +174,7 @@ struct GroupChatInfoView: View {
                 logger.error("GroupChatInfoView apiGetGroupLink: \(responseError(error))")
             }
         }
+         .keyboardPadding()
     }
 
     private func groupInfoHeader() -> some View {
@@ -208,95 +198,24 @@ struct GroupChatInfoView: View {
         .frame(maxWidth: .infinity, alignment: .center)
     }
 
-    func infoActionButtons() -> some View {
-        GeometryReader { g in
-            let buttonWidth = g.size.width / 4
-            HStack(alignment: .center, spacing: 8) {
-                searchButton(width: buttonWidth)
-                if groupInfo.canAddMembers {
-                    addMembersActionButton(width: buttonWidth)
-                }
-                muteButton(width: buttonWidth)
-            }
-            .frame(maxWidth: .infinity, alignment: .center)
-        }
-    }
-
-    private func searchButton(width: CGFloat) -> some View {
-        InfoViewButton(image: "magnifyingglass", title: "search", width: width) {
-            dismiss()
-            onSearch()
-        }
-        .disabled(!groupInfo.ready || chat.chatItems.isEmpty)
-    }
-
-    @ViewBuilder private func addMembersActionButton(width: CGFloat) -> some View {
-        if chat.chatInfo.incognito {
-            ZStack {
-                InfoViewButton(image: "link.badge.plus", title: "invite", width: width) {
-                    groupLinkNavLinkActive = true
-                }
-
-                NavigationLink(isActive: $groupLinkNavLinkActive) {
-                    groupLinkDestinationView()
-                } label: {
-                    EmptyView()
-                }
-                .frame(width: 1, height: 1)
-                .hidden()
-            }
-            .disabled(!groupInfo.ready)
-        } else {
-            ZStack {
-                InfoViewButton(image: "person.fill.badge.plus", title: "invite", width: width) {
-                    addMembersNavLinkActive = true
-                }
-
-                NavigationLink(isActive: $addMembersNavLinkActive) {
-                    addMembersDestinationView()
-                } label: {
-                    EmptyView()
-                }
-                .frame(width: 1, height: 1)
-                .hidden()
-            }
-            .disabled(!groupInfo.ready)
-        }
-    }
-
-    private func muteButton(width: CGFloat) -> some View {
-        InfoViewButton(
-            image: chat.chatInfo.ntfsEnabled ? "speaker.slash.fill" : "speaker.wave.2.fill",
-            title: chat.chatInfo.ntfsEnabled ? "mute" : "unmute",
-            width: width
-        ) {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
-        }
-        .disabled(!groupInfo.ready)
-    }
-
     private func addMembersButton() -> some View {
         NavigationLink {
-            addMembersDestinationView()
+            AddGroupMembersView(chat: chat, groupInfo: groupInfo)
+                .onAppear {
+                    searchFocussed = false
+                    Task {
+                        let groupMembers = await apiListMembers(groupInfo.groupId)
+                        await MainActor.run {
+                            chatModel.groupMembers = groupMembers.map { GMember.init($0) }
+                            chatModel.populateGroupMembersIndexes()
+                        }
+                    }
+                }
         } label: {
             Label("Invite members", systemImage: "plus")
         }
     }
 
-    private func addMembersDestinationView() -> some View {
-        AddGroupMembersView(chat: chat, groupInfo: groupInfo)
-            .onAppear {
-                searchFocussed = false
-                Task {
-                    let groupMembers = await apiListMembers(groupInfo.groupId)
-                    await MainActor.run {
-                        chatModel.groupMembers = groupMembers.map { GMember.init($0) }
-                        chatModel.populateGroupMembersIndexes()
-                    }
-                }
-            }
-    }
-
     private struct MemberRowView: View {
         var groupInfo: GroupInfo
         @ObservedObject var groupMember: GMember
@@ -307,7 +226,7 @@ struct GroupChatInfoView: View {
         var body: some View {
             let member = groupMember.wrapped
             let v = HStack{
-                MemberProfileImage(member, size: 38)
+                ProfileImage(imageStr: member.image, size: 38)
                     .padding(.trailing, 2)
                 // TODO server connection status
                 VStack(alignment: .leading) {
@@ -433,7 +352,16 @@ struct GroupChatInfoView: View {
 
     private func groupLinkButton() -> some View {
         NavigationLink {
-            groupLinkDestinationView()
+            GroupLinkView(
+                groupId: groupInfo.groupId,
+                groupLink: $groupLink,
+                groupLinkMemberRole: $groupLinkMemberRole,
+                showTitle: false,
+                creatingGroup: false
+            )
+            .navigationBarTitle("Group link")
+            .modifier(ThemedBackground(grouped: true))
+            .navigationBarTitleDisplayMode(.large)
         } label: {
             if groupLink == nil {
                 Label("Create group link", systemImage: "link.badge.plus")
@@ -443,19 +371,6 @@ struct GroupChatInfoView: View {
         }
     }
 
-    private func groupLinkDestinationView() -> some View {
-        GroupLinkView(
-            groupId: groupInfo.groupId,
-            groupLink: $groupLink,
-            groupLinkMemberRole: $groupLinkMemberRole,
-            showTitle: false,
-            creatingGroup: false
-        )
-        .navigationBarTitle("Group link")
-        .modifier(ThemedBackground(grouped: true))
-        .navigationBarTitleDisplayMode(.large)
-    }
-
     private func editGroupButton() -> some View {
         NavigationLink {
             GroupProfileView(
@@ -662,8 +577,7 @@ struct GroupChatInfoView_Previews: PreviewProvider {
     static var previews: some View {
         GroupChatInfoView(
             chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
-            groupInfo: Binding.constant(GroupInfo.sampleData),
-            onSearch: {}
+            groupInfo: Binding.constant(GroupInfo.sampleData)
         )
     }
 }

apps/ios/Shared/Views/Chat/Group/GroupLinkView.swift

@@ -34,13 +34,14 @@ struct GroupLinkView: View {
 
     var body: some View {
         if creatingGroup {
-            groupLinkView()
-                .navigationBarBackButtonHidden()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarTrailing) {
-                        Button ("Continue") { linkCreatedCb?() }
+            NavigationView {
+                groupLinkView()
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarTrailing) {
+                            Button ("Continue") { linkCreatedCb?() }
+                        }
                     }
-                }
+            }
         } else {
             groupLinkView()
         }

apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift

@@ -37,7 +37,6 @@ struct GroupMemberInfoView: View {
         case syncConnectionForceAlert
         case planAndConnectAlert(alert: PlanAndConnectAlert)
         case queueInfo(info: String)
-        case someAlert(alert: SomeAlert)
         case error(title: LocalizedStringKey, error: LocalizedStringKey?)
 
         var id: String {
@@ -53,7 +52,6 @@ struct GroupMemberInfoView: View {
             case .syncConnectionForceAlert: return "syncConnectionForceAlert"
             case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
             case let .queueInfo(info): return "queueInfo \(info)"
-            case let .someAlert(alert): return "someAlert \(alert.id)"
             case let .error(title, _): return "error \(title)"
             }
         }
@@ -67,11 +65,10 @@ struct GroupMemberInfoView: View {
         }
     }
 
-    private func knownDirectChat(_ contactId: Int64) -> (Chat, Contact)? {
+    private func knownDirectChat(_ contactId: Int64) -> Chat? {
         if let chat = chatModel.getContactChat(contactId),
-           let contact = chat.chatInfo.contact,
-           contact.directOrUsed == true {
-            return (chat, contact)
+           chat.chatInfo.contact?.directOrUsed == true {
+            return chat
         } else {
             return nil
         }
@@ -83,22 +80,21 @@ struct GroupMemberInfoView: View {
             List {
                 groupMemberInfoHeader(member)
                     .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .padding(.bottom, 18)
-
-                infoActionButtons(member)
-                    .padding(.horizontal)
-                    .frame(maxWidth: .infinity)
-                    .frame(height: infoViewActionButtonHeight)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
 
                 if member.memberActive {
                     Section {
+                        if let contactId = member.memberContactId, let chat = knownDirectChat(contactId) {
+                            knownDirectChatButton(chat)
+                        } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                            if let contactId = member.memberContactId {
+                                newDirectChatButton(contactId)
+                            } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
+                                createMemberContactButton()
+                            }
+                        }
                         if let code = connectionCode { verifyCodeButton(code) }
                         if let connStats = connectionStats,
-                            connStats.ratchetSyncAllowed {
+                           connStats.ratchetSyncAllowed {
                             synchronizeConnectionButton()
                         }
                         // } else if developerTools {
@@ -241,7 +237,6 @@ struct GroupMemberInfoView: View {
                 case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
                 case let .planAndConnectAlert(alert): return planAndConnectAlert(alert, dismiss: true)
                 case let .queueInfo(info): return queueInfoAlert(info)
-                case let .someAlert(a): return a.alert
                 case let .error(title, error): return mkAlert(title: title, message: error)
                 }
             }
@@ -254,57 +249,6 @@ struct GroupMemberInfoView: View {
         .modifier(ThemedBackground(grouped: true))
     }
 
-    func infoActionButtons(_ member: GroupMember) -> some View {
-        GeometryReader { g in
-            let buttonWidth = g.size.width / 4
-            HStack(alignment: .center, spacing: 8) {
-                if let contactId = member.memberContactId, let (chat, contact) = knownDirectChat(contactId) {
-                    knownDirectChatButton(chat, width: buttonWidth)
-                    AudioCallButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                    VideoButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
-                    if let contactId = member.memberContactId {
-                        newDirectChatButton(contactId, width: buttonWidth)
-                    } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
-                        createMemberContactButton(width: buttonWidth)
-                    }
-                    InfoViewButton(image: "phone.fill", title: "call", disabledLook: true, width: buttonWidth) { showSendMessageToEnableCallsAlert()
-                    }
-                    InfoViewButton(image: "video.fill", title: "video", disabledLook: true, width: buttonWidth) { showSendMessageToEnableCallsAlert()
-                    }
-                } else { // no known contact chat && directMessages are off
-                    InfoViewButton(image: "message.fill", title: "message", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't message member")
-                    }
-                    InfoViewButton(image: "phone.fill", title: "call", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't call member")
-                    }
-                    InfoViewButton(image: "video.fill", title: "video", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't call member")
-                    }
-                }
-            }
-            .frame(maxWidth: .infinity, alignment: .center)
-        }
-    }
-
-    func showSendMessageToEnableCallsAlert() {
-        alert = .someAlert(alert: SomeAlert(
-            alert: mkAlert(
-                title: "Can't call member",
-                message: "Send message to enable calls."
-            ),
-            id: "can't call member, send message"
-        ))
-    }
-
-    func showDirectMessagesProhibitedAlert(_ title: LocalizedStringKey) {
-        alert = .someAlert(alert: SomeAlert(
-            alert: mkAlert(
-                title: title,
-                message: "Direct messages between members are prohibited in this group."
-            ),
-            id: "can't message member, direct messages prohibited"
-        ))
-    }
-
     func connectViaAddressButton(_ contactLink: String) -> some View {
         Button {
             planAndConnect(
@@ -319,32 +263,36 @@ struct GroupMemberInfoView: View {
         }
     }
 
-    func knownDirectChatButton(_ chat: Chat, width: CGFloat) -> some View {
-        InfoViewButton(image: "message.fill", title: "message", width: width) {
-            ItemsModel.shared.loadOpenChat(chat.id) {
+    func knownDirectChatButton(_ chat: Chat) -> some View {
+        Button {
+            dismissAllSheets(animated: true)
+            DispatchQueue.main.async {
+                chatModel.chatId = chat.id
+            }
+        } label: {
+            Label("Send direct message", systemImage: "message")
+        }
+    }
+
+    func newDirectChatButton(_ contactId: Int64) -> some View {
+        Button {
+            do {
+                let chat = try apiGetChat(type: .direct, id: contactId)
+                chatModel.addChat(chat)
                 dismissAllSheets(animated: true)
-            }
-        }
-    }
-
-    func newDirectChatButton(_ contactId: Int64, width: CGFloat) -> some View {
-        InfoViewButton(image: "message.fill", title: "message", width: width) {
-            Task {
-                do {
-                    let chat = try await apiGetChat(type: .direct, id: contactId)
-                    chatModel.addChat(chat)
-                    ItemsModel.shared.loadOpenChat(chat.id) {
-                        dismissAllSheets(animated: true)
-                    }
-                } catch let error {
-                    logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
+                DispatchQueue.main.async {
+                    chatModel.chatId = chat.id
                 }
+            } catch let error {
+                logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
             }
+        } label: {
+            Label("Send direct message", systemImage: "message")
         }
     }
 
-    func createMemberContactButton(width: CGFloat) -> some View {
-        InfoViewButton(image: "message.fill", title: "message", width: width) {
+    func createMemberContactButton() -> some View {
+        Button {
             progressIndicator = true
             Task {
                 do {
@@ -352,10 +300,9 @@ struct GroupMemberInfoView: View {
                     await MainActor.run {
                         progressIndicator = false
                         chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
-                        ItemsModel.shared.loadOpenChat(memberContact.id) {
-                            dismissAllSheets(animated: true)
-                        }
-                        NetworkModel.shared.setContactNetworkStatus(memberContact, .connected)
+                        dismissAllSheets(animated: true)
+                        chatModel.chatId = memberContact.id
+                        chatModel.setContactNetworkStatus(memberContact, .connected)
                     }
                 } catch let error {
                     logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
@@ -366,12 +313,14 @@ struct GroupMemberInfoView: View {
                     }
                 }
             }
+        } label: {
+            Label("Send direct message", systemImage: "message")
         }
     }
 
     private func groupMemberInfoHeader(_ mem: GroupMember) -> some View {
         VStack {
-            MemberProfileImage(mem, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ProfileImage(imageStr: mem.image, size: 192, color: Color(uiColor: .tertiarySystemFill))
                 .padding(.top, 12)
                 .padding()
             if mem.verified {
@@ -633,21 +582,6 @@ struct GroupMemberInfoView: View {
     }
 }
 
-func MemberProfileImage(
-    _ mem: GroupMember,
-    size: CGFloat,
-    color: Color = Color(uiColor: .tertiarySystemGroupedBackground),
-    backgroundColor: Color? = nil
-) -> some View {
-    ProfileImage(
-        imageStr: mem.image,
-        size: size,
-        color: color,
-        backgroundColor: backgroundColor,
-        blurred: mem.blocked
-    )
-}
-
 func blockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
     Alert(
         title: Text("Block member?"),

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

@@ -11,6 +11,7 @@ import Combine
 
 /// A List, which displays it's items in reverse order - from bottom to top
 struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIViewControllerRepresentable {
+
     let items: Array<Item>
 
     @Binding var scrollState: ReverseListScrollModel<Item>.State
@@ -32,7 +33,7 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
             case let .item(id):
                 controller.scroll(to: items.firstIndex(where: { $0.id == id }), position: .bottom)
             case .bottom:
-                controller.scroll(to: 0, position: .top)
+                controller.scroll(to: .zero, position: .top)
             }
         } else {
             controller.update(items: items)
@@ -44,7 +45,7 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
         private enum Section { case main }
         private let representer: ReverseList
         private var dataSource: UITableViewDiffableDataSource<Section, Item>!
-        private var itemCount: Int = 0
+        private var itemCount: Int = .zero
         private var bag = Set<AnyCancellable>()
 
         init(representer: ReverseList) {
@@ -52,7 +53,6 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
             super.init(style: .plain)
 
             // 1. Style
-            tableView = InvertedTableView()
             tableView.separatorStyle = .none
             tableView.transform = .verticalFlip
             tableView.backgroundColor = .clear
@@ -80,7 +80,7 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
                 let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId, for: indexPath)
                 if #available(iOS 16.0, *) {
                     cell.contentConfiguration = UIHostingConfiguration { self.representer.content(item) }
-                        .margins(.all, 0)
+                        .margins(.all, .zero)
                         .minSize(height: 1) // Passing zero will result in system default of 44 points being used
                 } else {
                     if let cell = cell as? HostingCell<Content> {
@@ -132,11 +132,6 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
             NotificationCenter.default.post(name: .chatViewWillBeginScrolling, object: nil)
         }
 
-        override func viewDidAppear(_ animated: Bool) {
-            tableView.clipsToBounds = false
-            parent?.viewIfLoaded?.clipsToBounds = false
-        }
-
         /// Scrolls up
         func scrollToNextPage() {
             tableView.setContentOffset(
@@ -152,23 +147,18 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
         /// Scrolls to Item at index path
         /// - Parameter indexPath: Item to scroll to - will scroll to beginning of the list, if `nil`
         func scroll(to index: Int?, position: UITableView.ScrollPosition) {
-            var animated = false
-            if #available(iOS 16.0, *) {
-                animated = true
-            }
-            if let index, tableView.numberOfRows(inSection: 0) != 0 {
+            if let index {
+                var animated = false
+                if #available(iOS 16.0, *) {
+                    animated = true
+                }
                 tableView.scrollToRow(
-                    at: IndexPath(row: index, section: 0),
+                    at: IndexPath(row: index, section: .zero),
                     at: position,
                     animated: animated
                 )
-            } else {
-                tableView.setContentOffset(
-                    CGPoint(x: .zero, y: -InvertedTableView.inset),
-                    animated: animated
-                )
+                Task { representer.scrollState = .atDestination }
             }
-            Task { representer.scrollState = .atDestination }
         }
 
         func update(items: Array<Item>) {
@@ -178,7 +168,7 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
             dataSource.defaultRowAnimation = .none
             dataSource.apply(
                 snapshot,
-                animatingDifferences: itemCount != 0 && abs(items.count - itemCount) == 1
+                animatingDifferences: itemCount != .zero && abs(items.count - itemCount) == 1
             )
             itemCount = items.count
         }
@@ -282,28 +272,3 @@ func withConditionalAnimation<Result>(
         try body()
     }
 }
-
-class InvertedTableView: UITableView {
-    static let inset = CGFloat(100)
-
-    static let insets = UIEdgeInsets(
-        top: inset,
-        left: .zero,
-        bottom: inset,
-        right: .zero
-    )
-
-    override var contentInsetAdjustmentBehavior: UIScrollView.ContentInsetAdjustmentBehavior {
-        get { .never }
-        set { }
-    }
-
-    override var contentInset: UIEdgeInsets {
-        get { Self.insets }
-        set { }
-    }
-
-    override var adjustedContentInset: UIEdgeInsets {
-        Self.insets
-    }
-}

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

@@ -104,22 +104,19 @@ struct SelectedItemsBottomToolbar: View {
         allButtonsDisabled = count == 0 || count > 20
         canModerate = possibleToModerate(chatInfo)
         if let selected = selectedItems {
-            let me: Bool
-            let onlyOwnGroupItems: Bool
-            (deleteEnabled, deleteForEveryoneEnabled, me, onlyOwnGroupItems, selectedChatItems) = chatItems.reduce((true, true, true, true, [])) { (r, ci) in
+            (deleteEnabled, deleteForEveryoneEnabled, moderateEnabled, _, selectedChatItems) = chatItems.reduce((true, true, true, true, [])) { (r, ci) in
                 if selected.contains(ci.id) {
                     var (de, dee, me, onlyOwnGroupItems, sel) = r
                     de = de && ci.canBeDeletedForSelf
                     dee = dee && ci.meta.deletable && !ci.localNote
                     onlyOwnGroupItems = onlyOwnGroupItems && ci.chatDir == .groupSnd
-                    me = me && ci.content.msgContent != nil && ci.memberToModerate(chatInfo) != nil
+                    me = me && !onlyOwnGroupItems && ci.content.msgContent != nil && ci.memberToModerate(chatInfo) != nil
                     sel.insert(ci.id) // we are collecting new selected items here to account for any changes in chat items list
                     return (de, dee, me, onlyOwnGroupItems, sel)
                 } else {
                     return r
                 }
             }
-            moderateEnabled = me && !onlyOwnGroupItems
         }
     }
 

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

@@ -11,6 +11,7 @@ import SwiftUI
 struct ChatHelp: View {
     @EnvironmentObject var chatModel: ChatModel
     @Binding var showSettings: Bool
+    @State private var newChatMenuOption: NewChatMenuOption? = nil
 
     var body: some View {
         ScrollView { chatHelp() }
@@ -38,7 +39,7 @@ struct ChatHelp: View {
 
                 HStack(spacing: 8) {
                     Text("Tap button ")
-                    NewChatMenuButton()
+                    NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
                     Text("above, then choose:")
                 }
 

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

@@ -44,20 +44,17 @@ struct ChatListNavLink: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme
     @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
-    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = false
     @ObservedObject var chat: Chat
     @State private var showContactRequestDialog = false
     @State private var showJoinGroupDialog = false
     @State private var showContactConnectionInfo = false
     @State private var showInvalidJSON = false
-    @State private var alert: SomeAlert? = nil
-    @State private var actionSheet: SomeActionSheet? = nil
-    @State private var sheet: SomeSheet<AnyView>? = nil
+    @State private var showDeleteContactActionSheet = false
     @State private var showConnectContactViaAddressDialog = false
     @State private var inProgress = false
     @State private var progressByTimeout = false
 
-    var dynamicRowHeight: CGFloat { dynamicSize(userFont).rowHeight }
+    var dynamicRowHeight: CGFloat { dynamicSizes[userFont]?.rowHeight ?? 80 }
 
     var body: some View {
         Group {
@@ -86,24 +83,17 @@ struct ChatListNavLink: View {
             }
         }
     }
-    
+
     @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
         Group {
-            if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
+            if contact.activeConn == nil && contact.profile.contactLink != nil {
                 ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
                     .frame(height: dynamicRowHeight)
                     .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                         Button {
-                            deleteContactDialog(
-                                chat,
-                                contact,
-                                dismissToChatList: false,
-                                showAlert: { alert = $0 },
-                                showActionSheet: { actionSheet = $0 },
-                                showSheetContent: { sheet = $0 }
-                            )
+                            showDeleteContactActionSheet = true
                         } label: {
-                            deleteLabel
+                            Label("Delete", systemImage: "trash")
                         }
                         .tint(.red)
                     }
@@ -114,44 +104,51 @@ struct ChatListNavLink: View {
                     }
             } else {
                 NavLinkPlain(
-                    chatId: chat.chatInfo.id,
+                    tag: chat.chatInfo.id,
                     selection: $chatModel.chatId,
                     label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
                 )
                 .swipeActions(edge: .leading, allowsFullSwipe: true) {
                     markReadButton()
                     toggleFavoriteButton()
-                    toggleNtfsButton(chat: chat)
+                    ToggleNtfsButton(chat: chat)
                 }
                 .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                     if !chat.chatItems.isEmpty {
                         clearChatButton()
                     }
                     Button {
-                        deleteContactDialog(
-                            chat,
-                            contact,
-                            dismissToChatList: false,
-                            showAlert: { alert = $0 },
-                            showActionSheet: { actionSheet = $0 },
-                            showSheetContent: { sheet = $0 }
-                        )
+                        if contact.sndReady || !contact.active {
+                            showDeleteContactActionSheet = true
+                        } else {
+                            AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
+                        }
                     } label: {
-                        deleteLabel
+                        Label("Delete", systemImage: "trash")
                     }
                     .tint(.red)
                 }
                 .frame(height: dynamicRowHeight)
             }
         }
-        .alert(item: $alert) { $0.alert }
-        .actionSheet(item: $actionSheet) { $0.actionSheet }
-        .sheet(item: $sheet) {
-            if #available(iOS 16.0, *) {
-                $0.content
-                    .presentationDetents([.fraction(0.4)])
+        .actionSheet(isPresented: $showDeleteContactActionSheet) {
+            if contact.sndReady && contact.active {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete and notify contact")) { Task { await deleteChat(chat, notify: true) } },
+                        .destructive(Text("Delete")) { Task { await deleteChat(chat, notify: false) } },
+                        .cancel()
+                    ]
+                )
             } else {
-                $0.content
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete")) { Task { await deleteChat(chat) } },
+                        .cancel()
+                    ]
+                )
             }
         }
     }
@@ -194,7 +191,7 @@ struct ChatListNavLink: View {
                 }
         default:
             NavLinkPlain(
-                chatId: chat.chatInfo.id,
+                tag: chat.chatInfo.id,
                 selection: $chatModel.chatId,
                 label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
                 disabled: !groupInfo.ready
@@ -203,7 +200,7 @@ struct ChatListNavLink: View {
             .swipeActions(edge: .leading, allowsFullSwipe: true) {
                 markReadButton()
                 toggleFavoriteButton()
-                toggleNtfsButton(chat: chat)
+                ToggleNtfsButton(chat: chat)
             }
             .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                 if !chat.chatItems.isEmpty {
@@ -221,7 +218,7 @@ struct ChatListNavLink: View {
 
     @ViewBuilder private func noteFolderNavLink(_ noteFolder: NoteFolder) -> some View {
         NavLinkPlain(
-            chatId: chat.chatInfo.id,
+            tag: chat.chatInfo.id,
             selection: $chatModel.chatId,
             label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
             disabled: !noteFolder.ready
@@ -244,7 +241,7 @@ struct ChatListNavLink: View {
                 await MainActor.run { inProgress = false }
             }
         } label: {
-            SwipeLabel(NSLocalizedString("Join", comment: "swipe action"), systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward", inverted: oneHandUI)
+            Label("Join", systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward")
         }
         .tint(chat.chatInfo.incognito ? .indigo : theme.colors.primary)
     }
@@ -254,14 +251,14 @@ struct ChatListNavLink: View {
             Button {
                 Task { await markChatRead(chat) }
             } label: {
-                SwipeLabel(NSLocalizedString("Read", comment: "swipe action"), systemImage: "checkmark", inverted: oneHandUI)
+                Label("Read", systemImage: "checkmark")
             }
             .tint(theme.colors.primary)
         } else {
             Button {
                 Task { await markChatUnread(chat) }
             } label: {
-                SwipeLabel(NSLocalizedString("Unread", comment: "swipe action"), systemImage: "circlebadge.fill", inverted: oneHandUI)
+                Label("Unread", systemImage: "circlebadge.fill")
             }
             .tint(theme.colors.primary)
         }
@@ -273,36 +270,24 @@ struct ChatListNavLink: View {
             Button {
                 toggleChatFavorite(chat, favorite: false)
             } label: {
-                SwipeLabel(NSLocalizedString("Unfav.", comment: "swipe action"), systemImage: "star.slash.fill", inverted: oneHandUI)
+                Label("Unfav.", systemImage: "star.slash")
             }
             .tint(.green)
         } else {
             Button {
                 toggleChatFavorite(chat, favorite: true)
             } label: {
-                SwipeLabel(NSLocalizedString("Favorite", comment: "swipe action"), systemImage: "star.fill", inverted: oneHandUI)
+                Label("Favorite", systemImage: "star.fill")
             }
             .tint(.green)
         }
     }
 
-    @ViewBuilder private func toggleNtfsButton(chat: Chat) -> some View {
-        Button {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
-        } label: {
-            if chat.chatInfo.ntfsEnabled {
-                SwipeLabel(NSLocalizedString("Mute", comment: "swipe action"), systemImage: "speaker.slash.fill", inverted: oneHandUI)
-            } else {
-                SwipeLabel(NSLocalizedString("Unmute", comment: "swipe action"), systemImage: "speaker.wave.2.fill", inverted: oneHandUI)
-            }
-        }
-    }
-
     private func clearChatButton() -> some View {
         Button {
             AlertManager.shared.showAlert(clearChatAlert())
         } label: {
-            SwipeLabel(NSLocalizedString("Clear", comment: "swipe action"), systemImage: "gobackward", inverted: oneHandUI)
+            Label("Clear", systemImage: "gobackward")
         }
         .tint(Color.orange)
     }
@@ -311,7 +296,7 @@ struct ChatListNavLink: View {
         Button {
             AlertManager.shared.showAlert(clearNoteFolderAlert())
         } label: {
-            SwipeLabel(NSLocalizedString("Clear", comment: "swipe action"), systemImage: "gobackward", inverted: oneHandUI)
+            Label("Clear", systemImage: "gobackward")
         }
         .tint(Color.orange)
     }
@@ -320,7 +305,7 @@ struct ChatListNavLink: View {
         Button {
             AlertManager.shared.showAlert(leaveGroupAlert(groupInfo))
         } label: {
-            SwipeLabel(NSLocalizedString("Leave", comment: "swipe action"), systemImage: "rectangle.portrait.and.arrow.right.fill", inverted: oneHandUI)
+            Label("Leave", systemImage: "rectangle.portrait.and.arrow.right")
         }
         .tint(Color.yellow)
     }
@@ -329,7 +314,7 @@ struct ChatListNavLink: View {
         Button {
             AlertManager.shared.showAlert(deleteGroupAlert(groupInfo))
         } label: {
-            deleteLabel
+            Label("Delete", systemImage: "trash")
         }
         .tint(.red)
     }
@@ -339,23 +324,22 @@ struct ChatListNavLink: View {
         .swipeActions(edge: .trailing, allowsFullSwipe: true) {
             Button {
                 Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
-            } label: { SwipeLabel(NSLocalizedString("Accept", comment: "swipe action"), systemImage: "checkmark", inverted: oneHandUI) }
+            } label: { Label("Accept", systemImage: "checkmark") }
                 .tint(theme.colors.primary)
             Button {
                 Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) }
             } label: {
-                SwipeLabel(NSLocalizedString("Accept incognito", comment: "swipe action"), systemImage: "theatermasks.fill", inverted: oneHandUI)
+                Label("Accept incognito", systemImage: "theatermasks")
             }
             .tint(.indigo)
             Button {
                 AlertManager.shared.showAlert(rejectContactRequestAlert(contactRequest))
             } label: {
-                SwipeLabel(NSLocalizedString("Reject", comment: "swipe action"), systemImage: "multiply.fill", inverted: oneHandUI)
+                Label("Reject", systemImage: "multiply")
             }
             .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) } }
@@ -372,14 +356,14 @@ struct ChatListNavLink: View {
                     AlertManager.shared.showAlertMsg(title: a.title, message: a.message)
                 })
             } label: {
-                deleteLabel
+                Label("Delete", systemImage: "trash")
             }
             .tint(.red)
 
             Button {
                 showContactConnectionInfo = true
             } label: {
-                SwipeLabel(NSLocalizedString("Name", comment: "swipe action"), systemImage: "pencil", inverted: oneHandUI)
+                Label("Name", systemImage: "pencil")
             }
             .tint(theme.colors.primary)
         }
@@ -393,16 +377,11 @@ struct ChatListNavLink: View {
                 }
             }
         }
-        .contentShape(Rectangle())
         .onTapGesture {
             showContactConnectionInfo = true
         }
     }
 
-    private var deleteLabel: some View {
-        SwipeLabel(NSLocalizedString("Delete", comment: "swipe action"), systemImage: "trash.fill", inverted: oneHandUI)
-    }
-
     private func deleteGroupAlert(_ groupInfo: GroupInfo) -> Alert {
         Alert(
             title: Text("Delete group?"),
@@ -451,6 +430,28 @@ struct ChatListNavLink: View {
         )
     }
 
+    private func rejectContactRequestAlert(_ contactRequest: UserContactRequest) -> Alert {
+        Alert(
+            title: Text("Reject contact request"),
+            message: Text("The sender will NOT be notified"),
+            primaryButton: .destructive(Text("Reject")) {
+                Task { await rejectContactRequest(contactRequest) }
+            },
+            secondaryButton: .cancel()
+        )
+    }
+
+    private func pendingContactAlert(_ chat: Chat, _ contact: Contact) -> Alert {
+        Alert(
+            title: Text("Contact is not connected yet!"),
+            message: Text("Your contact needs to be online for the connection to complete.\nYou can cancel this connection and remove the contact (and try later with a new link)."),
+            primaryButton: .cancel(),
+            secondaryButton: .destructive(Text("Delete Contact")) {
+                removePendingContact(chat, contact)
+            }
+        )
+    }
+
     private func groupInvitationAcceptedAlert() -> Alert {
         Alert(
             title: Text("Joining group"),
@@ -458,6 +459,30 @@ struct ChatListNavLink: View {
         )
     }
 
+    private func deletePendingContactAlert(_ chat: Chat, _ contact: Contact) -> Alert {
+        Alert(
+            title: Text("Delete pending connection"),
+            message: Text("Your contact needs to be online for the connection to complete.\nYou can cancel this connection and remove the contact (and try later with a new link)."),
+            primaryButton: .destructive(Text("Delete")) {
+                removePendingContact(chat, contact)
+            },
+            secondaryButton: .cancel()
+        )
+    }
+
+    private func removePendingContact(_ chat: Chat, _ contact: Contact) {
+        Task {
+            do {
+                try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
+                DispatchQueue.main.async {
+                    chatModel.removeChat(contact.id)
+                }
+            } catch let error {
+                logger.error("ChatListNavLink.removePendingContact apiDeleteChat error: \(responseError(error))")
+            }
+        }
+    }
+
     private func invalidJSONPreview(_ json: String) -> some View {
         Text("invalid chat data")
             .foregroundColor(.red)
@@ -472,26 +497,16 @@ struct ChatListNavLink: View {
 
     private func connectContactViaAddress_(_ contact: Contact, _ incognito: Bool) {
         Task {
-            let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { AlertManager.shared.showAlert($0) })
+            let ok = await connectContactViaAddress(contact.contactId, incognito)
             if ok {
-                ItemsModel.shared.loadOpenChat(contact.id)
-                AlertManager.shared.showAlert(connReqSentAlert(.contact))
+                await MainActor.run {
+                    chatModel.chatId = contact.id
+                }
             }
         }
     }
 }
 
-func rejectContactRequestAlert(_ contactRequest: UserContactRequest) -> Alert {
-    Alert(
-        title: Text("Reject contact request"),
-        message: Text("The sender will NOT be notified"),
-        primaryButton: .destructive(Text("Reject")) {
-            Task { await rejectContactRequest(contactRequest) }
-        },
-        secondaryButton: .cancel()
-    )
-}
-
 func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection, showError: @escaping (ErrorAlert) -> Void, success: @escaping () -> Void = {}) -> Alert {
     Alert(
         title: Text("Delete pending connection?"),
@@ -518,14 +533,15 @@ func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection,
     )
 }
 
-func connectContactViaAddress(_ contactId: Int64, _ incognito: Bool, showAlert: (Alert) -> Void) async -> Bool {
+func connectContactViaAddress(_ contactId: Int64, _ incognito: Bool) async -> Bool {
     let (contact, alert) = await apiConnectContactViaAddress(incognito: incognito, contactId: contactId)
     if let alert = alert {
-        showAlert(alert)
+        AlertManager.shared.showAlert(alert)
         return false
     } else if let contact = contact {
         await MainActor.run {
             ChatModel.shared.updateContact(contact)
+            AlertManager.shared.showAlert(connReqSentAlert(.contact))
         }
         return true
     }

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

@@ -18,14 +18,11 @@ struct ChatListView: View {
     @State private var searchText = ""
     @State private var searchShowingSimplexLink = false
     @State private var searchChatFilteredBySimplexLink: String? = nil
+    @State private var newChatMenuOption: NewChatMenuOption? = nil
     @State private var userPickerVisible = false
     @State private var showConnectDesktop = false
-    @State private var scrollToSearchBar = false
 
     @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
-    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
-    @AppStorage(DEFAULT_ONE_HAND_UI_CARD_SHOWN) private var oneHandUICardShown = false
-    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
 
     var body: some View {
         if #available(iOS 16.0, *) {
@@ -36,16 +33,21 @@ struct ChatListView: View {
     }
 
     private var viewBody: some View {
-        ZStack(alignment: oneHandUI ? .bottomLeading : .topLeading) {
+        ZStack(alignment: .topLeading) {
             NavStackCompat(
                 isActive: Binding(
                     get: { chatModel.chatId != nil },
-                    set: { active in
-                        if !active { chatModel.chatId = nil }
-                    }
+                    set: { _ in }
                 ),
                 destination: chatView
-            ) { chatListView }
+            ) {
+                VStack {
+                    if chatModel.chats.isEmpty {
+                        onboardingButtons()
+                    }
+                    chatListView
+                }
+            }
             if userPickerVisible {
                 Rectangle().fill(.white.opacity(0.001)).onTapGesture {
                     withAnimation {
@@ -65,14 +67,9 @@ struct ChatListView: View {
     }
 
     private var chatListView: some View {
-        let tm = ToolbarMaterial.material(toolbarMaterial)
-        return withToolbar(tm) {
+        VStack {
             chatList
-                .background(theme.colors.background)
-                .navigationBarTitleDisplayMode(.inline)
-                .navigationBarHidden(searchMode || oneHandUI)
         }
-        .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
         .onDisappear() { withAnimation { userPickerVisible = false } }
         .refreshable {
             AlertManager.shared.showAlert(Alert(
@@ -90,111 +87,55 @@ struct ChatListView: View {
                 secondaryButton: .cancel()
             ))
         }
-        .safeAreaInset(edge: .top) {
-            if oneHandUI { Divider().background(tm) }
-        }
-        .safeAreaInset(edge: .bottom) {
-            if oneHandUI {
-                Divider().padding(.bottom, Self.hasHomeIndicator ? 0 : 8).background(tm)
-            }
-        }
-    }
-
-    static var hasHomeIndicator: Bool = {
-        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-           let window = windowScene.windows.first {
-            window.safeAreaInsets.bottom > 0
-        } else { false }
-    }()
-
-    @ViewBuilder func withToolbar(_ material: Material, content: () -> some View) -> some View {
-        if #available(iOS 16.0, *) {
-            if oneHandUI {
-                content()
-                    .toolbarBackground(.hidden, for: .bottomBar)
-                    .toolbar { bottomToolbar }
-            } else {
-                content()
-                    .toolbarBackground(.automatic, for: .navigationBar)
-                    .toolbarBackground(material)
-                    .toolbar { topToolbar }
-            }
-        } else {
-            if oneHandUI {
-                content().toolbar { bottomToolbarGroup }
-            } else {
-                content().toolbar { topToolbar }
-            }
-        }
-    }
-
-    @ToolbarContentBuilder var topToolbar: some ToolbarContent {
-        ToolbarItem(placement: .topBarLeading) { leadingToolbarItem }
-        ToolbarItem(placement: .principal) { SubsStatusIndicator() }
-        ToolbarItem(placement: .topBarTrailing) { trailingToolbarItem }
-    }
-
-    @ToolbarContentBuilder var bottomToolbar: some ToolbarContent {
-        let padding: Double = Self.hasHomeIndicator ? 0 : 14
-        ToolbarItem(placement: .bottomBar) {
-            HStack {
-                leadingToolbarItem.padding(.bottom, padding)
-                Spacer()
-                SubsStatusIndicator().padding(.bottom, padding)
-                Spacer()
-                trailingToolbarItem.padding(.bottom, padding)
-            }
-            .contentShape(Rectangle())
-            .onTapGesture { scrollToSearchBar = true }
-        }
-    }
-
-    @ToolbarContentBuilder var bottomToolbarGroup: some ToolbarContent {
-        let padding: Double = Self.hasHomeIndicator ? 0 : 14
-        ToolbarItemGroup(placement: .bottomBar) {
-            leadingToolbarItem.padding(.bottom, padding)
-            Spacer()
-            SubsStatusIndicator().padding(.bottom, padding)
-            Spacer()
-            trailingToolbarItem.padding(.bottom, padding)
-        }
-    }
-
-    @ViewBuilder var leadingToolbarItem: some View {
-        let user = chatModel.currentUser ?? User.sampleData
-        ZStack(alignment: .topTrailing) {
-            ProfileImage(imageStr: user.image, size: 32, color: Color(uiColor: .quaternaryLabel))
-                .padding(.trailing, 4)
-            let allRead = chatModel.users
-                .filter { u in !u.user.activeUser && !u.user.hidden }
-                .allSatisfy { u in u.unreadCount == 0 }
-            if !allRead {
-                unreadBadge(size: 12)
-            }
-        }
-        .onTapGesture {
-            if chatModel.users.filter({ u in u.user.activeUser || !u.user.hidden }).count > 1 {
-                withAnimation {
-                    userPickerVisible.toggle()
+        .listStyle(.plain)
+        .background(theme.colors.background)
+        .navigationBarTitleDisplayMode(.inline)
+        .navigationBarHidden(searchMode)
+        .toolbar {
+            ToolbarItem(placement: .navigationBarLeading) {
+                let user = chatModel.currentUser ?? User.sampleData
+                ZStack(alignment: .topTrailing) {
+                    ProfileImage(imageStr: user.image, size: 32, color: Color(uiColor: .quaternaryLabel))
+                        .padding(.trailing, 4)
+                    let allRead = chatModel.users
+                        .filter { u in !u.user.activeUser && !u.user.hidden }
+                        .allSatisfy { u in u.unreadCount == 0 }
+                    if !allRead {
+                        unreadBadge(size: 12)
+                    }
+                }
+                .onTapGesture {
+                    if chatModel.users.filter({ u in u.user.activeUser || !u.user.hidden }).count > 1 {
+                        withAnimation {
+                            userPickerVisible.toggle()
+                        }
+                    } else {
+                        showSettings = true
+                    }
+                }
+            }
+            ToolbarItem(placement: .principal) {
+                HStack(spacing: 4) {
+                    Text("Chats")
+                        .font(.headline)
+                    SubsStatusIndicator()
+                }
+                .frame(maxWidth: .infinity, alignment: .center)
+            }
+            ToolbarItem(placement: .navigationBarTrailing) {
+                switch chatModel.chatRunning {
+                case .some(true): NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
+                case .some(false): chatStoppedIcon()
+                case .none: EmptyView()
                 }
-            } else {
-                showSettings = true
             }
-        }
-    }
-
-    @ViewBuilder var trailingToolbarItem: some View {
-        switch chatModel.chatRunning {
-        case .some(true): NewChatMenuButton()
-        case .some(false): chatStoppedIcon()
-        case .none: EmptyView()
         }
     }
 
     @ViewBuilder private var chatList: some View {
         let cs = filteredChats()
         ZStack {
-            ScrollViewReader { scrollProxy in
+            VStack {
                 List {
                     if !chatModel.chats.isEmpty {
                         ChatListSearchBar(
@@ -204,50 +145,31 @@ struct ChatListView: View {
                             searchShowingSimplexLink: $searchShowingSimplexLink,
                             searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
                         )
-                        .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
                         .listRowSeparator(.hidden)
                         .listRowBackground(Color.clear)
                         .frame(maxWidth: .infinity)
-                        .padding(.top, oneHandUI ? 8 : 0)
-                        .id("searchBar")
-                    }
-                    if !oneHandUICardShown {
-                        OneHandUICard()
-                            .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                            .listRowSeparator(.hidden)
-                            .listRowBackground(Color.clear)
                     }
                     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)
                 }
-                .listStyle(.plain)
-                .onChange(of: chatModel.chatId) { currentChatId in
-                    if let chatId = chatModel.chatToTop, currentChatId != chatId {
-                        chatModel.chatToTop = nil
-                        chatModel.popChat(chatId)
-                    }
-                    stopAudioPlayer()
-                }
-                .onChange(of: chatModel.currentUser?.userId) { _ in
-                    stopAudioPlayer()
-                }
-                .onChange(of: scrollToSearchBar) { scrollToSearchBar in
-                    if scrollToSearchBar {
-                        Task { self.scrollToSearchBar = false }
-                        withAnimation { scrollProxy.scrollTo("searchBar") }
-                    }
+            }
+            .onChange(of: chatModel.chatId) { _ in
+                if chatModel.chatId == nil, let chatId = chatModel.chatToTop {
+                    chatModel.chatToTop = nil
+                    chatModel.popChat(chatId)
                 }
+                stopAudioPlayer()
+            }
+            .onChange(of: chatModel.currentUser?.userId) { _ in
+                stopAudioPlayer()
             }
             if cs.isEmpty && !chatModel.chats.isEmpty {
-                Text("No filtered chats")
-                    .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                    .foregroundColor(.secondary)
+                Text("No filtered chats").foregroundColor(theme.colors.secondary)
             }
         }
     }
@@ -258,6 +180,42 @@ struct ChatListView: View {
             .foregroundColor(theme.colors.primary)
     }
 
+    private func onboardingButtons() -> some View {
+        VStack(alignment: .trailing, spacing: 0) {
+            Path { p in
+                p.move(to: CGPoint(x: 8, y: 0))
+                p.addLine(to: CGPoint(x: 16, y: 10))
+                p.addLine(to: CGPoint(x: 0, y: 10))
+                p.addLine(to: CGPoint(x: 8, y: 0))
+            }
+            .fill(theme.colors.primary)
+            .frame(width: 20, height: 10)
+            .padding(.trailing, 12)
+
+            connectButton("Tap to start a new chat") {
+                newChatMenuOption = .newContact
+            }
+
+            Spacer()
+            Text("You have no chats")
+                .foregroundColor(theme.colors.secondary)
+                .frame(maxWidth: .infinity)
+        }
+        .padding(.trailing, 6)
+        .frame(maxHeight: .infinity)
+    }
+
+    private func connectButton(_ label: LocalizedStringKey, action: @escaping () -> Void) -> some View {
+        Button(action: action) {
+            Text(label)
+                .padding(.vertical, 10)
+                .padding(.horizontal, 20)
+        }
+        .background(theme.colors.primary)
+        .foregroundColor(.white)
+        .clipShape(RoundedRectangle(cornerRadius: 16))
+    }
+
     @ViewBuilder private func chatView() -> some View {
         if let chatId = chatModel.chatId, let chat = chatModel.getChat(chatId) {
             ChatView(chat: chat)
@@ -275,20 +233,16 @@ struct ChatListView: View {
         } else {
             let s = searchString()
             return s == "" && !showUnreadAndFavorites
-            ? chatModel.chats.filter { chat in
-                !chat.chatInfo.chatDeleted && chatContactType(chat: chat) != ContactType.card
-            }
+            ? chatModel.chats
             : chatModel.chats.filter { chat in
                 let cInfo = chat.chatInfo
                 switch cInfo {
                 case let .direct(contact):
-                    return !contact.chatDeleted && chatContactType(chat: chat) != ContactType.card && (
-                        s == ""
-                        ? filtered(chat)
-                        : (viewNameContains(cInfo, s) ||
-                           contact.profile.displayName.localizedLowercase.contains(s) ||
-                           contact.fullName.localizedLowercase.contains(s))
-                    )
+                    return s == ""
+                    ? filtered(chat)
+                    : (viewNameContains(cInfo, s) ||
+                       contact.profile.displayName.localizedLowercase.contains(s) ||
+                       contact.fullName.localizedLowercase.contains(s))
                 case let .group(gInfo):
                     return s == ""
                     ? (filtered(chat) || gInfo.membership.memberStatus == .memInvited)
@@ -324,7 +278,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
@@ -334,48 +288,42 @@ struct SubsStatusIndicator: View {
             showServersSummary = true
         } label: {
             HStack(spacing: 4) {
-                Text("Chats").foregroundStyle(Color.primary).fixedSize().font(.headline)
                 SubscriptionStatusIndicatorView(subs: subs, hasSess: hasSess)
                 if showSubscriptionPercentage {
                     SubscriptionStatusPercentageView(subs: subs, hasSess: hasSess)
                 }
             }
         }
-        .disabled(ChatModel.shared.chatRunning != true)
         .onAppear {
-            startTask()
+            startTimer()
         }
         .onDisappear {
-            stopTask()
+            stopTimer()
         }
-        .appSheet(isPresented: $showServersSummary) {
+        .sheet(isPresented: $showServersSummary) {
             ServersSummaryView()
-                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
         }
     }
 
-    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))")
+        }
     }
 }
 
@@ -425,6 +373,7 @@ struct ChatListSearchBar: View {
                     toggleFilterButton()
                 }
             }
+            Divider()
         }
         .onChange(of: searchFocussed) { sf in
             withAnimation { searchMode = sf }

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

@@ -275,7 +275,7 @@ struct ChatPreviewView: View {
         } else {
             switch (chat.chatInfo) {
             case let .direct(contact):
-                if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
+                if contact.activeConn == nil && contact.profile.contactLink != nil {
                     chatPreviewInfoText("Tap to Connect")
                         .foregroundColor(theme.colors.primary)
                 } else if !contact.sndReady && contact.activeConn != nil {
@@ -376,7 +376,17 @@ struct ChatPreviewView: View {
         switch chat.chatInfo {
         case let .direct(contact):
             if contact.active && contact.activeConn != nil {
-                NetworkStatusView(contact: contact, size: size)
+                switch (chatModel.contactNetworkStatus(contact)) {
+                case .connected: incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
+                case .error:
+                    Image(systemName: "exclamationmark.circle")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: dynamicChatInfoSize, height: dynamicChatInfoSize)
+                        .foregroundColor(theme.colors.secondary)
+                default:
+                    ProgressView()
+                }
             } else {
                 incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
             }
@@ -390,30 +400,6 @@ struct ChatPreviewView: View {
             incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
         }
     }
-
-    struct NetworkStatusView: View {
-        @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
-        @EnvironmentObject var theme: AppTheme
-        @ObservedObject var networkModel = NetworkModel.shared
-
-        let contact: Contact
-        let size: CGFloat
-
-        var body: some View {
-            let dynamicChatInfoSize = dynamicSize(userFont).chatInfoSize
-            switch (networkModel.contactNetworkStatus(contact)) {
-            case .connected: incognitoIcon(contact.contactConnIncognito, theme.colors.secondary, size: size)
-            case .error:
-                Image(systemName: "exclamationmark.circle")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: dynamicChatInfoSize, height: dynamicChatInfoSize)
-                    .foregroundColor(theme.colors.secondary)
-            default:
-                ProgressView()
-            }
-        }
-    }
 }
 
 @ViewBuilder func incognitoIcon(_ incognito: Bool, _ secondaryColor: Color, size: CGFloat) -> some View {

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

@@ -1,52 +0,0 @@
-//
-//  OneHandUICard.swift
-//  SimpleX (iOS)
-//
-//  Created by EP on 06/08/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct OneHandUICard: View {
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
-    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
-    @AppStorage(DEFAULT_ONE_HAND_UI_CARD_SHOWN) private var oneHandUICardShown = false
-    @State private var showOneHandUIAlert = false
-
-    var body: some View {
-        ZStack(alignment: .topTrailing) {
-            VStack(alignment: .leading, spacing: 8) {
-                Text("Toggle chat list:").font(.title3)
-                Toggle("Reachable chat toolbar", isOn: $oneHandUI)
-            }
-            Image(systemName: "multiply")
-                .foregroundColor(theme.colors.secondary)
-                .onTapGesture {
-                    showOneHandUIAlert = true
-                }
-        }
-        .padding()
-        .background(theme.appColors.sentMessage)
-        .cornerRadius(12)
-        .frame(height: dynamicSize(userFont).rowHeight)
-        .padding(.vertical, 12)
-        .alert(isPresented: $showOneHandUIAlert) {
-            Alert(
-                title: Text("Reachable chat toolbar"),
-                message: Text("You can change it in Appearance settings."),
-                dismissButton: .default(Text("Ok")) {
-                    withAnimation {
-                        oneHandUICardShown = true
-                    }
-                }
-            )
-        }
-    }
-}
-
-#Preview {
-    OneHandUICard()
-}

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

@@ -448,23 +448,19 @@ func subscriptionStatusColorAndPercentage(_ online: Bool, _ onionHosts: OnionHos
     let noConnColorAndPercent: (Color, Double, Double, Double) = (Color(uiColor: .tertiaryLabel), 1, 1, 0)
     let activeSubsRounded = roundedToQuarter(subs.shareOfActive)
 
-    return !online
-    ? noConnColorAndPercent
-    : (
-        subs.total == 0 && !hasSess
-        ? (activeColor, 0, 0.33, 0) // On freshly installed app (without chats) and on app start
-        : (
-            subs.ssActive == 0
-            ? (
-                hasSess ? (activeColor, activeSubsRounded, subs.shareOfActive, subs.shareOfActive) : noConnColorAndPercent
-            )
-            : ( // ssActive > 0
-                hasSess
-                ? (activeColor, activeSubsRounded, subs.shareOfActive, subs.shareOfActive)
-                : (.orange, activeSubsRounded, subs.shareOfActive, subs.shareOfActive) // This would mean implementation error
-              )
+    return online && subs.total > 0
+    ? (
+        subs.ssActive == 0
+        ? (
+            hasSess ? (activeColor, activeSubsRounded, subs.shareOfActive, subs.shareOfActive) : noConnColorAndPercent
         )
+        : ( // ssActive > 0
+            hasSess
+            ? (activeColor, activeSubsRounded, subs.shareOfActive, subs.shareOfActive)
+            : (.orange, activeSubsRounded, subs.shareOfActive, subs.shareOfActive) // This would mean implementation error
+          )
     )
+    : noConnColorAndPercent
 }
 
 struct SMPServerSummaryView: View {

apps/ios/Shared/Views/Contacts/ContactListNavLink.swift

@@ -1,267 +0,0 @@
-//
-//  ContactListNavLink.swift
-//  SimpleX (iOS)
-//
-//  Created by Diogo Cunha on 01/08/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct ContactListNavLink: View {
-    @EnvironmentObject var theme: AppTheme
-    @ObservedObject var chat: Chat
-    var showDeletedChatIcon: Bool
-    @State private var alert: SomeAlert? = nil
-    @State private var actionSheet: SomeActionSheet? = nil
-    @State private var sheet: SomeSheet<AnyView>? = nil
-    @State private var showConnectContactViaAddressDialog = false
-    @State private var showContactRequestDialog = false
-
-    var body: some View {
-        let contactType = chatContactType(chat: chat)
-
-        Group {
-            switch (chat.chatInfo) {
-            case let .direct(contact):
-                switch contactType {
-                case .recent:
-                    recentContactNavLink(contact)
-                case .chatDeleted:
-                    deletedChatNavLink(contact)
-                case .card:
-                    contactCardNavLink(contact)
-                default:
-                    EmptyView()
-                }
-            case let .contactRequest(contactRequest):
-                contactRequestNavLink(contactRequest)
-            default:
-                EmptyView()
-            }
-        }
-        .alert(item: $alert) { $0.alert }
-        .actionSheet(item: $actionSheet) { $0.actionSheet }
-        .sheet(item: $sheet) {
-            if #available(iOS 16.0, *) {
-                $0.content
-                    .presentationDetents([.fraction(0.4)])
-            } else {
-                $0.content
-            }
-        }
-    }
-
-    func recentContactNavLink(_ contact: Contact) -> some View {
-        Button {
-            dismissAllSheets(animated: true) {
-                ItemsModel.shared.loadOpenChat(contact.id)
-            }
-        } label: {
-            contactPreview(contact, titleColor: theme.colors.onBackground)
-        }
-        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-            Button {
-                deleteContactDialog(
-                    chat,
-                    contact,
-                    dismissToChatList: false,
-                    showAlert: { alert = $0 },
-                    showActionSheet: { actionSheet = $0 },
-                    showSheetContent: { sheet = $0 }
-                )
-            } label: {
-                Label("Delete", systemImage: "trash")
-            }
-            .tint(.red)
-        }
-    }
-
-    func deletedChatNavLink(_ contact: Contact) -> some View {
-        Button {
-            Task {
-                await MainActor.run {
-                    dismissAllSheets(animated: true) {
-                        ItemsModel.shared.loadOpenChat(contact.id)
-                    }
-                }
-            }
-        } label: {
-            contactPreview(contact, titleColor: theme.colors.onBackground)
-        }
-        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-            Button {
-                deleteContactDialog(
-                    chat,
-                    contact,
-                    dismissToChatList: false,
-                    showAlert: { alert = $0 },
-                    showActionSheet: { actionSheet = $0 },
-                    showSheetContent: { sheet = $0 }
-                )
-            } label: {
-                Label("Delete", systemImage: "trash")
-            }
-            .tint(.red)
-        }
-    }
-
-    func contactPreview(_ contact: Contact, titleColor: Color) -> some View {
-        HStack{
-            ProfileImage(imageStr: contact.image, size: 30)
-
-            previewTitle(contact, titleColor: titleColor)
-
-            Spacer()
-
-            HStack {
-                if showDeletedChatIcon && contact.chatDeleted {
-                    Image(systemName: "archivebox")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 18, height: 18)
-                        .foregroundColor(.secondary.opacity(0.65))
-                } else if chat.chatInfo.chatSettings?.favorite ?? false {
-                    Image(systemName: "star.fill")
-                        .resizable()
-                        .scaledToFill()
-                        .frame(width: 18, height: 18)
-                        .foregroundColor(.secondary.opacity(0.65))
-                }
-                if contact.contactConnIncognito {
-                    Image(systemName: "theatermasks")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 22, height: 22)
-                        .foregroundColor(.secondary)
-                }
-            }
-        }
-    }
-
-    @ViewBuilder private func previewTitle(_ contact: Contact, titleColor: Color) -> some View {
-        let t = Text(chat.chatInfo.chatViewName).foregroundColor(titleColor)
-        (
-            contact.verified == true
-            ? verifiedIcon + t
-            : t
-        )
-        .lineLimit(1)
-    }
-
-    private var verifiedIcon: Text {
-        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
-            .foregroundColor(.secondary)
-            .baselineOffset(1)
-            .kerning(-2)
-    }
-
-    func contactCardNavLink(_ contact: Contact) -> some View {
-        Button {
-            showConnectContactViaAddressDialog = true
-        } label: {
-            contactCardPreview(contact)
-        }
-        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-            Button {
-                deleteContactDialog(
-                    chat,
-                    contact,
-                    dismissToChatList: false,
-                    showAlert: { alert = $0 },
-                    showActionSheet: { actionSheet = $0 },
-                    showSheetContent: { sheet = $0 }
-                )
-            } label: {
-                Label("Delete", systemImage: "trash")
-            }
-            .tint(.red)
-        }
-        .confirmationDialog("Connect with \(contact.chatViewName)", isPresented: $showConnectContactViaAddressDialog, titleVisibility: .visible) {
-            Button("Use current profile") { connectContactViaAddress_(contact, false) }
-            Button("Use new incognito profile") { connectContactViaAddress_(contact, true) }
-        }
-    }
-
-    private func connectContactViaAddress_(_ contact: Contact, _ incognito: Bool) {
-        Task {
-            let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { alert = SomeAlert(alert: $0, id: "ContactListNavLink connectContactViaAddress") })
-            if ok {
-                ItemsModel.shared.loadOpenChat(contact.id)
-                DispatchQueue.main.async {
-                    dismissAllSheets(animated: true) {
-                        AlertManager.shared.showAlert(connReqSentAlert(.contact))
-                    }
-                }
-            }
-        }
-    }
-
-    func contactCardPreview(_ contact: Contact) -> some View {
-        HStack{
-            ProfileImage(imageStr: contact.image, size: 30)
-
-            Text(chat.chatInfo.chatViewName)
-                .foregroundColor(.accentColor)
-                .lineLimit(1)
-
-            Spacer()
-
-            Image(systemName: "envelope")
-                .resizable()
-                .scaledToFill()
-                .frame(width: 14, height: 14)
-                .foregroundColor(.accentColor)
-        }
-    }
-
-    func contactRequestNavLink(_ contactRequest: UserContactRequest) -> some View {
-        Button {
-            showContactRequestDialog = true
-        } label: {
-            contactRequestPreview(contactRequest)
-        }
-        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-            Button {
-                Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
-            } label: { Label("Accept", systemImage: "checkmark") }
-                .tint(theme.colors.primary)
-            Button {
-                Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) }
-            } label: {
-                Label("Accept incognito", systemImage: "theatermasks")
-            }
-            .tint(.indigo)
-            Button {
-                alert = SomeAlert(alert: rejectContactRequestAlert(contactRequest), id: "rejectContactRequestAlert")
-            } label: {
-                Label("Reject", systemImage: "multiply")
-            }
-            .tint(.red)
-        }
-        .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
-            Button("Accept") { Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) } }
-            Button("Accept incognito") { Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) } }
-            Button("Reject (sender NOT notified)", role: .destructive) { Task { await rejectContactRequest(contactRequest) } }
-        }
-    }
-
-    func contactRequestPreview(_ contactRequest: UserContactRequest) -> some View {
-        HStack{
-            ProfileImage(imageStr: contactRequest.image, size: 30)
-
-            Text(chat.chatInfo.chatViewName)
-                .foregroundColor(.accentColor)
-                .lineLimit(1)
-
-            Spacer()
-
-            Image(systemName: "checkmark")
-                .resizable()
-                .scaledToFill()
-                .frame(width: 14, height: 14)
-                .foregroundColor(.accentColor)
-        }
-    }
-}

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

@@ -15,7 +15,6 @@ enum DatabaseAlert: Identifiable {
     case importArchive
     case archiveImported
     case archiveImportedWithErrors(archiveErrors: [ArchiveError])
-    case archiveExportedWithErrors(archivePath: URL, archiveErrors: [ArchiveError])
     case deleteChat
     case chatDeleted
     case deleteLegacyDatabase
@@ -30,7 +29,6 @@ enum DatabaseAlert: Identifiable {
         case .importArchive: return "importArchive"
         case .archiveImported: return "archiveImported"
         case .archiveImportedWithErrors: return "archiveImportedWithErrors"
-        case .archiveExportedWithErrors: return "archiveExportedWithErrors"
         case .deleteChat: return "deleteChat"
         case .chatDeleted: return "chatDeleted"
         case .deleteLegacyDatabase: return "deleteLegacyDatabase"
@@ -267,18 +265,10 @@ struct DatabaseView: View {
                 title: Text("Chat database imported"),
                 message: Text("Restart the app to use imported chat database")
             )
-        case let .archiveImportedWithErrors(errs):
+        case .archiveImportedWithErrors:
             return Alert(
                 title: Text("Chat database imported"),
-                message: Text("Restart the app to use imported chat database") + Text(verbatim: "\n\n") + Text("Some non-fatal errors occurred during import:") + archiveErrorsText(errs)
-            )
-        case let .archiveExportedWithErrors(archivePath, errs):
-            return Alert(
-                title: Text("Chat database exported"),
-                message: Text("You may save the exported archive.") + Text(verbatim: "\n\n") + Text("Some file(s) were not exported:") + archiveErrorsText(errs),
-                dismissButton: .default(Text("Continue")) {
-                    showShareSheet(items: [archivePath])
-                }
+                message: Text("Restart the app to use imported chat database") + Text("\n") + Text("Some non-fatal errors occurred during import - you may see Chat console for more details.")
             )
         case .deleteChat:
             return Alert(
@@ -359,16 +349,9 @@ struct DatabaseView: View {
         progressIndicator = true
         Task {
             do {
-                let (archivePath, archiveErrors) = try await exportChatArchive()
-                if archiveErrors.isEmpty {
-                    showShareSheet(items: [archivePath])
-                    await MainActor.run { progressIndicator = false }
-                } else {
-                    await MainActor.run {
-                        alert = .archiveExportedWithErrors(archivePath: archivePath, archiveErrors: archiveErrors)
-                        progressIndicator = false
-                    }
-                }
+                let archivePath = try await exportChatArchive()
+                showShareSheet(items: [archivePath])
+                await MainActor.run { progressIndicator = false }
             } catch let error {
                 await MainActor.run {
                     alert = .error(title: "Error exporting chat database", error: responseError(error))
@@ -503,17 +486,6 @@ struct DatabaseView: View {
     }
 }
 
-func archiveErrorsText(_ errs: [ArchiveError]) -> Text {
-    return Text("\n" + errs.map(showArchiveError).joined(separator: "\n"))
-    
-    func showArchiveError(_ err: ArchiveError) -> String {
-        switch err {
-        case let .import(importError): importError
-        case let .fileError(file, fileError): "\(file): \(fileError)"
-        }
-    }
-}
-
 func stopChatAsync() async throws {
     try await apiStopChat()
     ChatReceiver.shared.stop()

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

@@ -190,7 +190,7 @@ struct MigrateToAppGroupView: View {
             do {
                 try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
                 try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
-                _ = try await apiExportArchive(config: config)
+                try await apiExportArchive(config: config)
                 await MainActor.run { setV3DBMigration(.exported) }
             } catch let error {
                 await MainActor.run {
@@ -222,7 +222,7 @@ struct MigrateToAppGroupView: View {
     }
 }
 
-func exportChatArchive(_ storagePath: URL? = nil) async throws -> (URL, [ArchiveError]) {
+func exportChatArchive(_ storagePath: URL? = nil) async throws -> URL {
     let archiveTime = Date.now
     let ts = archiveTime.ISO8601Format(Date.ISO8601FormatStyle(timeSeparator: .omitted))
     let archiveName = "simplex-chat.\(ts).zip"
@@ -233,13 +233,13 @@ func exportChatArchive(_ storagePath: URL? = nil) async throws -> (URL, [Archive
         try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
     }
     try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
-    let errs = try await apiExportArchive(config: config)
+    try await apiExportArchive(config: config)
     if storagePath == nil {
         deleteOldArchive()
         UserDefaults.standard.set(archiveName, forKey: DEFAULT_CHAT_ARCHIVE_NAME)
         chatArchiveTimeDefault.set(archiveTime)
     }
-    return (archivePath, errs)
+    return archivePath
 }
 
 func deleteOldArchive() {

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

@@ -8,21 +8,41 @@
 
 import SwiftUI
 
-class AppSheetState: ObservableObject {
-    static let shared = AppSheetState()
-    @Published var scenePhaseActive: Bool = false
+private struct SheetIsPresented<C>: ViewModifier where C: View {
+    var isPresented: Binding<Bool>
+    var onDismiss: (() -> Void)?
+    var sheetContent: () -> C
+    @Environment(\.scenePhase) var scenePhase
+
+    func body(content: Content) -> some View {
+        content.sheet(isPresented: isPresented, onDismiss: onDismiss) {
+            sheetContent().modifier(PrivacySensitive())
+        }
+    }
+}
+
+private struct SheetForItem<T, C>: ViewModifier where T: Identifiable, C: View {
+    var item: Binding<T?>
+    var onDismiss: (() -> Void)?
+    var sheetContent: (T) -> C
+    @Environment(\.scenePhase) var scenePhase
+
+    func body(content: Content) -> some View {
+        content.sheet(item: item, onDismiss: onDismiss) { it in
+            sheetContent(it).modifier(PrivacySensitive())
+        }
+    }
 }
 
 private struct PrivacySensitive: ViewModifier {
     @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
-    // Screen protection doesn't work for appSheet on iOS 16 if @Environment(\.scenePhase) is used instead of global state
-    @ObservedObject var appSheetState: AppSheetState = AppSheetState.shared
+    @Environment(\.scenePhase) var scenePhase
 
     func body(content: Content) -> some View {
-        if !protectScreen {
+        if case .active = scenePhase {
             content
         } else {
-            content.privacySensitive(!appSheetState.scenePhaseActive).redacted(reason: .privacy)
+            content.privacySensitive(protectScreen).redacted(reason: .privacy)
         }
     }
 }
@@ -33,9 +53,7 @@ extension View {
         onDismiss: (() -> Void)? = nil,
         content: @escaping () -> Content
     ) -> some View where Content: View {
-        sheet(isPresented: isPresented, onDismiss: onDismiss) {
-            content().modifier(PrivacySensitive())
-        }
+        modifier(SheetIsPresented(isPresented: isPresented, onDismiss: onDismiss, sheetContent: content))
     }
 
     func appSheet<T, Content>(
@@ -43,8 +61,6 @@ extension View {
         onDismiss: (() -> Void)? = nil,
         content: @escaping (T) -> Content
     ) -> some View where T: Identifiable, Content: View {
-        sheet(item: item, onDismiss: onDismiss) { it in
-            content(it).modifier(PrivacySensitive())
-        }
+        modifier(SheetForItem(item: item, onDismiss: onDismiss, sheetContent: content))
     }
 }

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

@@ -11,22 +11,13 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatViewBackground: ViewModifier {
-    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
     var image: Image
     var imageType: WallpaperType
     var background: Color
     var tint: Color
 
     func body(content: Content) -> some View {
-        // Workaround a problem (SwiftUI bug?) when wallpaper is not updated when user changes global theme in iOS settings from dark to light and vice versa
-        if colorScheme == .light {
-            back(content)
-        } else {
-            back(content)
-        }
-    }
-
-    func back(_ content: Content) -> some View {
         content.background(
             Canvas { context, size in
                 var image = context.resolve(image)
@@ -90,7 +81,7 @@ struct ChatViewBackground: ViewModifier {
                 case WallpaperType.empty: ()
                 }
             }
-        ).ignoresSafeArea(.all)
+        )
     }
 }
 

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/Helpers/NavLinkPlain.swift

@@ -7,17 +7,16 @@
 //
 
 import SwiftUI
-import SimpleXChat
 
-struct NavLinkPlain<Label: View>: View {
-    let chatId: ChatId
-    @Binding var selection: ChatId?
+struct NavLinkPlain<V: Hashable, Label: View>: View {
+    @State var tag: V
+    @Binding var selection: V?
     @ViewBuilder var label: () -> Label
     var disabled = false
 
     var body: some View {
         ZStack {
-            Button("") { ItemsModel.shared.loadOpenChat(chatId) }
+            Button("") { DispatchQueue.main.async { selection = tag } }
                 .disabled(disabled)
             label()
         }

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

@@ -17,9 +17,7 @@ struct NavStackCompat <C: View, D: View>: View {
         if #available(iOS 16, *) {
             NavigationStack(path: Binding(
                 get: { isActive.wrappedValue ? [true] : [] },
-                set: { path in
-                    if path.isEmpty { isActive.wrappedValue = false }
-                }
+                set: { _ in }
             )) {
                 ZStack {
                     NavigationLink(value: true) { EmptyView() }

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

@@ -16,12 +16,11 @@ struct ProfileImage: View {
     var size: CGFloat
     var color = Color(uiColor: .tertiarySystemGroupedBackground)
     var backgroundColor: Color? = nil
-    var blurred = false
     @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var radius = defaultProfileImageCorner
 
     var body: some View {
         if let uiImage = UIImage(base64Encoded: imageStr) {
-            clipProfileImage(Image(uiImage: uiImage), size: size, radius: radius, blurred: blurred)
+            clipProfileImage(Image(uiImage: uiImage), size: size, radius: radius)
         } else {
             let c = color.asAnotherColorFromSecondaryVariant(theme)
             Image(systemName: iconName)

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

@@ -1,80 +0,0 @@
-//
-//  SwipeLabel.swift
-//  SimpleX (iOS)
-//
-//  Created by Levitating Pineapple on 06/08/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct SwipeLabel: View {
-    private let text: String
-    private let systemImage: String
-    private let inverted: Bool
-
-    init(_ text: String, systemImage: String, inverted: Bool) {
-        self.text = text
-        self.systemImage = systemImage
-        self.inverted = inverted
-    }
-
-    var body: some View {
-        if inverted {
-            Image(
-                uiImage: SwipeActionView(
-                    systemName: systemImage,
-                    text: text
-                ).snapshot(inverted: inverted)
-            )
-        } else {
-            Label(text, systemImage: systemImage)
-        }
-    }
-
-    private class SwipeActionView: UIView {
-        private let imageView = UIImageView()
-        private let label = UILabel()
-        private let fontSize: CGFloat
-
-        init(systemName: String, text: String) {
-            fontSize = UIFontDescriptor.preferredFontDescriptor(withTextStyle: .subheadline).pointSize
-            super.init(frame: CGRect(x: 0, y: 0, width: 64, height: 32 + fontSize))
-            imageView.image = UIImage(systemName: systemName)
-            imageView.contentMode = .scaleAspectFit
-            label.text = text
-            label.textAlignment = .center
-            label.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
-            addSubview(imageView)
-            addSubview(label)
-        }
-
-        override func layoutSubviews() {
-            imageView.frame = CGRect(
-                x: 20,
-                y: 0,
-                width: 24,
-                height: 24
-            )
-            label.frame = CGRect(
-                x: 0,
-                y: 32,
-                width: 64,
-                height: fontSize
-            )
-        }
-
-        @available(*, unavailable)
-        required init?(coder: NSCoder) { fatalError("not implemented") }
-
-        func snapshot(inverted: Bool) -> UIImage {
-            UIGraphicsImageRenderer(bounds: bounds).image { context in
-                if inverted {
-                    context.cgContext.scaleBy(x: 1, y: -1)
-                    context.cgContext.translateBy(x: 0, y: -bounds.height)
-                }
-                layer.render(in: context.cgContext)
-            }.withRenderingMode(.alwaysTemplate)
-        }
-    }
-}

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

@@ -9,8 +9,8 @@
 import SwiftUI
 
 extension View {
-    @ViewBuilder func `if`<Content: View>(_ condition: Bool, transform: (Self) -> Content) -> some View {
-        if condition {
+    @ViewBuilder func `if`<Content: View>(_ condition: @autoclosure () -> Bool, transform: (Self) -> Content) -> some View {
+        if condition() {
             transform(self)
         } else {
             self

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

@@ -66,7 +66,6 @@ struct LocalAuthView: View {
                 m.chatId = nil
                 ItemsModel.shared.reversedChatItems = []
                 m.chats = []
-                m.popChatCollector.clear()
                 m.users = []
                 _ = kcAppPassword.set(password)
                 _ = kcSelfDestructPassword.remove()

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

@@ -32,7 +32,6 @@ private enum MigrateFromDeviceViewAlert: Identifiable {
     case keychainError(_ title: LocalizedStringKey = "Keychain error")
     case databaseError(_ title: LocalizedStringKey = "Database error", message: String)
     case unknownError(_ title: LocalizedStringKey = "Unknown error", message: String)
-    case archiveExportedWithErrors(archivePath: URL, archiveErrors: [ArchiveError])
 
     case error(title: LocalizedStringKey, error: String = "")
 
@@ -46,7 +45,6 @@ private enum MigrateFromDeviceViewAlert: Identifiable {
         case .keychainError: return "keychainError"
         case let .databaseError(title, message): return "\(title) \(message)"
         case let .unknownError(title, message): return "\(title) \(message)"
-        case let .archiveExportedWithErrors(path, _): return "archiveExportedWithErrors \(path)"
 
         case let .error(title, _): return "error \(title)"
         }
@@ -168,14 +166,6 @@ struct MigrateFromDevice: View {
                 return Alert(title: Text(title), message: Text(message))
             case let .unknownError(title, message):
                 return Alert(title: Text(title), message: Text(message))
-            case let .archiveExportedWithErrors(archivePath, errs):
-                return Alert(
-                    title: Text("Chat database exported"),
-                    message: Text("You may migrate the exported database.") + Text(verbatim: "\n\n") + Text("Some file(s) were not exported:") + archiveErrorsText(errs),
-                    dismissButton: .default(Text("Continue")) {
-                        Task { await uploadArchive(path: archivePath) }
-                    }
-                )
             case let .error(title, error):
                 return Alert(title: Text(title), message: Text(error))
             }
@@ -459,12 +449,15 @@ struct MigrateFromDevice: View {
         Task {
             do {
                 try? FileManager.default.createDirectory(at: getMigrationTempFilesDirectory(), withIntermediateDirectories: true)
-                let (archivePath, errs) = try await exportChatArchive(getMigrationTempFilesDirectory())
-                if errs.isEmpty {
-                    await uploadArchive(path: archivePath)
+                let archivePath = try await exportChatArchive(getMigrationTempFilesDirectory())
+                if let attrs = try? FileManager.default.attributesOfItem(atPath: archivePath.path),
+                    let totalBytes = attrs[.size] as? Int64 {
+                    await MainActor.run {
+                        migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
+                    }
                 } else {
                     await MainActor.run {
-                        alert = .archiveExportedWithErrors(archivePath: archivePath, archiveErrors: errs)
+                        alert = .error(title: "Exported file doesn't exist")
                         migrationState = .uploadConfirmation
                     }
                 }
@@ -476,20 +469,6 @@ struct MigrateFromDevice: View {
             }
         }
     }
-    
-    private func uploadArchive(path archivePath: URL) async {
-        if let attrs = try? FileManager.default.attributesOfItem(atPath: archivePath.path),
-            let totalBytes = attrs[.size] as? Int64 {
-            await MainActor.run {
-                migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
-            }
-        } else {
-            await MainActor.run {
-                alert = .error(title: "Exported file doesn't exist")
-                migrationState = .uploadConfirmation
-            }
-        }
-    }
 
     private func initTemporaryDatabase() -> (chat_ctrl, User)? {
         let (status, ctrl) = chatInitTemporaryDatabase(url: tempDatabaseUrl)

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

@@ -30,7 +30,7 @@ struct AddContactLearnMore: View {
             }
             .listRowBackground(Color.clear)
         }
-        .modifier(ThemedBackground(grouped: true))
+        .modifier(ThemedBackground())
     }
 }
 

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

@@ -35,37 +35,40 @@ struct AddGroupView: View {
                     creatingGroup: true,
                     showFooterCounter: false
                 ) { _ in
+                    dismiss()
                     DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                        dismissAllSheets(animated: true) {
-                            ItemsModel.shared.loadOpenChat(groupInfo.id)
-                        }
+                        m.chatId = groupInfo.id
                     }
                 }
-                .navigationBarTitleDisplayMode(.inline)
             } else {
                 GroupLinkView(
                     groupId: groupInfo.groupId,
                     groupLink: $groupLink,
                     groupLinkMemberRole: $groupLinkMemberRole,
-                    showTitle: false,
+                    showTitle: true,
                     creatingGroup: true
                 ) {
+                    dismiss()
                     DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                        dismissAllSheets(animated: true) {
-                            ItemsModel.shared.loadOpenChat(groupInfo.id)
-                        }
+                        m.chatId = groupInfo.id
                     }
                 }
-                .navigationBarTitle("Group link")
             }
         } else {
-            createGroupView()
+            createGroupView().keyboardPadding()
         }
     }
 
     func createGroupView() -> some View {
         List {
             Group {
+                Text("Create secret group")
+                    .font(.largeTitle)
+                    .bold()
+                    .fixedSize(horizontal: false, vertical: true)
+                    .padding(.bottom, 24)
+                    .onTapGesture(perform: hideKeyboard)
+
                 ZStack(alignment: .center) {
                     ZStack(alignment: .topTrailing) {
                         ProfileImage(imageStr: profile.image, size: 128)
@@ -201,14 +204,13 @@ struct AddGroupView: View {
                 chat = c
             }
         } catch {
-            dismissAllSheets(animated: true) {
-                AlertManager.shared.showAlert(
-                    Alert(
-                        title: Text("Error creating group"),
-                        message: Text(responseError(error))
-                    )
+            dismiss()
+            AlertManager.shared.showAlert(
+                Alert(
+                    title: Text("Error creating group"),
+                    message: Text(responseError(error))
                 )
-            }
+            )
         }
     }
 

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

@@ -7,499 +7,53 @@
 //
 
 import SwiftUI
-import SimpleXChat
 
-enum ContactType: Int {
-    case card, request, recent, chatDeleted, unlisted
+enum NewChatMenuOption: Identifiable {
+    case newContact
+    case scanPaste
+    case newGroup
+
+    var id: Self { self }
 }
 
 struct NewChatMenuButton: View {
-    @State private var showNewChatSheet = false
-    @State private var alert: SomeAlert? = nil
-    @State private var globalAlert: SomeAlert? = nil
+    @Binding var newChatMenuOption: NewChatMenuOption?
 
     var body: some View {
+        Menu {
             Button {
-            showNewChatSheet = true
+                newChatMenuOption = .newContact
+            } label: {
+                Text("Add contact")
+            }
+            Button {
+                newChatMenuOption = .scanPaste
+            } label: {
+                Text("Scan / Paste link")
+            }
+            Button {
+                newChatMenuOption = .newGroup
+            } label: {
+                Text("Create group")
+            }
         } label: {
             Image(systemName: "square.and.pencil")
                 .resizable()
                 .scaledToFit()
                 .frame(width: 24, height: 24)
         }
-        .appSheet(isPresented: $showNewChatSheet) {
-            NewChatSheet(alert: $alert)
-                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
-                .alert(item: $alert) { a in
-                    return a.alert
-                }
-        }
-        // 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
+        .sheet(item: $newChatMenuOption) { opt in
+            switch opt {
+            case .newContact: NewChatView(selection: .invite)
+            case .scanPaste: NewChatView(selection: .connect, showQRCodeScanner: true)
+            case .newGroup: AddGroupView()
             }
         }
-        .alert(item: $globalAlert) { a in
-            return a.alert
-        }
-    }
-}
-
-private var indent: CGFloat = 36
-
-struct NewChatSheet: View {
-    @EnvironmentObject var theme: AppTheme
-    @State private var baseContactTypes: [ContactType] = [.card, .request, .recent]
-    @EnvironmentObject var chatModel: ChatModel
-    @State private var searchMode = false
-    @FocusState var searchFocussed: Bool
-    @State private var searchText = ""
-    @State private var searchShowingSimplexLink = false
-    @State private var searchChatFilteredBySimplexLink: String? = nil
-    @Binding var alert: SomeAlert?
-
-    // Sheet height management
-    @State private var isAddContactActive = false
-    @State private var isScanPasteLinkActive = false
-    @State private var isLargeSheet = false
-    @State private var allowSmallSheet = true
-
-    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
-
-    var body: some View {
-        let showArchive = !filterContactTypes(chats: chatModel.chats, contactTypes: [.chatDeleted]).isEmpty
-        let v = NavigationView {
-            viewBody(showArchive)
-                .navigationTitle("New message")
-                .navigationBarTitleDisplayMode(.large)
-                .navigationBarHidden(searchMode)
-                .modifier(ThemedBackground(grouped: true))
-        }
-        if #available(iOS 16.0, *), oneHandUI {
-            let sheetHeight: CGFloat = showArchive ? 575 : 500
-            v.presentationDetents(
-                allowSmallSheet ? [.height(sheetHeight), .large] : [.large],
-                selection: Binding(
-                    get: { isLargeSheet || !allowSmallSheet ? .large : .height(sheetHeight) },
-                    set: { isLargeSheet = $0 == .large }
-                )
-            )
-        } else {
-            v
-        }
-    }
-
-    @ViewBuilder private func viewBody(_ showArchive: Bool) -> some View {
-        List {
-            HStack {
-                ContactsListSearchBar(
-                    searchMode: $searchMode,
-                    searchFocussed: $searchFocussed,
-                    searchText: $searchText,
-                    searchShowingSimplexLink: $searchShowingSimplexLink,
-                    searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
-                )
-                .frame(maxWidth: .infinity)
-            }
-            .listRowSeparator(.hidden)
-            .listRowBackground(Color.clear)
-            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-
-            if (searchText.isEmpty) {
-                Section {
-                    NavigationLink(isActive: $isAddContactActive) {
-                        NewChatView(selection: .invite, parentAlert: $alert)
-                            .navigationTitle("New chat")
-                            .modifier(ThemedBackground(grouped: true))
-                            .navigationBarTitleDisplayMode(.large)
-                    } label: {
-                        navigateOnTap(Label("Add contact", systemImage: "link.badge.plus")) {
-                            isAddContactActive = true
-                        }
-                    }
-                    NavigationLink(isActive: $isScanPasteLinkActive) {
-                        NewChatView(selection: .connect, showQRCodeScanner: true, parentAlert: $alert)
-                            .navigationTitle("New chat")
-                            .modifier(ThemedBackground(grouped: true))
-                            .navigationBarTitleDisplayMode(.large)
-                    } label: {
-                        navigateOnTap(Label("Scan / Paste link", systemImage: "qrcode")) {
-                            isScanPasteLinkActive = true
-                        }
-                    }
-                    NavigationLink {
-                        AddGroupView()
-                            .navigationTitle("Create secret group")
-                            .modifier(ThemedBackground(grouped: true))
-                            .navigationBarTitleDisplayMode(.large)
-                    } label: {
-                        Label("Create group", systemImage: "person.2.circle.fill")
-                    }
-                }
-                
-                if (showArchive) {
-                    Section {
-                        NavigationLink {
-                            DeletedChats()
-                        } label: {
-                            newChatActionButton("archivebox", color: theme.colors.secondary) { Text("Archived contacts") }
-                        }
-                    }
-                }
-            }
-            
-            ContactsList(
-                baseContactTypes: $baseContactTypes,
-                searchMode: $searchMode,
-                searchText: $searchText,
-                header: "Your Contacts",
-                searchFocussed: $searchFocussed,
-                searchShowingSimplexLink: $searchShowingSimplexLink,
-                searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink,
-                showDeletedChatIcon: true
-            )
-        }
-    }
-    
-    /// Extends label's tap area to match `.insetGrouped` list row insets
-    private func navigateOnTap<L: View>(_ label: L, setActive: @escaping () -> Void) -> some View {
-        label
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(.leading, 16).padding(.vertical, 8).padding(.trailing, 32)
-            .contentShape(Rectangle())
-            .onTapGesture {
-                isLargeSheet = true
-                DispatchQueue.main.async {
-                    allowSmallSheet = false
-                    setActive()
-                }
-            }
-            .padding(.leading, -16).padding(.vertical, -8).padding(.trailing, -32)
-    }
-
-    func newChatActionButton<Content : View>(_ icon: String, color: Color/* = .secondary*/, content: @escaping () -> Content) -> some View {
-        ZStack(alignment: .leading) {
-            Image(systemName: icon)
-                .resizable()
-                .scaledToFit()
-                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
-                .symbolRenderingMode(.monochrome)
-                .foregroundColor(color)
-            content().foregroundColor(theme.colors.onBackground).padding(.leading, indent)
-        }
-    }
-}
-
-func chatContactType(chat: Chat) -> ContactType {
-    switch chat.chatInfo {
-    case .contactRequest:
-        return .request
-    case let .direct(contact):
-        if contact.activeConn == nil && contact.profile.contactLink != nil {
-            return .card
-        } else if contact.chatDeleted {
-            return .chatDeleted
-        } else if contact.contactStatus == .active {
-            return .recent
-        } else {
-            return .unlisted
-        }
-    default:
-        return .unlisted
-    }
-}
-
-private func filterContactTypes(chats: [Chat], contactTypes: [ContactType]) -> [Chat] {
-    return chats.filter { chat in
-        contactTypes.contains(chatContactType(chat: chat))
-    }
-}
-
-struct ContactsList: View {
-    @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject var chatModel: ChatModel
-    @Binding var baseContactTypes: [ContactType]
-    @Binding var searchMode: Bool
-    @Binding var searchText: String
-    var header: String? = nil
-    @FocusState.Binding var searchFocussed: Bool
-    @Binding var searchShowingSimplexLink: Bool
-    @Binding var searchChatFilteredBySimplexLink: String?
-    var showDeletedChatIcon: Bool
-    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
-    
-    var body: some View {
-        let contactTypes = contactTypesSearchTargets(baseContactTypes: baseContactTypes, searchEmpty: searchText.isEmpty)
-        let contactChats = filterContactTypes(chats: chatModel.chats, contactTypes: contactTypes)
-        let filteredContactChats = filteredContactChats(
-            showUnreadAndFavorites: showUnreadAndFavorites,
-            searchShowingSimplexLink: searchShowingSimplexLink,
-            searchChatFilteredBySimplexLink: searchChatFilteredBySimplexLink,
-            searchText: searchText,
-            contactChats: contactChats
-        )
-        
-        if !filteredContactChats.isEmpty {
-            Section(header: Group {
-                if let header = header {
-                    Text(header)
-                        .textCase(.uppercase)
-                        .foregroundColor(theme.colors.secondary)
-                    }
-                }
-            ) {
-                ForEach(filteredContactChats, id: \.viewId) { chat in
-                    ContactListNavLink(chat: chat, showDeletedChatIcon: showDeletedChatIcon)
-                        .disabled(chatModel.chatRunning != true)
-                }
-            }
-        }
-        
-        if filteredContactChats.isEmpty && !contactChats.isEmpty {
-            noResultSection(text: "No filtered contacts")
-        } else if contactChats.isEmpty {
-            noResultSection(text: "No contacts")
-        }
-    }
-    
-    @ViewBuilder private func noResultSection(text: String) -> some View {
-        Section {
-            Text(text)
-                .foregroundColor(theme.colors.secondary)
-                .frame(maxWidth: .infinity, alignment: .center)
-
-        }
-        .listRowSeparator(.hidden)
-        .listRowBackground(Color.clear)
-        .listRowInsets(EdgeInsets(top: 7, leading: 0, bottom: 7, trailing: 0))
-    }
-    
-    private func contactTypesSearchTargets(baseContactTypes: [ContactType], searchEmpty: Bool) -> [ContactType] {
-        if baseContactTypes.contains(.chatDeleted) || searchEmpty {
-            return baseContactTypes
-        } else {
-            return baseContactTypes + [.chatDeleted]
-        }
-    }
-    
-    private func chatsByTypeComparator(chat1: Chat, chat2: Chat) -> Bool {
-        let chat1Type = chatContactType(chat: chat1)
-        let chat2Type = chatContactType(chat: chat2)
-
-        if chat1Type.rawValue < chat2Type.rawValue {
-            return true
-        } else if chat1Type.rawValue > chat2Type.rawValue {
-            return false
-        } else {
-            return chat2.chatInfo.chatTs < chat1.chatInfo.chatTs
-        }
-    }
-        
-    private func filterChat(chat: Chat, searchText: String, showUnreadAndFavorites: Bool) -> Bool {
-        var meetsPredicate = true
-        let s = searchText.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        let cInfo = chat.chatInfo
-
-        if !searchText.isEmpty {
-            if (!cInfo.chatViewName.lowercased().contains(searchText.lowercased())) {
-                if case let .direct(contact) = cInfo {
-                    meetsPredicate = contact.profile.displayName.lowercased().contains(s) || contact.fullName.lowercased().contains(s)
-                } else {
-                    meetsPredicate = false
-                }
-            }
-        }
-
-        if showUnreadAndFavorites {
-            meetsPredicate = meetsPredicate && (cInfo.chatSettings?.favorite ?? false)
-        }
-
-        return meetsPredicate
-    }
-    
-    func filteredContactChats(
-        showUnreadAndFavorites: Bool,
-        searchShowingSimplexLink: Bool,
-        searchChatFilteredBySimplexLink: String?,
-        searchText: String,
-        contactChats: [Chat]
-    ) -> [Chat] {
-        let linkChatId = searchChatFilteredBySimplexLink
-        let s = searchShowingSimplexLink ? "" : searchText.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-
-        let filteredChats: [Chat]
-
-        if let linkChatId = linkChatId {
-            filteredChats = contactChats.filter { $0.id == linkChatId }
-        } else {
-            filteredChats = contactChats.filter { chat in
-                filterChat(chat: chat, searchText: s, showUnreadAndFavorites: showUnreadAndFavorites)
-            }
-        }
-
-        return filteredChats.sorted(by: chatsByTypeComparator)
-    }
-}
-
-struct ContactsListSearchBar: View {
-    @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
-    @Binding var searchMode: Bool
-    @FocusState.Binding var searchFocussed: Bool
-    @Binding var searchText: String
-    @Binding var searchShowingSimplexLink: Bool
-    @Binding var searchChatFilteredBySimplexLink: String?
-    @State private var ignoreSearchTextChange = false
-    @State private var alert: PlanAndConnectAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
-    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
-
-    var body: some View {
-        HStack(spacing: 12) {
-            HStack(spacing: 4) {
-                Spacer()
-                    .frame(width: 8)
-                Image(systemName: "magnifyingglass")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 16, height: 16)
-                TextField("Search or paste SimpleX link", text: $searchText)
-                    .foregroundColor(searchShowingSimplexLink ? theme.colors.secondary : theme.colors.onBackground)
-                    .disabled(searchShowingSimplexLink)
-                    .focused($searchFocussed)
-                    .frame(maxWidth: .infinity)
-                if !searchText.isEmpty {
-                    Image(systemName: "xmark.circle.fill")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 16, height: 16)
-                        .onTapGesture {
-                            searchText = ""
-                        }
-                }
-            }
-            .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
-            .foregroundColor(theme.colors.secondary)
-            .background(Color(uiColor: .secondarySystemGroupedBackground))
-            .cornerRadius(10.0)
-
-            if searchFocussed {
-                Text("Cancel")
-                    .foregroundColor(theme.colors.primary)
-                    .onTapGesture {
-                        searchText = ""
-                        searchFocussed = false
-                    }
-            } else if m.chats.count > 0 {
-                toggleFilterButton()
-            }
-        }
-        .padding(.top, 24)
-        .onChange(of: searchFocussed) { sf in
-            withAnimation { searchMode = sf }
-        }
-        .onChange(of: searchText) { t in
-            if ignoreSearchTextChange {
-                ignoreSearchTextChange = false
-            } else {
-                if let link = strHasSingleSimplexLink(t.trimmingCharacters(in: .whitespaces)) { // if SimpleX link is pasted, show connection dialogue
-                    searchFocussed = false
-                    if case let .simplexLink(linkType, _, smpHosts) = link.format {
-                        ignoreSearchTextChange = true
-                        searchText = simplexLinkText(linkType, smpHosts)
-                    }
-                    searchShowingSimplexLink = true
-                    searchChatFilteredBySimplexLink = nil
-                    connect(link.text)
-                } else {
-                    if t != "" { // if some other text is pasted, enter search mode
-                        searchFocussed = true
-                    }
-                    searchShowingSimplexLink = false
-                    searchChatFilteredBySimplexLink = nil
-                }
-            }
-        }
-        .alert(item: $alert) { a in
-            planAndConnectAlert(a, dismiss: true, cleanup: { searchText = "" })
-        }
-        .actionSheet(item: $sheet) { s in
-            planAndConnectActionSheet(s, dismiss: true, cleanup: { searchText = "" })
-        }
-    }
-
-    private func toggleFilterButton() -> some View {
-        ZStack {
-            Color.clear
-                .frame(width: 22, height: 22)
-            Image(systemName: showUnreadAndFavorites ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease")
-                .resizable()
-                .scaledToFit()
-                .foregroundColor(showUnreadAndFavorites ? theme.colors.primary : theme.colors.secondary)
-                .frame(width: showUnreadAndFavorites ? 22 : 16, height: showUnreadAndFavorites ? 22 : 16)
-                .onTapGesture {
-                    showUnreadAndFavorites = !showUnreadAndFavorites
-                }
-        }
-    }
-
-    private func connect(_ link: String) {
-        planAndConnect(
-            link,
-            showAlert: { alert = $0 },
-            showActionSheet: { sheet = $0 },
-            dismiss: true,
-            incognito: nil,
-            filterKnownContact: { searchChatFilteredBySimplexLink = $0.id }
-        )
-    }
-}
-
-
-struct DeletedChats: View {
-    @State private var baseContactTypes: [ContactType] = [.chatDeleted]
-    @State private var searchMode = false
-    @FocusState var searchFocussed: Bool
-    @State private var searchText = ""
-    @State private var searchShowingSimplexLink = false
-    @State private var searchChatFilteredBySimplexLink: String? = nil
-    
-    var body: some View {
-        List {
-            ContactsListSearchBar(
-                searchMode: $searchMode,
-                searchFocussed: $searchFocussed,
-                searchText: $searchText,
-                searchShowingSimplexLink: $searchShowingSimplexLink,
-                searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
-            )
-            .listRowSeparator(.hidden)
-            .listRowBackground(Color.clear)
-            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-            .frame(maxWidth: .infinity)
-            
-            ContactsList(
-                baseContactTypes: $baseContactTypes,
-                searchMode: $searchMode,
-                searchText: $searchText,
-                searchFocussed: $searchFocussed,
-                searchShowingSimplexLink: $searchShowingSimplexLink,
-                searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink,
-                showDeletedChatIcon: false
-            )
-        }
-        .navigationTitle("Archived contacts")
-        .navigationBarTitleDisplayMode(.large)
-        .navigationBarHidden(searchMode)
-        .modifier(ThemedBackground(grouped: true))
-
     }
 }
 
 #Preview {
-    NewChatMenuButton()
+    NewChatMenuButton(
+        newChatMenuOption: Binding.constant(nil)
+    )
 }

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

@@ -17,19 +17,10 @@ struct SomeAlert: Identifiable {
     var id: String
 }
 
-struct SomeActionSheet: Identifiable {
-    var actionSheet: ActionSheet
-    var id: String
-}
-
-struct SomeSheet<Content: View>: Identifiable {
-    @ViewBuilder var content: Content
-    var id: String
-}
-
 private enum NewChatViewAlert: Identifiable {
     case planAndConnectAlert(alert: PlanAndConnectAlert)
     case newChatSomeAlert(alert: SomeAlert)
+
     var id: String {
         switch self {
         case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
@@ -56,10 +47,22 @@ struct NewChatView: View {
     @State private var creatingConnReq = false
     @State private var pastedLink: String = ""
     @State private var alert: NewChatViewAlert?
-    @Binding var parentAlert: SomeAlert?
 
     var body: some View {
         VStack(alignment: .leading) {
+            HStack {
+                Text("New chat")
+                    .font(.largeTitle)
+                    .bold()
+                    .fixedSize(horizontal: false, vertical: true)
+                Spacer()
+                InfoSheetButton {
+                    AddContactLearnMore(showTitle: true)
+                }
+            }
+            .padding()
+            .padding(.top)
+
             Picker("New chat", selection: $selection) {
                 Label("Add contact", systemImage: "link")
                     .tag(NewChatOption.invite)
@@ -85,7 +88,6 @@ struct NewChatView: View {
                 }
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .modifier(ThemedBackground(grouped: true))
             .background(
                 // Rectangle is needed for swipe gesture to work on mostly empty views (creatingLinkProgressView and retryButton)
                 Rectangle()
@@ -108,13 +110,6 @@ struct NewChatView: View {
                 }
             )
         }
-        .toolbar {
-            ToolbarItem(placement: .navigationBarTrailing) {
-                InfoSheetButton {
-                    AddContactLearnMore(showTitle: true)
-                }
-            }
-        }
         .modifier(ThemedBackground(grouped: true))
         .onChange(of: invitationUsed) { used in
             if used && !(m.showingInvitation?.connChatUsed ?? true) {
@@ -124,22 +119,19 @@ struct NewChatView: View {
         .onDisappear {
             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: []
-                                ))
-                            }
+                AlertManager.shared.showAlert(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
         }
@@ -845,10 +837,7 @@ private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incogn
                 dismissAllSheets(animated: true)
             }
         }
-        let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { AlertManager.shared.showAlert($0) })
-        if ok {
-            AlertManager.shared.showAlert(connReqSentAlert(.contact))
-        }
+        _ = await connectContactViaAddress(contact.contactId, incognito)
         cleanup?()
     }
 }
@@ -898,11 +887,11 @@ func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert:
             DispatchQueue.main.async {
                 if dismiss {
                     dismissAllSheets(animated: true) {
-                        ItemsModel.shared.loadOpenChat(c.id)
+                        m.chatId = c.id
                         showAlreadyExistsAlert?()
                     }
                 } else {
-                    ItemsModel.shared.loadOpenChat(c.id)
+                    m.chatId = c.id
                     showAlreadyExistsAlert?()
                 }
             }
@@ -917,11 +906,11 @@ func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAler
             DispatchQueue.main.async {
                 if dismiss {
                     dismissAllSheets(animated: true) {
-                        ItemsModel.shared.loadOpenChat(g.id)
+                        m.chatId = g.id
                         showAlreadyExistsAlert?()
                     }
                 } else {
-                    ItemsModel.shared.loadOpenChat(g.id)
+                    m.chatId = g.id
                     showAlreadyExistsAlert?()
                 }
             }
@@ -972,13 +961,8 @@ func connReqSentAlert(_ type: ConnReqType) -> Alert {
     )
 }
 
-struct NewChatView_Previews: PreviewProvider {
-    static var previews: some View {
-        @State var parentAlert: SomeAlert?
-
-        NewChatView(
-            selection: .invite,
-            parentAlert: $parentAlert
-        )
-    }
+#Preview {
+    NewChatView(
+        selection: .invite
+    )
 }

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/Onboarding/WhatsNewView.swift

@@ -15,10 +15,9 @@ private struct VersionDescription {
 }
 
 private struct FeatureDescription {
-    var icon: String?
+    var icon: String
     var title: LocalizedStringKey
-    var description: LocalizedStringKey?
-    var subfeatures: [(icon: String, description: LocalizedStringKey)] = []
+    var description: LocalizedStringKey
 }
 
 private let versionDescriptions: [VersionDescription] = [
@@ -429,44 +428,6 @@ private let versionDescriptions: [VersionDescription] = [
             )
         ]
     ),
-    VersionDescription(
-        version: "v6.0",
-        post: URL(string: "https://simplex.chat/blog/20240814-simplex-chat-vision-funding-v6-private-routing-new-user-experience.html"),
-        features: [
-            FeatureDescription(
-                icon: nil,
-                title: "New chat experience 🎉",
-                description: nil,
-                subfeatures: [
-                    ("link.badge.plus", "Connect to your friends faster."),
-                    ("archivebox", "Archive contacts to chat later."),
-                    ("trash", "Delete up to 20 messages at once."),
-                    ("platter.filled.bottom.and.arrow.down.iphone", "Use the app with one hand."),
-                    ("paintpalette", "Color chats with the new themes."),
-                ]
-            ),
-            FeatureDescription(
-                icon: nil,
-                title: "New media options",
-                description: nil,
-                subfeatures: [
-                    ("square.and.arrow.up", "Share from other apps."),
-                    ("play.circle", "Play from the chat list."),
-                    ("circle.filled.pattern.diagonalline.rectangle", "Blur for better privacy.")
-                ]
-            ),
-            FeatureDescription(
-                icon: "arrow.forward",
-                title: "Private message routing 🚀",
-                description: "It protects your IP address and connections."
-            ),
-            FeatureDescription(
-                icon: "network",
-                title: "Better networking",
-                description: "Connection and servers status."
-            )
-        ]
-    ),
 ]
 
 private let lastVersion = versionDescriptions.last!.version
@@ -492,37 +453,35 @@ struct WhatsNewView: View {
         VStack {
             TabView(selection: $currentVersion) {
                 ForEach(Array(versionDescriptions.enumerated()), id: \.0) { (i, v) in
-                    ScrollView {
-                        VStack(alignment: .leading, spacing: 16) {
-                            Text("New in \(v.version)")
-                                .font(.title)
-                                .foregroundColor(theme.colors.secondary)
-                                .frame(maxWidth: .infinity)
-                                .padding(.vertical)
-                            ForEach(v.features, id: \.title) { f in
-                                featureDescription(f)
-                                    .padding(.bottom, 8)
-                            }
-                            if let post = v.post {
-                                Link(destination: post) {
-                                    HStack {
-                                        Text("Read more")
-                                        Image(systemName: "arrow.up.right.circle")
-                                    }
+                    VStack(alignment: .leading, spacing: 16) {
+                        Text("New in \(v.version)")
+                            .font(.title)
+                            .foregroundColor(theme.colors.secondary)
+                            .frame(maxWidth: .infinity)
+                            .padding(.vertical)
+                        ForEach(v.features, id: \.icon) { f in
+                            featureDescription(f.icon, f.title, f.description)
+                                .padding(.bottom, 8)
+                        }
+                        if let post = v.post {
+                            Link(destination: post) {
+                                HStack {
+                                    Text("Read more")
+                                    Image(systemName: "arrow.up.right.circle")
                                 }
                             }
-                            if !viaSettings {
-                                Spacer()
-                                Button("Ok") {
-                                    dismiss()
-                                }
-                                .font(.title3)
-                                .frame(maxWidth: .infinity, alignment: .center)
-                                Spacer()
-                            }
                         }
-                        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+                        if !viaSettings {
+                            Spacer()
+                            Button("Ok") {
+                                dismiss()
+                            }
+                            .font(.title3)
+                            .frame(maxWidth: .infinity, alignment: .center)
+                            Spacer()
+                        }
                     }
+                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
                     .tag(i)
                 }
             }
@@ -536,37 +495,18 @@ struct WhatsNewView: View {
         }
     }
 
-    private func featureDescription(_ f: FeatureDescription) -> some View {
+    private func featureDescription(_ icon: String, _ title: LocalizedStringKey, _ description: LocalizedStringKey) -> some View {
         VStack(alignment: .leading, spacing: 4) {
-            if let icon = f.icon {
-                HStack(alignment: .center, spacing: 4) {
-                    Image(systemName: icon)
-                        .symbolRenderingMode(.monochrome)
-                        .foregroundColor(theme.colors.secondary)
-                        .frame(minWidth: 30, alignment: .center)
-                    Text(f.title).font(.title3).bold()
-                }
-            } else {
-                Text(f.title).font(.title3).bold()
-            }
-            if let d = f.description {
-                Text(d)
-                    .multilineTextAlignment(.leading)
-                    .lineLimit(10)
-            }
-            if f.subfeatures.count > 0 {
-                ForEach(f.subfeatures, id: \.icon) { s in
-                    HStack(alignment: .center, spacing: 4) {
-                        Image(systemName: s.icon)
-                            .symbolRenderingMode(.monochrome)
-                            .foregroundColor(theme.colors.secondary)
-                            .frame(minWidth: 30, alignment: .center)
-                        Text(s.description)
-                            .multilineTextAlignment(.leading)
-                            .lineLimit(3)
-                    }
-                }
+            HStack(alignment: .center, spacing: 4) {
+                Image(systemName: icon)
+                    .symbolRenderingMode(.monochrome)
+                    .foregroundColor(theme.colors.secondary)
+                    .frame(minWidth: 30, alignment: .center)
+                Text(title).font(.title3).bold()
             }
+            Text(description)
+                .multilineTextAlignment(.leading)
+                .lineLimit(10)
         }
     }
 

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

@@ -24,114 +24,34 @@ enum NetworkSettingsAlert: Identifiable {
 }
 
 struct AdvancedNetworkSettings: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
     @EnvironmentObject var theme: AppTheme
-    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
     @State private var netCfg = NetCfg.defaults
     @State private var currentNetCfg = NetCfg.defaults
     @State private var cfgLoaded = false
     @State private var enableKeepAlive = true
     @State private var keepAliveOpts = KeepAliveOpts.defaults
     @State private var showSettingsAlert: NetworkSettingsAlert?
-    @State private var onionHosts: OnionHosts = .no
-    @State private var showSaveDialog = false
 
     var body: some View {
         VStack {
             List {
                 Section {
-                    NavigationLink {
-                        List {
-                            Section {
-                                SelectionListView(list: SMPProxyMode.values, selection: $netCfg.smpProxyMode) { mode in
-                                    netCfg.smpProxyMode = mode
-                                }
-                            } footer: {
-                                Text(proxyModeInfo(netCfg.smpProxyMode))
-                                    .font(.callout)
-                                    .foregroundColor(theme.colors.secondary)
-                            }
-                        }
-                        .navigationTitle("Private routing")
-                        .modifier(ThemedBackground(grouped: true))
-                        .navigationBarTitleDisplayMode(.inline)
+                    Button {
+                        updateNetCfgView(NetCfg.defaults)
+                        showSettingsAlert = .update
                     } label: {
-                        HStack {
-                            Text("Private routing")
-                            Spacer()
-                            Text(netCfg.smpProxyMode.label)
-                        }
+                        Text("Reset to defaults")
                     }
-                    
-                    NavigationLink {
-                        List {
-                            Section {
-                                SelectionListView(list: SMPProxyFallback.values, selection: $netCfg.smpProxyFallback) { mode in
-                                    netCfg.smpProxyFallback = mode
-                                }
-                                .disabled(netCfg.smpProxyMode == .never)
-                            } footer: {
-                                Text(proxyFallbackInfo(netCfg.smpProxyFallback))
-                                    .font(.callout)
-                                    .foregroundColor(theme.colors.secondary)
-                            }
-                        }
-                        .navigationTitle("Allow downgrade")
-                        .modifier(ThemedBackground(grouped: true))
-                        .navigationBarTitleDisplayMode(.inline)
+                    .disabled(currentNetCfg == NetCfg.defaults)
+
+                    Button {
+                        updateNetCfgView(NetCfg.proxyDefaults)
+                        showSettingsAlert = .update
                     } label: {
-                        HStack {
-                            Text("Allow downgrade")
-                            Spacer()
-                            Text(netCfg.smpProxyFallback.label)
-                        }
+                        Text("Set timeouts for proxy/VPN")
                     }
+                    .disabled(currentNetCfg == NetCfg.proxyDefaults)
 
-                    Toggle("Show message status", isOn: $showSentViaProxy)
-                } header: {
-                    Text("Private message routing")
-                        .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    VStack(alignment: .leading) {
-                        Text("To protect your IP address, private routing uses your SMP servers to deliver messages.")
-                        if showSentViaProxy {
-                            Text("Show → on messages sent via private routing.")
-                        }
-                    }
-                    .foregroundColor(theme.colors.secondary)
-                }
-
-                Section {
-                    Picker("Use .onion hosts", selection: $onionHosts) {
-                        ForEach(OnionHosts.values, id: \.self) { Text($0.text) }
-                    }
-                    .frame(height: 36)
-                } footer: {
-                    Text(onionHostsInfo(onionHosts))
-                        .foregroundColor(theme.colors.secondary)
-                }
-                .onChange(of: onionHosts) { hosts in
-                    if hosts != OnionHosts(netCfg: currentNetCfg) {
-                        let (hostMode, requiredHostMode) = hosts.hostMode
-                        netCfg.hostMode = hostMode
-                        netCfg.requiredHostMode = requiredHostMode
-                    }
-                }
-                
-                if developerTools {
-                    Section {
-                        Picker("Transport isolation", selection: $netCfg.sessionMode) {
-                            ForEach(TransportSessionMode.values, id: \.self) { Text($0.text) }
-                        }
-                        .frame(height: 36)
-                    } footer: {
-                        Text(sessionModeInfo(netCfg.sessionMode))
-                            .foregroundColor(theme.colors.secondary)
-                    }
-                }
-
-                Section("TCP connection") {
                     timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [10_000000, 15_000000, 20_000000, 30_000000, 45_000000, 60_000000, 90_000000], label: secondsLabel)
                     timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
                     timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [2_500, 5_000, 10_000, 15_000, 20_000, 30_000], label: secondsLabel)
@@ -152,21 +72,24 @@ struct AdvancedNetworkSettings: View {
                         }
                         .foregroundColor(theme.colors.secondary)
                     }
-                }
-                
-                Section {
-                    Button("Reset to defaults") {
-                        updateNetCfgView(NetCfg.defaults)
-                    }
-                    .disabled(netCfg == NetCfg.defaults)
+                } header: {
+                        Text("")
+                        .foregroundColor(theme.colors.secondary)
+                } footer: {
+                    HStack {
+                        Button {
+                            updateNetCfgView(currentNetCfg)
+                        } label: {
+                            Label("Revert", systemImage: "arrow.counterclockwise").font(.callout)
+                        }
 
-                    Button("Set timeouts for proxy/VPN") {
-                        updateNetCfgView(netCfg.withProxyTimeouts)
-                    }
-                    .disabled(netCfg.hasProxyTimeouts)
-                    
-                    Button("Save and reconnect") {
-                        showSettingsAlert = .update
+                        Spacer()
+
+                        Button {
+                            showSettingsAlert = .update
+                        } label: {
+                            Label("Save", systemImage: "checkmark").font(.callout)
+                        }
                     }
                     .disabled(netCfg == currentNetCfg)
                 }
@@ -188,10 +111,10 @@ struct AdvancedNetworkSettings: View {
             switch a {
             case .update:
                 return Alert(
-                    title: Text("Update settings?"),
+                    title: Text("Update network settings?"),
                     message: Text("Updating settings will re-connect the client to all servers."),
                     primaryButton: .default(Text("Ok")) {
-                        _ = saveNetCfg()
+                        saveNetCfg()
                     },
                     secondaryButton: .cancel()
                 )
@@ -202,43 +125,23 @@ struct AdvancedNetworkSettings: View {
                 )
             }
         }
-        .modifier(BackButton(disabled: Binding.constant(false)) {
-            if netCfg == currentNetCfg {
-                dismiss()
-                cfgLoaded = false
-            } else {
-                showSaveDialog = true
-            }
-        })
-        .confirmationDialog("Update network settings?", isPresented: $showSaveDialog, titleVisibility: .visible) {
-            Button("Save and reconnect") {
-                if saveNetCfg() {
-                    dismiss()
-                    cfgLoaded = false
-                }
-            }
-            Button("Exit without saving") { dismiss() }
-        }
     }
 
     private func updateNetCfgView(_ cfg: NetCfg) {
         netCfg = cfg
-        onionHosts = OnionHosts(netCfg: netCfg)
         enableKeepAlive = netCfg.enableKeepAlive
         keepAliveOpts = netCfg.tcpKeepAlive ?? KeepAliveOpts.defaults
     }
 
-    private func saveNetCfg() -> Bool {
+    private func saveNetCfg() {
         do {
             try setNetworkConfig(netCfg)
             currentNetCfg = netCfg
             setNetCfg(netCfg)
-            return true
         } catch let error {
             let err = responseError(error)
             showSettingsAlert = .error(err: err)
             logger.error("\(err)")
-            return false
         }
     }
 
@@ -261,38 +164,6 @@ struct AdvancedNetworkSettings: View {
         }
         .frame(height: 36)
     }
-    
-    private func onionHostsInfo(_ hosts: OnionHosts) -> LocalizedStringKey {
-        switch hosts {
-        case .no: return "Onion hosts will not be used."
-        case .prefer: return "Onion hosts will be used when available.\nRequires compatible VPN."
-        case .require: return "Onion hosts will be **required** for connection.\nRequires compatible VPN."
-        }
-    }
-
-    private func sessionModeInfo(_ mode: TransportSessionMode) -> LocalizedStringKey {
-        switch mode {
-        case .user: return "A separate TCP connection will be used **for each chat profile you have in the app**."
-        case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
-        }
-    }
-    
-    private func proxyModeInfo(_ mode: SMPProxyMode) -> LocalizedStringKey {
-        switch mode {
-        case .always: return "Always use private routing."
-        case .unknown: return "Use private routing with unknown servers."
-        case .unprotected: return "Use private routing with unknown servers when IP address is not protected."
-        case .never: return "Do NOT use private routing."
-        }
-    }
-    
-    private func proxyFallbackInfo(_ proxyFallback: SMPProxyFallback) -> LocalizedStringKey {
-        switch proxyFallback {
-        case .allow: return "Send messages directly when your or destination server does not support private routing."
-        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support private routing."
-        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support private routing."
-        }
-    }
 }
 
 struct AdvancedNetworkSettings_Previews: PreviewProvider {

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

@@ -28,10 +28,7 @@ extension AppSettings {
             privacyAcceptImagesGroupDefault.set(val)
             def.setValue(val, forKey: DEFAULT_PRIVACY_ACCEPT_IMAGES)
         }
-        if let val = privacyLinkPreviews {
-            privacyLinkPreviewsGroupDefault.set(val)
-            def.setValue(val, forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
-        }
+        if let val = privacyLinkPreviews { def.setValue(val, forKey: DEFAULT_PRIVACY_LINK_PREVIEWS) }
         if let val = privacyShowChatPreviews { def.setValue(val, forKey: DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) }
         if let val = privacySaveLastDraft { def.setValue(val, forKey: DEFAULT_PRIVACY_SAVE_LAST_DRAFT) }
         if let val = privacyProtectScreen { def.setValue(val, forKey: DEFAULT_PRIVACY_PROTECT_SCREEN) }
@@ -48,15 +45,11 @@ extension AppSettings {
         if let val = androidCallOnLockScreen { def.setValue(val.rawValue, forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN) }
         if let val = iosCallKitEnabled { callKitEnabledGroupDefault.set(val) }
         if let val = iosCallKitCallsInRecents { def.setValue(val, forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS) }
-        if let val = uiProfileImageCornerRadius {
-            profileImageCornerRadiusGroupDefault.set(val)
-            def.setValue(val, forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
-        }
+        if let val = uiProfileImageCornerRadius { def.setValue(val, forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) }
         if let val = uiColorScheme { def.setValue(val, forKey: DEFAULT_CURRENT_THEME) }
         if let val = uiDarkColorScheme { def.setValue(val, forKey: DEFAULT_SYSTEM_DARK_THEME) }
         if let val = uiCurrentThemeIds { def.setValue(val, forKey: DEFAULT_CURRENT_THEME_IDS) }
         if let val = uiThemes { def.setValue(val.skipDuplicates(), forKey: DEFAULT_THEME_OVERRIDES) }
-        if let val = oneHandUI { groupDefaults.setValue(val, forKey: GROUP_DEFAULT_ONE_HAND_UI) }
     }
 
     public static var current: AppSettings {
@@ -88,7 +81,6 @@ extension AppSettings {
         c.uiDarkColorScheme = systemDarkThemeDefault.get()
         c.uiCurrentThemeIds = currentThemeIdsDefault.get()
         c.uiThemes = themeOverridesDefault.get()
-        c.oneHandUI = groupDefaults.bool(forKey: GROUP_DEFAULT_ONE_HAND_UI)
         return c
     }
 }

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(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
-    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
 
     @State var themeUserDestination: (Int64, ThemeModeOverrides?)? = {
         if let currentUser = ChatModel.shared.currentUser, let uiThemes = currentUser.uiThemes, uiThemes.preferredMode(!CurrentColors.colors.isLight) != nil {
@@ -64,16 +62,6 @@ struct AppearanceSettings: View {
                     }
                 }
 
-                Section("Chat list") {
-                    Toggle("Reachable chat toolbar", isOn: $oneHandUI)
-                    Picker("Toolbar opacity", selection: $toolbarMaterial) {
-                        ForEach(ToolbarMaterial.allCases, id: \.rawValue) { tm in
-                            Text(tm.text).tag(tm.rawValue)
-                        }
-                    }
-                    .frame(height: 36)
-                }
-                
                 Section {
                     ThemeDestinationPicker(themeUserDestination: $themeUserDestination, themeUserDest: themeUserDestination?.0, customizeThemeIsOpen: $customizeThemeIsOpen)
 
@@ -303,43 +291,6 @@ struct AppearanceSettings: View {
     }
 }
 
-enum ToolbarMaterial: String, CaseIterable {
-    case bar
-    case ultraThin
-    case thin
-    case regular
-    case thick
-    case ultraThick
-
-    static func material(_ s: String) -> Material {
-        ToolbarMaterial(rawValue: s)?.material ?? Material.bar
-    }
-
-    static let defaultMaterial: String = ToolbarMaterial.regular.rawValue
-
-    var material: Material {
-        switch self {
-        case .bar: .bar
-        case .ultraThin: .ultraThin
-        case .thin: .thin
-        case .regular: .regular
-        case .thick: .thick
-        case .ultraThick: .ultraThick
-        }
-    }
-    
-    var text: String {
-        switch self {
-        case .bar: "System"
-        case .ultraThin: "Ultra thin"
-        case .thin: "Thin"
-        case .regular: "Regular"
-        case .thick: "Thick"
-        case .ultraThick: "Ultra thick"
-        }
-    }
-}
-
 struct ChatThemePreview: View {
     @EnvironmentObject var theme: AppTheme
     var base: DefaultTheme

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

@@ -13,8 +13,6 @@ struct DeveloperView: View {
     @EnvironmentObject var theme: AppTheme
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @AppStorage(GROUP_DEFAULT_CONFIRM_DB_UPGRADES, store: groupDefaults) private var confirmDatabaseUpgrades = false
-    @State private var hintsUnchanged = hintDefaultsUnchanged()
-
     @Environment(\.colorScheme) var colorScheme
 
     var body: some View {
@@ -35,9 +33,8 @@ struct DeveloperView: View {
                     } label: {
                         settingsRow("terminal", color: theme.colors.secondary) { Text("Chat console") }
                     }
-                    settingsRow("lightbulb.max", color: theme.colors.secondary) {
-                        Button("Reset all hints", action: resetHintDefaults)
-                        .disabled(hintsUnchanged)
+                    settingsRow("internaldrive", color: theme.colors.secondary) {
+                        Toggle("Confirm database upgrades", isOn: $confirmDatabaseUpgrades)
                     }
                     settingsRow("chevron.left.forwardslash.chevron.right", color: theme.colors.secondary) {
                         Toggle("Show developer options", isOn: $developerTools)
@@ -48,34 +45,9 @@ struct DeveloperView: View {
                     ((developerTools ? Text("Show:") : Text("Hide:")) + Text(" ") + Text("Database IDs and Transport isolation option."))
                         .foregroundColor(theme.colors.secondary)
                 }
-                
-                if developerTools {
-                    Section {
-                        settingsRow("internaldrive", color: theme.colors.secondary) {
-                            Toggle("Confirm database upgrades", isOn: $confirmDatabaseUpgrades)
-                        }
-                    } header: {
-                        Text("Developer options")
-                    }
-                }
             }
         }
     }
-    
-    private func resetHintDefaults() {
-        for def in hintDefaults {
-            if let val = appDefaults[def] as? Bool {
-                UserDefaults.standard.set(val, forKey: def)
-            }
-        }
-        hintsUnchanged = true
-    }
-}
-
-private func hintDefaultsUnchanged() -> Bool {
-    hintDefaults.allSatisfy { def in
-        appDefaults[def] as? Bool == UserDefaults.standard.bool(forKey: def)
-    }
 }
 
 struct DeveloperView_Previews: PreviewProvider {

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

@@ -10,10 +10,18 @@ import SwiftUI
 import SimpleXChat
 
 private enum NetworkAlert: Identifiable {
+    case updateOnionHosts(hosts: OnionHosts)
+    case updateSessionMode(mode: TransportSessionMode)
+    case updateSMPProxyMode(proxyMode: SMPProxyMode)
+    case updateSMPProxyFallback(proxyFallback: SMPProxyFallback)
     case error(err: String)
 
     var id: String {
         switch self {
+        case let .updateOnionHosts(hosts): return "updateOnionHosts \(hosts)"
+        case let .updateSessionMode(mode): return "updateSessionMode \(mode)"
+        case let .updateSMPProxyMode(proxyMode): return "updateSMPProxyMode \(proxyMode)"
+        case let .updateSMPProxyFallback(proxyFallback): return "updateSMPProxyFallback \(proxyFallback)"
         case let .error(err): return "error \(err)"
         }
     }
@@ -22,6 +30,16 @@ private enum NetworkAlert: Identifiable {
 struct NetworkAndServers: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
+    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
+    @State private var cfgLoaded = false
+    @State private var currentNetCfg = NetCfg.defaults
+    @State private var netCfg = NetCfg.defaults
+    @State private var onionHosts: OnionHosts = .no
+    @State private var sessionMode: TransportSessionMode = .user
+    @State private var proxyMode: SMPProxyMode = .never
+    @State private var proxyFallback: SMPProxyFallback = .allow
+    @State private var alert: NetworkAlert?
 
     var body: some View {
         VStack {
@@ -32,7 +50,7 @@ struct NetworkAndServers: View {
                             .navigationTitle("Your SMP servers")
                             .modifier(ThemedBackground(grouped: true))
                     } label: {
-                        Text("Message servers")
+                        Text("SMP servers")
                     }
 
                     NavigationLink {
@@ -40,12 +58,24 @@ struct NetworkAndServers: View {
                             .navigationTitle("Your XFTP servers")
                             .modifier(ThemedBackground(grouped: true))
                     } label: {
-                        Text("Media & file servers")
+                        Text("XFTP servers")
+                    }
+
+                    Picker("Use .onion hosts", selection: $onionHosts) {
+                        ForEach(OnionHosts.values, id: \.self) { Text($0.text) }
+                    }
+                    .frame(height: 36)
+
+                    if developerTools {
+                        Picker("Transport isolation", selection: $sessionMode) {
+                            ForEach(TransportSessionMode.values, id: \.self) { Text($0.text) }
+                        }
+                        .frame(height: 36)
                     }
 
                     NavigationLink {
                         AdvancedNetworkSettings()
-                            .navigationTitle("Advanced settings")
+                            .navigationTitle("Network settings")
                             .modifier(ThemedBackground(grouped: true))
                     } label: {
                         Text("Advanced network settings")
@@ -53,6 +83,35 @@ struct NetworkAndServers: View {
                 } header: {
                     Text("Messages & files")
                         .foregroundColor(theme.colors.secondary)
+                } footer: {
+                    Text("Using .onion hosts requires compatible VPN provider.")
+                        .foregroundColor(theme.colors.secondary)
+                }
+
+                Section {
+                    Picker("Private routing", selection: $proxyMode) {
+                        ForEach(SMPProxyMode.values, id: \.self) { Text($0.text) }
+                    }
+                    .frame(height: 36)
+
+                    Picker("Allow downgrade", selection: $proxyFallback) {
+                        ForEach(SMPProxyFallback.values, id: \.self) { Text($0.text) }
+                    }
+                    .disabled(proxyMode == .never)
+                    .frame(height: 36)
+
+                    Toggle("Show message status", isOn: $showSentViaProxy)
+                } header: {
+                    Text("Private message routing")
+                        .foregroundColor(theme.colors.secondary)
+                } footer: {
+                    VStack(alignment: .leading) {
+                        Text("To protect your IP address, private routing uses your SMP servers to deliver messages.")
+                        if showSentViaProxy {
+                            Text("Show → on messages sent via private routing.")
+                        }
+                    }
+                    .foregroundColor(theme.colors.secondary)
                 }
 
                 Section(header: Text("Calls").foregroundColor(theme.colors.secondary)) {
@@ -74,6 +133,147 @@ struct NetworkAndServers: View {
                 }
             }
         }
+        .onAppear {
+            if cfgLoaded { return }
+            cfgLoaded = true
+            currentNetCfg = getNetCfg()
+            resetNetCfgView()
+        }
+        .onChange(of: onionHosts) { hosts in
+            if hosts != OnionHosts(netCfg: currentNetCfg) {
+                alert = .updateOnionHosts(hosts: hosts)
+            }
+        }
+        .onChange(of: sessionMode) { mode in
+            if mode != netCfg.sessionMode {
+                alert = .updateSessionMode(mode: mode)
+            }
+        }
+        .onChange(of: proxyMode) { mode in
+            if mode != netCfg.smpProxyMode {
+                alert = .updateSMPProxyMode(proxyMode: mode)
+            }
+        }
+        .onChange(of: proxyFallback) { fallbackMode in
+            if fallbackMode != netCfg.smpProxyFallback {
+                alert = .updateSMPProxyFallback(proxyFallback: fallbackMode)
+            }
+        }
+        .alert(item: $alert) { a in
+            switch a {
+            case let .updateOnionHosts(hosts):
+                return Alert(
+                    title: Text("Update .onion hosts setting?"),
+                    message: Text(onionHostsInfo(hosts)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
+                    primaryButton: .default(Text("Ok")) {
+                        let (hostMode, requiredHostMode) = hosts.hostMode
+                        netCfg.hostMode = hostMode
+                        netCfg.requiredHostMode = requiredHostMode
+                        saveNetCfg()
+                    },
+                    secondaryButton: .cancel() {
+                        resetNetCfgView()
+                    }
+                )
+            case let .updateSessionMode(mode):
+                return Alert(
+                    title: Text("Update transport isolation mode?"),
+                    message: Text(sessionModeInfo(mode)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
+                    primaryButton: .default(Text("Ok")) {
+                        netCfg.sessionMode = mode
+                        saveNetCfg()
+                    },
+                    secondaryButton: .cancel() {
+                        resetNetCfgView()
+                    }
+                )
+            case let .updateSMPProxyMode(proxyMode):
+                return Alert(
+                    title: Text("Message routing mode"),
+                    message: Text(proxyModeInfo(proxyMode)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
+                    primaryButton: .default(Text("Ok")) {
+                        netCfg.smpProxyMode = proxyMode
+                        saveNetCfg()
+                    },
+                    secondaryButton: .cancel() {
+                        resetNetCfgView()
+                    }
+                )
+            case let .updateSMPProxyFallback(proxyFallback):
+                return Alert(
+                    title: Text("Message routing fallback"),
+                    message: Text(proxyFallbackInfo(proxyFallback)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
+                    primaryButton: .default(Text("Ok")) {
+                        netCfg.smpProxyFallback = proxyFallback
+                        saveNetCfg()
+                    },
+                    secondaryButton: .cancel() {
+                        resetNetCfgView()
+                    }
+                )
+            case let .error(err):
+                return Alert(
+                    title: Text("Error updating settings"),
+                    message: Text(err)
+                )
+            }
+        }
+    }
+
+    private func saveNetCfg() {
+        do {
+            let def = netCfg.hostMode == .onionHost ? NetCfg.proxyDefaults : NetCfg.defaults
+            netCfg.tcpConnectTimeout = def.tcpConnectTimeout
+            netCfg.tcpTimeout = def.tcpTimeout
+            try setNetworkConfig(netCfg)
+            currentNetCfg = netCfg
+            setNetCfg(netCfg)
+        } catch let error {
+            let err = responseError(error)
+            resetNetCfgView()
+            alert = .error(err: err)
+            logger.error("\(err)")
+        }
+    }
+
+    private func resetNetCfgView() {
+        netCfg = currentNetCfg
+        onionHosts = OnionHosts(netCfg: netCfg)
+        sessionMode = netCfg.sessionMode
+        proxyMode = netCfg.smpProxyMode
+        proxyFallback = netCfg.smpProxyFallback
+    }
+
+    private func onionHostsInfo(_ hosts: OnionHosts) -> LocalizedStringKey {
+        switch hosts {
+        case .no: return "Onion hosts will not be used."
+        case .prefer: return "Onion hosts will be used when available. Requires enabling VPN."
+        case .require: return "Onion hosts will be required for connection. Requires enabling VPN."
+        }
+    }
+
+    private func sessionModeInfo(_ mode: TransportSessionMode) -> LocalizedStringKey {
+        switch mode {
+        case .user: return "A separate TCP connection will be used **for each chat profile you have in the app**."
+        case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
+        }
+    }
+    
+    private func proxyModeInfo(_ mode: SMPProxyMode) -> LocalizedStringKey {
+        switch mode {
+        case .always: return "Always use private routing."
+        case .unknown: return "Use private routing with unknown servers."
+        case .unprotected: return "Use private routing with unknown servers when IP address is not protected."
+        case .never: return "Do NOT use private routing."
+        }
+    }
+
+    private func proxyFallbackInfo(_ proxyFallback: SMPProxyFallback) -> LocalizedStringKey {
+        switch proxyFallback {
+        case .allow: return "Send messages directly when your or destination server does not support private routing."
+        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support private routing."
+        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support private routing."
+        }
     }
 }
 

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

@@ -117,7 +117,7 @@ struct PrivacySettings: View {
                                 privacyAcceptImagesGroupDefault.set($0)
                             }
                     }
-                    settingsRow("circle.filled.pattern.diagonalline.rectangle", color: theme.colors.secondary) {
+                    settingsRow("circle.rectangle.filled.pattern.diagonalline", color: theme.colors.secondary) {
                         Picker("Blur media", selection: $privacyMediaBlurRadius) {
                             let values = [0, 12, 24, 48] + ([0, 12, 24, 48].contains(privacyMediaBlurRadius) ? [] : [privacyMediaBlurRadius])
                             ForEach(values, id: \.self) { radius in
@@ -470,7 +470,7 @@ struct SimplexLockView: View {
             }
         }
         .onChange(of: performLA) { performLAToggle in
-            appLocalAuthEnabledGroupDefault.set(performLAToggle)
+            performLAGroupDefault.set(performLAToggle)
             prefLANoticeShown = true
             if performLAToggleReset {
                 performLAToggleReset = false

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

@@ -130,7 +130,7 @@ struct ProtocolServersView: View {
                 showSaveDialog = true
             }
         })
-        .confirmationDialog("Save servers?", isPresented: $showSaveDialog, titleVisibility: .visible) {
+        .confirmationDialog("Save servers?", isPresented: $showSaveDialog) {
             Button("Save") {
                 saveServers()
                 dismiss()

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_ONE_HAND_UI_CARD_SHOWN = "oneHandUICardShown"
-let DEFAULT_TOOLBAR_MATERIAL = "toolbarMaterial"
 let DEFAULT_CONNECT_VIA_LINK_TAB = "connectViaLinkTab"
 let DEFAULT_LIVE_MESSAGE_ALERT_SHOWN = "liveMessageAlertShown"
 let DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE = "showHiddenProfilesNotice"
@@ -63,8 +61,6 @@ let DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS = "deviceNameForRemoteAccess"
 let DEFAULT_CONFIRM_REMOTE_SESSIONS = "confirmRemoteSessions"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST = "connectRemoteViaMulticast"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "connectRemoteViaMulticastAuto"
-let DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE = "showDeleteConversationNotice"
-let DEFAULT_SHOW_DELETE_CONTACT_NOTICE = "showDeleteContactNotice"
 let DEFAULT_SHOW_SENT_VIA_RPOXY = "showSentViaProxy"
 let DEFAULT_SHOW_SUBSCRIPTION_PERCENTAGE = "showSubscriptionPercentage"
 
@@ -98,8 +94,6 @@ let appDefaults: [String: Any] = [
     DEFAULT_DEVELOPER_TOOLS: false,
     DEFAULT_ENCRYPTION_STARTED: false,
     DEFAULT_PROFILE_IMAGE_CORNER_RADIUS: defaultProfileImageCorner,
-    DEFAULT_ONE_HAND_UI_CARD_SHOWN: false,
-    DEFAULT_TOOLBAR_MATERIAL: ToolbarMaterial.defaultMaterial,
     DEFAULT_CONNECT_VIA_LINK_TAB: ConnectViaLinkTab.scan.rawValue,
     DEFAULT_LIVE_MESSAGE_ALERT_SHOWN: false,
     DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE: true,
@@ -110,8 +104,6 @@ let appDefaults: [String: Any] = [
     DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
     DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
     DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
-    DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE: true,
-    DEFAULT_SHOW_DELETE_CONTACT_NOTICE: true,
     DEFAULT_SHOW_SENT_VIA_RPOXY: false,
     DEFAULT_SHOW_SUBSCRIPTION_PERCENTAGE: false,
     ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN: AppSettingsLockScreenCalls.show.rawValue,
@@ -122,18 +114,6 @@ let appDefaults: [String: Any] = [
     DEFAULT_CURRENT_THEME_IDS: "{}"
 ]
 
-// only Bool defaults can be used here,
-// or hintDefaultsUnchanged and resetHintDefaults need to be changed
-let hintDefaults = [
-    DEFAULT_LA_NOTICE_SHOWN,
-    DEFAULT_ONE_HAND_UI_CARD_SHOWN,
-    DEFAULT_LIVE_MESSAGE_ALERT_SHOWN,
-    DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE,
-    DEFAULT_SHOW_MUTE_PROFILE_ALERT,
-    DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE,
-    DEFAULT_SHOW_DELETE_CONTACT_NOTICE
-]
-
 // not used anymore
 enum ConnectViaLinkTab: String {
     case scan
@@ -178,9 +158,6 @@ let onboardingStageDefault = EnumDefault<OnboardingStage>(defaults: UserDefaults
 
 let customDisappearingMessageTimeDefault = IntDefault(defaults: UserDefaults.standard, forKey: DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME)
 
-let showDeleteConversationNoticeDefault = BoolDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE)
-let showDeleteContactNoticeDefault = BoolDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SHOW_DELETE_CONTACT_NOTICE)
-
 let currentThemeDefault = StringDefault(defaults: UserDefaults.standard, forKey: DEFAULT_CURRENT_THEME, withDefault: DefaultTheme.SYSTEM_THEME_NAME)
 let systemDarkThemeDefault = StringDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SYSTEM_DARK_THEME, withDefault: DefaultTheme.DARK.themeName)
 let currentThemeIdsDefault = CodableDefault<[String: String]>(defaults: UserDefaults.standard, forKey: DEFAULT_CURRENT_THEME_IDS, withDefault: [:] )
@@ -188,7 +165,7 @@ let themeOverridesDefault: CodableDefault<[ThemeOverrides]> = CodableDefault(def
 
 func setGroupDefaults() {
     privacyAcceptImagesGroupDefault.set(UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_ACCEPT_IMAGES))
-    appLocalAuthEnabledGroupDefault.set(UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA))
+    performLAGroupDefault.set(UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA))
     privacyLinkPreviewsGroupDefault.set(UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS))
     profileImageCornerRadiusGroupDefault.set(UserDefaults.standard.double(forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS))
 }

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

@@ -39,7 +39,7 @@
       </trans-unit>
       <trans-unit id="!1 colored!" xml:space="preserve" approved="no">
         <source>!1 colored!</source>
-        <target state="translated">! 1 مُلوَّن!</target>
+        <target state="translated">! 1 ملون!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="#secret#" xml:space="preserve" approved="no">
@@ -69,7 +69,7 @@
       </trans-unit>
       <trans-unit id="%@ is not verified" xml:space="preserve" approved="no">
         <source>%@ is not verified</source>
-        <target state="translated">%@ لم يتم التحقق منه</target>
+        <target state="translated">%@ لم يتم التحقق منها</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%@ is verified" xml:space="preserve" approved="no">
@@ -107,9 +107,8 @@
         <target state="translated">%d ثانية</target>
         <note>message ttl</note>
       </trans-unit>
-      <trans-unit id="%d skipped message(s)" xml:space="preserve" approved="no">
+      <trans-unit id="%d skipped message(s)" xml:space="preserve">
         <source>%d skipped message(s)</source>
-        <target state="translated">%d الرسائل المتخطية</target>
         <note>integrity error chat item</note>
       </trans-unit>
       <trans-unit id="%lld" xml:space="preserve" approved="no">
@@ -122,14 +121,12 @@
         <target state="needs-translation">%lld %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld contact(s) selected" xml:space="preserve" approved="no">
+      <trans-unit id="%lld contact(s) selected" xml:space="preserve">
         <source>%lld contact(s) selected</source>
-        <target state="translated">%lld تم اختيار جهات الاتصال</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld file(s) with total size of %@" xml:space="preserve" approved="no">
+      <trans-unit id="%lld file(s) with total size of %@" xml:space="preserve">
         <source>%lld file(s) with total size of %@</source>
-        <target state="translated">%lld الملفات ذات الحجم الإجمالي %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld members" xml:space="preserve" approved="no">
@@ -137,9 +134,8 @@
         <target state="translated">%lld أعضاء</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve" approved="no">
+      <trans-unit id="%lld second(s)" xml:space="preserve">
         <source>%lld second(s)</source>
-        <target state="translated">%lld ثوانى</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lldd" xml:space="preserve" approved="no">
@@ -189,7 +185,7 @@
       </trans-unit>
       <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve" approved="no">
         <source>**Add new contact**: to create your one-time QR Code or link for your contact.</source>
-        <target state="translated">** إضافة جهة اتصال جديدة **: لإنشاء رمز QR لمرة واحدة أو رابط جهة الاتصال الخاصة بكم.</target>
+        <target state="translated">** إضافة جهة اتصال جديدة **: لإنشاء رمز QR لمرة واحدة أو رابط جهة الاتصال الخاصة بك.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve" approved="no">
@@ -199,12 +195,12 @@
       </trans-unit>
       <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve" approved="no">
         <source>**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have.</source>
-        <target state="translated">** المزيد من الخصوصية **: تحققوا من الرسائل الجديدة كل 20 دقيقة. تتم مشاركة رمز الجهاز مع خادم SimpleX Chat ، ولكن ليس عدد جهات الاتصال أو الرسائل لديكم.</target>
+        <target state="translated">** المزيد من الخصوصية **: تحقق من الرسائل الجديدة كل 20 دقيقة. تتم مشاركة رمز الجهاز مع خادم SimpleX Chat ، ولكن ليس عدد جهات الاتصال أو الرسائل لديك.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app)." xml:space="preserve" approved="no">
         <source>**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app).</source>
-        <target state="translated">** الأكثر خصوصية **: لا تستخدم خادم إشعارات SimpleX Chat ، وتحقق من الرسائل بشكل دوري في الخلفية (يعتمد على عدد مرات استخدامكم للتطبيق).</target>
+        <target state="translated">** الأكثر خصوصية **: لا تستخدم خادم إشعارات SimpleX Chat ، وتحقق من الرسائل بشكل دوري في الخلفية (يعتمد على عدد مرات استخدامك للتطبيق).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve" approved="no">
@@ -214,7 +210,7 @@
       </trans-unit>
       <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve" approved="no">
         <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
-        <target state="translated">** يرجى ملاحظة **: لن تتمكنوا من استعادة أو تغيير عبارة المرور إذا فقدتموها.</target>
+        <target state="translated">** يرجى ملاحظة **: لن تتمكن من استعادة أو تغيير عبارة المرور إذا فقدتها.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="**Recommended**: device token and notifications are sent to SimpleX Chat notification server, but not the message content, size or who it is from." xml:space="preserve" approved="no">
@@ -309,7 +305,7 @@
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve" approved="no">
         <source>A separate TCP connection will be used **for each chat profile you have in the app**.</source>
-        <target state="translated">سيتم استخدام اتصال TCP منفصل ** لكل ملف تعريف دردشة لديكم في التطبيق **.</target>
+        <target state="translated">سيتم استخدام اتصال TCP منفصل ** لكل ملف تعريف دردشة لديك في التطبيق **.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each contact and group member**.&#10;**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." xml:space="preserve" approved="no">
@@ -359,29 +355,24 @@
         <source>Accept requests</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Add preset servers" xml:space="preserve" approved="no">
+      <trans-unit id="Add preset servers" xml:space="preserve">
         <source>Add preset servers</source>
-        <target state="translated">إضافة خوادم محددة مسبقا</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Add profile" xml:space="preserve" approved="no">
+      <trans-unit id="Add profile" xml:space="preserve">
         <source>Add profile</source>
-        <target state="translated">إضافة الملف الشخصي</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Add servers by scanning QR codes." xml:space="preserve" approved="no">
+      <trans-unit id="Add servers by scanning QR codes." xml:space="preserve">
         <source>Add servers by scanning QR codes.</source>
-        <target state="translated">إضافة خوادم عن طريق مسح رموز QR.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Add server" xml:space="preserve" approved="no">
+      <trans-unit id="Add server" xml:space="preserve">
         <source>Add server</source>
-        <target state="translated">أضف الخادم</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Add to another device" xml:space="preserve" approved="no">
+      <trans-unit id="Add to another device" xml:space="preserve">
         <source>Add to another device</source>
-        <target state="translated">أضف إلى جهاز آخر</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
@@ -3676,7 +3667,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="## In reply to" xml:space="preserve" approved="no">
         <source>## In reply to</source>
-        <target state="translated">## ردًّا على</target>
+        <target state="translated">## ردًا على</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="%@ and %@ connected" xml:space="preserve" approved="no">
@@ -3684,208 +3675,6 @@ SimpleX servers cannot see your profile.</source>
         <target state="translated">%@ و %@ متصل</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ downloaded" xml:space="preserve" approved="no">
-        <source>%@ downloaded</source>
-        <target state="translated">%@ تم التنزيل</target>
-      </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve" approved="no">
-        <source>%@ and %@</source>
-        <target state="translated">%@ و %@</target>
-      </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve" approved="no">
-        <source>%@ connected</source>
-        <target state="translated">%@ متصل</target>
-      </trans-unit>
-      <trans-unit id="%lld minutes" xml:space="preserve" approved="no">
-        <source>%lld minutes</source>
-        <target state="translated">%lld دقائق</target>
-      </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve" approved="no">
-        <source>%@, %@ and %lld members</source>
-        <target state="translated">%@, %@ و %lld أعضاء</target>
-      </trans-unit>
-      <trans-unit id="%d weeks" xml:space="preserve" approved="no">
-        <source>%d weeks</source>
-        <target state="translated">%d أسابيع</target>
-      </trans-unit>
-      <trans-unit id="%@ uploaded" xml:space="preserve" approved="no">
-        <source>%@ uploaded</source>
-        <target state="translated">%@ تم الرفع</target>
-      </trans-unit>
-      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve" approved="no">
-        <source>%@, %@ and %lld other members connected</source>
-        <target state="translated">%@, %@ و %lld أعضاء آخرين متصلين</target>
-      </trans-unit>
-      <trans-unit id="%lld seconds" xml:space="preserve" approved="no">
-        <source>%lld seconds</source>
-        <target state="translated">%lld ثواني</target>
-      </trans-unit>
-      <trans-unit id="%u messages failed to decrypt." xml:space="preserve" approved="no">
-        <source>%u messages failed to decrypt.</source>
-        <target state="translated">%u فشلت عملية فك تشفير الرسائل.</target>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve" approved="no">
-        <source>%lld messages marked deleted</source>
-        <target state="translated">%lld الرسائل معلمه بالحذف</target>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve" approved="no">
-        <source>%lld messages moderated by %@</source>
-        <target state="translated">%lld رسائل تمت إدارتها بواسطة %@</target>
-      </trans-unit>
-      <trans-unit id="%lld new interface languages" xml:space="preserve" approved="no">
-        <source>%lld new interface languages</source>
-        <target state="translated">%lld لغات واجهة جديدة</target>
-      </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve" approved="no">
-        <source>%lld group events</source>
-        <target state="translated">%lld أحداث المجموعة</target>
-      </trans-unit>
-      <trans-unit id="%lld messages blocked by admin" xml:space="preserve" approved="no">
-        <source>%lld messages blocked by admin</source>
-        <target state="translated">%lld رسائل محظورة بواسطه المسؤول</target>
-      </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve" approved="no">
-        <source>%lld messages blocked</source>
-        <target state="translated">%lld رسائل تم حظرها</target>
-      </trans-unit>
-      <trans-unit id="%u messages skipped." xml:space="preserve" approved="no">
-        <source>%u messages skipped.</source>
-        <target state="translated">%u تم تخطي الرسائل.</target>
-      </trans-unit>
-      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve" approved="no">
-        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
-        <target state="translated">**إضافة جهة اتصال**: لإنشاء رابط دعوة جديد، أو الاتصال عبر الرابط الذي تلقيتوهم.</target>
-      </trans-unit>
-      <trans-unit id="**Create group**: to create a new group." xml:space="preserve" approved="no">
-        <source>**Create group**: to create a new group.</source>
-        <target state="translated">**إنشاء مجموعة**: لإنشاء مجموعة جديدة.</target>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve" approved="no">
-        <source>(this device v%@)</source>
-        <target state="translated">(هذا الجهاز v%@)</target>
-      </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve" approved="no">
-        <source>(new)</source>
-        <target state="translated">(جديد)</target>
-      </trans-unit>
-      <trans-unit id="**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." xml:space="preserve" approved="no">
-        <source>**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection.</source>
-        <target state="translated">**يرجى الملاحظة**: سيؤدي استخدام نفس قاعدة البيانات على جهازين إلى كسر فك تشفير الرسائل من اتصالاتكم كحماية أمنية.</target>
-      </trans-unit>
-      <trans-unit id="A new random profile will be shared." xml:space="preserve" approved="no">
-        <source>A new random profile will be shared.</source>
-        <target state="translated">سيتم مشاركة ملف تعريفي عشوائي جديد.</target>
-      </trans-unit>
-      <trans-unit id="30 seconds" xml:space="preserve" approved="no">
-        <source>30 seconds</source>
-        <target state="translated">30 ثانيه</target>
-      </trans-unit>
-      <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve" approved="no">
-        <source>- more stable message delivery.
-- a bit better groups.
-- and more!</source>
-        <target state="translated">- تسليم رسائل أكثر استقرارًا.
-- مجموعات أفضل قليلاً.
-- والمزيد!</target>
-      </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve" approved="no">
-        <source>0 sec</source>
-        <target state="translated">0 ثانيه</target>
-      </trans-unit>
-      <trans-unit id="1 minute" xml:space="preserve" approved="no">
-        <source>1 minute</source>
-        <target state="translated">1 دقيقة</target>
-      </trans-unit>
-      <trans-unit id="5 minutes" xml:space="preserve" approved="no">
-        <source>5 minutes</source>
-        <target state="translated">5 دقائق</target>
-      </trans-unit>
-      <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve" approved="no">
-        <source>&lt;p&gt;Hi!&lt;/p&gt;
-&lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
-        <target state="translated">&lt;p&gt;مرحبا!&lt;/p&gt;
-&lt;p&gt;&lt;a href="%@"&gt;أتصل بى من خلال SimpleX Chat&lt;/a&gt;&lt;/p&gt;</target>
-      </trans-unit>
-      <trans-unit id="0s" xml:space="preserve" approved="no">
-        <source>0s</source>
-        <target state="translated">0 ث</target>
-      </trans-unit>
-      <trans-unit id="A few more things" xml:space="preserve" approved="no">
-        <source>A few more things</source>
-        <target state="translated">بعض الأشياء الأخرى</target>
-      </trans-unit>
-      <trans-unit id="- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve" approved="no">
-        <source>- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!
-- delivery receipts (up to 20 members).
-- faster and more stable.</source>
-        <target state="translated">- أتصل بـ [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!
-- delivery receipts (up to 20 members).
-- أسرع و أكثر اسْتِقْرارًا.</target>
-      </trans-unit>
-      <trans-unit id="**Warning**: the archive will be removed." xml:space="preserve" approved="no">
-        <source>**Warning**: the archive will be removed.</source>
-        <target state="translated">**تحذير**: سيتم إزالة الأرشيف.</target>
-      </trans-unit>
-      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve" approved="no">
-        <source>- optionally notify deleted contacts.
-- profile names with spaces.
-- and more!</source>
-        <target state="translated">- إخطار جهات الاتصال المحذوفة بشكل اختياري.
-- أسماء الملفات الشخصية مع المسافات.
-- والمزيد!</target>
-      </trans-unit>
-      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve" approved="no">
-        <source>- voice messages up to 5 minutes.
-- custom time to disappear.
-- editing history.</source>
-        <target state="translated">- رسائل صوتية تصل مدتها إلى 5 دقائق.
-- وقت مخصص للاختفاء.
-- تعديل السجل.</target>
-      </trans-unit>
-      <trans-unit id="Add welcome message" xml:space="preserve" approved="no">
-        <source>Add welcome message</source>
-        <target state="translated">إضافة رسالة ترحيب</target>
-      </trans-unit>
-      <trans-unit id="Abort changing address?" xml:space="preserve" approved="no">
-        <source>Abort changing address?</source>
-        <target state="translated">هل تريد إلغاء تغيير العنوان؟</target>
-      </trans-unit>
-      <trans-unit id="Add contact" xml:space="preserve" approved="no">
-        <source>Add contact</source>
-        <target state="translated">إضافة جهة اتصال</target>
-      </trans-unit>
-      <trans-unit id="Abort" xml:space="preserve" approved="no">
-        <source>Abort</source>
-        <target state="translated">إحباط</target>
-      </trans-unit>
-      <trans-unit id="About SimpleX address" xml:space="preserve" approved="no">
-        <source>About SimpleX address</source>
-        <target state="translated">حول عنوان SimpleX</target>
-      </trans-unit>
-      <trans-unit id="Accept connection request?" xml:space="preserve" approved="no">
-        <source>Accept connection request?</source>
-        <target state="translated">قبول طلب الاتصال؟</target>
-      </trans-unit>
-      <trans-unit id="Acknowledged" xml:space="preserve" approved="no">
-        <source>Acknowledged</source>
-        <target state="translated">معترف به</target>
-      </trans-unit>
-      <trans-unit id="Acknowledgement errors" xml:space="preserve" approved="no">
-        <source>Acknowledgement errors</source>
-        <target state="translated">أخطاء الإقرار</target>
-      </trans-unit>
-      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve" approved="no">
-        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
-        <target state="translated">أضف عنوانًا إلى ملفكم الشخصي، حتى تتمكن جهات الاتصال الخاصة بكم من مشاركته مع أشخاص اخرين. سيتم إرسال تحديث الملف الشخصي إلى جهات الاتصال الخاصة بكم.</target>
-      </trans-unit>
-      <trans-unit id="Abort changing address" xml:space="preserve" approved="no">
-        <source>Abort changing address</source>
-        <target state="translated">إحباط تغيير العنوان</target>
-      </trans-unit>
-      <trans-unit id="Active connections" xml:space="preserve" approved="no">
-        <source>Active connections</source>
-        <target state="translated">اتصالات نشطة</target>
-      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="ar" datatype="plaintext">

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

@@ -5316,278 +5316,6 @@ SimpleX servers cannot see your profile.</source>
         <target state="translated">%@ ו-%@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Connect automatically" xml:space="preserve" approved="no">
-        <source>Connect automatically</source>
-        <target state="translated">התבר אוטומטי</target>
-      </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve" approved="no">
-        <source>Create profile</source>
-        <target state="translated">צור פרופיל</target>
-      </trans-unit>
-      <trans-unit id="Created at: %@" xml:space="preserve" approved="no">
-        <source>Created at: %@</source>
-        <target state="translated">נוצר ב:%@</target>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve" approved="no">
-        <source>Desktop devices</source>
-        <target state="translated">מכשירי מחשב</target>
-      </trans-unit>
-      <trans-unit id="Discover via local network" xml:space="preserve" approved="no">
-        <source>Discover via local network</source>
-        <target state="translated">גלה באמצעות הרשת המקומית</target>
-      </trans-unit>
-      <trans-unit id="Forward" xml:space="preserve" approved="no">
-        <source>Forward</source>
-        <target state="translated">העבר</target>
-      </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve" approved="no">
-        <source>Group already exists</source>
-        <target state="translated">קבוצה כבר קיימת</target>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve" approved="no">
-        <source>Connected to desktop</source>
-        <target state="translated">מחובר למחשב</target>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve" approved="no">
-        <source>Group already exists!</source>
-        <target state="translated">קבוצה כבר קיימת!</target>
-      </trans-unit>
-      <trans-unit id="Confirm upload" xml:space="preserve" approved="no">
-        <source>Confirm upload</source>
-        <target state="translated">אשר ההעלאה</target>
-      </trans-unit>
-      <trans-unit id="Block for all" xml:space="preserve" approved="no">
-        <source>Block for all</source>
-        <target state="translated">חסום לכולם</target>
-      </trans-unit>
-      <trans-unit id="Blocked by admin" xml:space="preserve" approved="no">
-        <source>Blocked by admin</source>
-        <target state="translated">נחסם ע"י מנהל</target>
-      </trans-unit>
-      <trans-unit id="Block member for all?" xml:space="preserve" approved="no">
-        <source>Block member for all?</source>
-        <target state="translated">לחסום את החבר לכולם?</target>
-      </trans-unit>
-      <trans-unit id="Camera not available" xml:space="preserve" approved="no">
-        <source>Camera not available</source>
-        <target state="translated">מצלמה לא זמינה</target>
-      </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve" approved="no">
-        <source>Connect to desktop</source>
-        <target state="translated">חבר למחשב</target>
-      </trans-unit>
-      <trans-unit id="Created at" xml:space="preserve" approved="no">
-        <source>Created at</source>
-        <target state="translated">נוצר ב</target>
-      </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve" approved="no">
-        <source>(new)</source>
-        <target state="translated">(חדש)</target>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve" approved="no">
-        <source>Block member</source>
-        <target state="translated">חבר חסום</target>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve" approved="no">
-        <source>Block member?</source>
-        <target state="translated">לחסום חבר?</target>
-      </trans-unit>
-      <trans-unit id="Creating link…" xml:space="preserve" approved="no">
-        <source>Creating link…</source>
-        <target state="translated">יוצר קישור…</target>
-      </trans-unit>
-      <trans-unit id="Files" xml:space="preserve" approved="no">
-        <source>Files</source>
-        <target state="translated">קבצים</target>
-      </trans-unit>
-      <trans-unit id="Disabled" xml:space="preserve" approved="no">
-        <source>Disabled</source>
-        <target state="translated">מושבת</target>
-      </trans-unit>
-      <trans-unit id="Enter passphrase" xml:space="preserve" approved="no">
-        <source>Enter passphrase</source>
-        <target state="translated">הכנס סיסמא</target>
-      </trans-unit>
-      <trans-unit id="Apply" xml:space="preserve" approved="no">
-        <source>Apply</source>
-        <target state="translated">החל</target>
-      </trans-unit>
-      <trans-unit id="Apply to" xml:space="preserve" approved="no">
-        <source>Apply to</source>
-        <target state="translated">החל ל</target>
-      </trans-unit>
-      <trans-unit id="Background" xml:space="preserve" approved="no">
-        <source>Background</source>
-        <target state="translated">ברקע</target>
-      </trans-unit>
-      <trans-unit id="Black" xml:space="preserve" approved="no">
-        <source>Black</source>
-        <target state="translated">שחור</target>
-      </trans-unit>
-      <trans-unit id="Blur media" xml:space="preserve" approved="no">
-        <source>Blur media</source>
-        <target state="translated">טשטש מדיה</target>
-      </trans-unit>
-      <trans-unit id="Chat theme" xml:space="preserve" approved="no">
-        <source>Chat theme</source>
-        <target state="translated">צבע ערכת נושא</target>
-      </trans-unit>
-      <trans-unit id="Completed" xml:space="preserve" approved="no">
-        <source>Completed</source>
-        <target state="translated">הושלם</target>
-      </trans-unit>
-      <trans-unit id="Connected" xml:space="preserve" approved="no">
-        <source>Connected</source>
-        <target state="translated">מחובר</target>
-      </trans-unit>
-      <trans-unit id="Connection notifications" xml:space="preserve" approved="no">
-        <source>Connection notifications</source>
-        <target state="translated">התראות חיבור</target>
-      </trans-unit>
-      <trans-unit id="Connections" xml:space="preserve" approved="no">
-        <source>Connections</source>
-        <target state="translated">חיבורים</target>
-      </trans-unit>
-      <trans-unit id="Current profile" xml:space="preserve" approved="no">
-        <source>Current profile</source>
-        <target state="translated">פרופיל נוכחי</target>
-      </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve" approved="no">
-        <source>Disconnect desktop?</source>
-        <target state="translated">להתנתק מהמחשב?</target>
-      </trans-unit>
-      <trans-unit id="Discover and join groups" xml:space="preserve" approved="no">
-        <source>Discover and join groups</source>
-        <target state="translated">גלה והצטרף לקבוצות</target>
-      </trans-unit>
-      <trans-unit id="Enabled" xml:space="preserve" approved="no">
-        <source>Enabled</source>
-        <target state="translated">מופעל</target>
-      </trans-unit>
-      <trans-unit id="Error opening chat" xml:space="preserve" approved="no">
-        <source>Error opening chat</source>
-        <target state="translated">שגיאה בפתיחת הצ'אט</target>
-      </trans-unit>
-      <trans-unit id="Good morning!" xml:space="preserve" approved="no">
-        <source>Good morning!</source>
-        <target state="translated">בוקר טוב!</target>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve" approved="no">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <target state="translated">להתחבר אליך?
-זו כתובת הSimpleX שלך!</target>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve" approved="no">
-        <source>Connect to yourself?</source>
-        <target state="translated">להתחבר אליך?</target>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve" approved="no">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <target state="translated">להתחבר אליך?
-זו כתובת ההזמנה החד-פעמי שלך!</target>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve" approved="no">
-        <source>Connected desktop</source>
-        <target state="translated">מחשב מחובר</target>
-      </trans-unit>
-      <trans-unit id="Connected servers" xml:space="preserve" approved="no">
-        <source>Connected servers</source>
-        <target state="translated">שרתים מחוברים</target>
-      </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve" approved="no">
-        <source>Enter group name…</source>
-        <target state="translated">הכנס שם לקבוצה…</target>
-      </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve" approved="no">
-        <source>Enter this device name…</source>
-        <target state="translated">הכנס שם למכשיר הזה…</target>
-      </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve" approved="no">
-        <source>Enter your name…</source>
-        <target state="translated">הכנס את השם שלך…</target>
-      </trans-unit>
-      <trans-unit id="Error decrypting file" xml:space="preserve" approved="no">
-        <source>Error decrypting file</source>
-        <target state="translated">שגיאה בפענוח הקובץ</target>
-      </trans-unit>
-      <trans-unit id="Errors" xml:space="preserve" approved="no">
-        <source>Errors</source>
-        <target state="translated">שגיאות</target>
-      </trans-unit>
-      <trans-unit id="File status" xml:space="preserve" approved="no">
-        <source>File status</source>
-        <target state="translated">מצב הקובץ</target>
-      </trans-unit>
-      <trans-unit id="Connecting" xml:space="preserve" approved="no">
-        <source>Connecting</source>
-        <target state="translated">מתחבר</target>
-      </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve" approved="no">
-        <source>Connecting to desktop</source>
-        <target state="translated">מתחבר למחשב</target>
-      </trans-unit>
-      <trans-unit id="Deleted" xml:space="preserve" approved="no">
-        <source>Deleted</source>
-        <target state="translated">נמחק</target>
-      </trans-unit>
-      <trans-unit id="Deletion errors" xml:space="preserve" approved="no">
-        <source>Deletion errors</source>
-        <target state="translated">שגיאות במחיקה</target>
-      </trans-unit>
-      <trans-unit id="Details" xml:space="preserve" approved="no">
-        <source>Details</source>
-        <target state="translated">פרטים</target>
-      </trans-unit>
-      <trans-unit id="Forwarded" xml:space="preserve" approved="no">
-        <source>Forwarded</source>
-        <target state="translated">הועבר</target>
-      </trans-unit>
-      <trans-unit id="Found desktop" xml:space="preserve" approved="no">
-        <source>Found desktop</source>
-        <target state="translated">נמצא מחשב</target>
-      </trans-unit>
-      <trans-unit id="Good afternoon!" xml:space="preserve" approved="no">
-        <source>Good afternoon!</source>
-        <target state="translated">אחר צהריים טובים!</target>
-      </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve" approved="no">
-        <source>Desktop address</source>
-        <target state="translated">כתובת מחשב</target>
-      </trans-unit>
-      <trans-unit id="Forwarded from" xml:space="preserve" approved="no">
-        <source>Forwarded from</source>
-        <target state="translated">הועבר מ</target>
-      </trans-unit>
-      <trans-unit id="History is not sent to new members." xml:space="preserve" approved="no">
-        <source>History is not sent to new members.</source>
-        <target state="translated">היסטוריה לא נשלחת לחברים חדשים.</target>
-      </trans-unit>
-      <trans-unit id="Created" xml:space="preserve" approved="no">
-        <source>Created</source>
-        <target state="translated">נוצר</target>
-      </trans-unit>
-      <trans-unit id="Copy error" xml:space="preserve" approved="no">
-        <source>Copy error</source>
-        <target state="translated">שגיאת העתקה</target>
-      </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve" approved="no">
-        <source>Create group</source>
-        <target state="translated">צור קבוצה</target>
-      </trans-unit>
-      <trans-unit id="Enabled for" xml:space="preserve" approved="no">
-        <source>Enabled for</source>
-        <target state="translated">מופעל עבור</target>
-      </trans-unit>
-      <trans-unit id="Error creating message" xml:space="preserve" approved="no">
-        <source>Error creating message</source>
-        <target state="translated">שגיאה ביצירת הודעה</target>
-      </trans-unit>
-      <trans-unit id="File error" xml:space="preserve" approved="no">
-        <source>File error</source>
-        <target state="translated">שגיאה בקובץ</target>
-      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="he" datatype="plaintext">

apps/ios/SimpleX SE/ShareModel.swift

@@ -19,17 +19,16 @@ private let MAX_DOWNSAMPLE_SIZE: Int64 = 2000
 
 class ShareModel: ObservableObject {
     @Published var sharedContent: SharedContent?
-    @Published var chats: [ChatData] = []
-    @Published var profileImages: [ChatInfo.ID: UIImage] = [:]
-    @Published var search = ""
-    @Published var comment = ""
+    @Published var chats = Array<ChatData>()
+    @Published var profileImages = Dictionary<ChatInfo.ID, UIImage>()
+    @Published var search = String()
+    @Published var comment = String()
     @Published var selected: ChatData?
     @Published var isLoaded = false
     @Published var bottomBar: BottomBar = .loadingSpinner
     @Published var errorAlert: ErrorAlert?
     @Published var hasSimplexLink = false
     @Published var alertRequiresPassword = false
-    var networkTimeout = CFAbsoluteTimeGetCurrent()
 
     enum BottomBar {
         case sendButton
@@ -52,13 +51,6 @@ class ShareModel: ObservableObject {
     private var itemProvider: NSItemProvider?
 
     var isSendDisbled: Bool { sharedContent == nil || selected == nil || isProhibited(selected) }
-    
-    var isLinkPreview: Bool {
-        switch sharedContent {
-        case .url: true
-        default: false
-        }
-    }
 
     func isProhibited(_ chat: ChatData?) -> Bool {
         if let chat, let sharedContent {
@@ -66,7 +58,7 @@ class ShareModel: ObservableObject {
         } else { false }
     }
 
-    var filteredChats: [ChatData] {
+    var filteredChats: Array<ChatData> {
         search.isEmpty
         ? filterChatsToForwardTo(chats: chats)
         : filterChatsToForwardTo(chats: chats)
@@ -74,7 +66,7 @@ class ShareModel: ObservableObject {
     }
 
     func setup(context: NSExtensionContext) {
-        if appLocalAuthEnabledGroupDefault.get() && !allowShareExtensionGroupDefault.get() {
+        if performLAGroupDefault.get() && !allowShareExtensionGroupDefault.get() {
             errorAlert = ErrorAlert(title: "App is locked!", message: "You can allow sharing in Privacy & Security / SimpleX Lock settings.")
             return
         }
@@ -119,7 +111,7 @@ class ShareModel: ObservableObject {
                 }
                 // Process Attachment
                 Task {
-                    switch await getSharedContent(self.itemProvider!) {
+                    switch await self.itemProvider!.sharedContent() {
                     case let .success(chatItemContent):
                         await MainActor.run {
                             self.sharedContent = chatItemContent
@@ -149,7 +141,7 @@ class ShareModel: ObservableObject {
                     if selected.chatInfo.chatType == .local {
                         completion()
                     } else {
-                        await MainActor.run { self.bottomBar = .loadingBar(progress: 0) }
+                        await MainActor.run { self.bottomBar = .loadingBar(progress: .zero) }
                         if let e = await handleEvents(
                             isGroupChat: ci.chatInfo.chatType == .group,
                             isWithoutFile: sharedContent.cryptoFile == nil,
@@ -291,13 +283,14 @@ class ShareModel: ObservableObject {
         CompletionHandler.isEventLoopEnabled = true
         let ch = CompletionHandler()
         if isWithoutFile { await ch.completeFile() }
-        networkTimeout = CFAbsoluteTimeGetCurrent()
+        var networkTimeout = CFAbsoluteTimeGetCurrent()
         while await ch.isRunning {
             if CFAbsoluteTimeGetCurrent() - networkTimeout > 30 {
+                networkTimeout = CFAbsoluteTimeGetCurrent()
                 await MainActor.run {
-                    self.errorAlert = ErrorAlert(title: "Slow network?", message: "Sending a message takes longer than expected.") {
-                        Button("Wait", role: .cancel) { self.networkTimeout = CFAbsoluteTimeGetCurrent() }
-                        Button("Cancel", role: .destructive) { self.completion() }
+                    self.errorAlert = ErrorAlert(title: "No network connection") {
+                        Button("Keep Trying", role: .cancel) {  }
+                        Button("Dismiss Sheet", role: .destructive) { self.completion() }
                     }
                 }
             }
@@ -388,7 +381,7 @@ enum SharedContent {
         switch self {
         case let .image(preview, _): .image(text: comment, image: preview)
         case let .movie(preview, duration, _): .video(text: comment, image: preview, duration: duration)
-        case let .url(preview): .link(text: preview.uri.absoluteString + (comment == "" ? "" : "\n" + comment), preview: preview)
+        case let .url(preview): .link(text: comment, preview: preview)
         case .text: .text(comment)
         case .data: .file(comment)
         }
@@ -403,89 +396,91 @@ enum SharedContent {
     }
 }
 
-fileprivate func getSharedContent(_ ip: NSItemProvider) async -> Result<SharedContent, ErrorAlert> {
-    if let type = firstMatching(of: [.image, .movie, .fileURL, .url, .text]) {
-        switch type {
-            // Prepare Image message
-        case .image:
-            // Animated
-            return if ip.hasItemConformingToTypeIdentifier(UTType.gif.identifier) {
+extension NSItemProvider {
+    fileprivate func sharedContent() async -> Result<SharedContent, ErrorAlert> {
+        if let type = firstMatching(of: [.image, .movie, .fileURL, .url, .text]) {
+            switch type {
+                // Prepare Image message
+            case .image:
+
+                // Animated
+                return if hasItemConformingToTypeIdentifier(UTType.gif.identifier) {
+                    if let url = try? await inPlaceUrl(type: type),
+                       let data = try? Data(contentsOf: url),
+                       let image = UIImage(data: data),
+                       let cryptoFile = saveFile(data, generateNewFileName("IMG", "gif"), encrypted: privacyEncryptLocalFilesGroupDefault.get()),
+                       let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
+                        .success(.image(preview: preview, cryptoFile: cryptoFile))
+                    } else { .failure(ErrorAlert("Error preparing message")) }
+
+                // Static
+                } else {
+                    if let image = await staticImage(),
+                       let cryptoFile = saveImage(image),
+                       let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
+                        .success(.image(preview: preview, cryptoFile: cryptoFile))
+                    } else { .failure(ErrorAlert("Error preparing message")) }
+                }
+
+            // Prepare Movie message
+            case .movie:
                 if let url = try? await inPlaceUrl(type: type),
-                   let data = try? Data(contentsOf: url),
-                   let image = UIImage(data: data),
-                   let cryptoFile = saveFile(data, generateNewFileName("IMG", "gif"), encrypted: privacyEncryptLocalFilesGroupDefault.get()),
-                   let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
-                    .success(.image(preview: preview, cryptoFile: cryptoFile))
-                } else { .failure(ErrorAlert("Error preparing message")) }
+                   let trancodedUrl = await transcodeVideo(from: url),
+                   let (image, duration) = AVAsset(url: trancodedUrl).generatePreview(),
+                   let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE),
+                   let cryptoFile = moveTempFileFromURL(trancodedUrl) {
+                    try? FileManager.default.removeItem(at: trancodedUrl)
+                    return .success(.movie(preview: preview, duration: duration, cryptoFile: cryptoFile))
+                } else { return .failure(ErrorAlert("Error preparing message")) }
 
-            // Static
-            } else {
-                if let image = await staticImage(),
-                   let cryptoFile = saveImage(image),
-                   let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
-                    .success(.image(preview: preview, cryptoFile: cryptoFile))
-                } else { .failure(ErrorAlert("Error preparing message")) }
-            }
-
-        // Prepare Movie message
-        case .movie:
-            if let url = try? await inPlaceUrl(type: type),
-               let trancodedUrl = await transcodeVideo(from: url),
-               let (image, duration) = AVAsset(url: trancodedUrl).generatePreview(),
-               let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE),
-               let cryptoFile = moveTempFileFromURL(trancodedUrl) {
-                try? FileManager.default.removeItem(at: trancodedUrl)
-                return .success(.movie(preview: preview, duration: duration, cryptoFile: cryptoFile))
-            } else { return .failure(ErrorAlert("Error preparing message")) }
-
-        // Prepare Data message
-        case .fileURL:
-            if let url = try? await inPlaceUrl(type: .data) {
-                if isFileTooLarge(for: url) {
-                    let sizeString = ByteCountFormatter.string(
-                        fromByteCount: Int64(getMaxFileSize(.xftp)),
-                        countStyle: .binary
-                    )
-                    return .failure(
-                        ErrorAlert(
-                            title: "Large file!",
-                            message: "Currently maximum supported file size is \(sizeString)."
+            // Prepare Data message
+            case .fileURL:
+                if let url = try? await inPlaceUrl(type: .data) {
+                    if isFileTooLarge(for: url) {
+                        let sizeString = ByteCountFormatter.string(
+                            fromByteCount: Int64(getMaxFileSize(.xftp)),
+                            countStyle: .binary
+                        )
+                        return .failure(
+                            ErrorAlert(
+                                title: "Large file!",
+                                message: "Currently maximum supported file size is \(sizeString)."
+                            )
                         )
-                    )
-                }
-                if let file = saveFileFromURL(url) {
-                    return .success(.data(cryptoFile: file))
-                }
-            }
-            return .failure(ErrorAlert("Error preparing file"))
-
-        // Prepare Link message
-        case .url:
-            if let url = try? await ip.loadItem(forTypeIdentifier: type.identifier) as? URL {
-                let content: SharedContent =
-                    if privacyLinkPreviewsGroupDefault.get(), let linkPreview = await getLinkPreview(for: url) {
-                        .url(preview: linkPreview)
-                    } else {
-                        .text(string: url.absoluteString)
                     }
-                return .success(content)
-            } else { return .failure(ErrorAlert("Error preparing message")) }
+                    if let file = saveFileFromURL(url) {
+                        return .success(.data(cryptoFile: file))
+                    }
+                }
+                return .failure(ErrorAlert("Error preparing file"))
 
-        // Prepare Text message
-        case .text:
-            return if let text = try? await ip.loadItem(forTypeIdentifier: type.identifier) as? String {
-                .success(.text(string: text))
-            } else { .failure(ErrorAlert("Error preparing message")) }
-        default: return .failure(ErrorAlert("Unsupported format"))
+            // Prepare Link message
+            case .url:
+                if let url = try? await loadItem(forTypeIdentifier: type.identifier) as? URL {
+                    let content: SharedContent =
+                        if privacyLinkPreviewsGroupDefault.get(), let linkPreview = await getLinkPreview(for: url) {
+                            .url(preview: linkPreview)
+                        } else {
+                            .text(string: url.absoluteString)
+                        }
+                    return .success(content)
+                } else { return .failure(ErrorAlert("Error preparing message")) }
+
+            // Prepare Text message
+            case .text:
+                return if let text = try? await loadItem(forTypeIdentifier: type.identifier) as? String {
+                    .success(.text(string: text))
+                } else { .failure(ErrorAlert("Error preparing message")) }
+            default: return .failure(ErrorAlert("Unsupported format"))
+            }
+        } else {
+            return .failure(ErrorAlert("Unsupported format"))
         }
-    } else {
-        return .failure(ErrorAlert("Unsupported format"))
     }
 
-
-    func inPlaceUrl(type: UTType) async throws -> URL {
+    private func inPlaceUrl(type: UTType) async throws -> URL {
         try await withCheckedThrowingContinuation { cont in
-            let _ = ip.loadInPlaceFileRepresentation(forTypeIdentifier: type.identifier) { url, bool, error in
+            let _ = loadInPlaceFileRepresentation(forTypeIdentifier: type.identifier) { url, bool, error in
                 if let url = url {
                     cont.resume(returning: url)
                 } else if let error = error {
@@ -497,21 +492,21 @@ fileprivate func getSharedContent(_ ip: NSItemProvider) async -> Result<SharedCo
         }
     }
 
-    func firstMatching(of types: Array<UTType>) -> UTType? {
+    private func firstMatching(of types: Array<UTType>) -> UTType? {
         for type in types {
-            if ip.hasItemConformingToTypeIdentifier(type.identifier) { return type }
+            if hasItemConformingToTypeIdentifier(type.identifier) { return type }
         }
         return nil
     }
 
-    func staticImage() async -> UIImage? {
+    private func staticImage() async -> UIImage? {
         if let url = try? await inPlaceUrl(type: .image),
            let downsampledImage = downsampleImage(at: url, to: MAX_DOWNSAMPLE_SIZE) {
             downsampledImage
         } else {
             /// Fallback to loading image directly from `ItemProvider`
             /// in case loading from disk is not possible. Required for sharing screenshots.
-            try? await ip.loadItem(forTypeIdentifier: UTType.image.identifier) as? UIImage
+            try? await loadItem(forTypeIdentifier: UTType.image.identifier) as? UIImage
         }
     }
 }

apps/ios/SimpleX SE/ShareView.swift

@@ -85,7 +85,7 @@ struct ShareView: View {
     }
 
     private func compose(isLoading: Bool) -> some View {
-        VStack(spacing: 0) {
+        VStack(spacing: .zero) {
             Divider()
             if let content = model.sharedContent  {
                itemPreview(content)
@@ -132,7 +132,7 @@ struct ShareView: View {
         switch content {
         case let .image(preview, _): imagePreview(preview)
         case let .movie(preview, _, _): imagePreview(preview)
-        case let .url(preview): linkPreview(preview)
+        case let .url(linkPreview): imagePreview(linkPreview.image)
         case let .data(cryptoFile):
             previewArea {
                 Image(systemName: "doc.fill")
@@ -160,29 +160,6 @@ struct ShareView: View {
         }
     }
 
-    @ViewBuilder private func linkPreview(_ linkPreview: LinkPreview) -> some View {
-        previewArea {
-            HStack(alignment: .center, spacing: 8) {
-                if let uiImage = UIImage(base64Encoded: linkPreview.image) {
-                    Image(uiImage: uiImage)
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .frame(maxWidth: 80, maxHeight: 60)
-                }
-                VStack(alignment: .center, spacing: 4) {
-                    Text(linkPreview.title)
-                        .lineLimit(1)
-                    Text(linkPreview.uri.absoluteString)
-                        .font(.caption)
-                        .lineLimit(1)
-                        .foregroundColor(.secondary)
-                }
-                .padding(.vertical, 5)
-                .frame(maxWidth: .infinity, minHeight: 60)
-            }
-        }
-    }
-
     @ViewBuilder private func previewArea<V: View>(@ViewBuilder content: @escaping () -> V) -> some View {
         HStack(alignment: .center, spacing: 8) {
             content()
@@ -202,7 +179,7 @@ struct ShareView: View {
 
     private func loadingBar(progress: Double) -> some View {
         VStack {
-            Text("Sending message…")
+            Text("Sending File")
             ProgressView(value: progress)
         }
         .padding()

apps/ios/SimpleX SE/de.lproj/InfoPlist.strings

@@ -1,9 +1,7 @@
-/* Bundle display name */
-"CFBundleDisplayName" = "SimpleX SE";
-
-/* Bundle name */
-"CFBundleName" = "SimpleX SE";
-
-/* Copyright (human-readable) */
-"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Alle Rechte vorbehalten.";
+/* 
+  InfoPlist.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/de.lproj/Localizable.strings

@@ -1,111 +1,7 @@
-/* No comment provided by engineer. */
-"%@" = "%@";
-
-/* No comment provided by engineer. */
-"App is locked!" = "Die App ist gesperrt!";
-
-/* No comment provided by engineer. */
-"Cancel" = "Abbrechen";
-
-/* No comment provided by engineer. */
-"Cannot access keychain to save database password" = "Es ist nicht möglich, auf den Schlüsselbund zuzugreifen, um das Datenbankpasswort zu speichern";
-
-/* No comment provided by engineer. */
-"Cannot forward message" = "Nachricht kann nicht weitergeleitet werden";
-
-/* No comment provided by engineer. */
-"Comment" = "Kommentieren";
-
-/* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "Die maximale erlaubte Dateigröße beträgt aktuell %@.";
-
-/* No comment provided by engineer. */
-"Database downgrade required" = "Datenbank-Herabstufung erforderlich";
-
-/* No comment provided by engineer. */
-"Database encrypted!" = "Datenbank verschlüsselt!";
-
-/* No comment provided by engineer. */
-"Database error" = "Datenbankfehler";
-
-/* No comment provided by engineer. */
-"Database passphrase is different from saved in the keychain." = "Das Datenbank-Passwort unterscheidet sich vom im Schlüsselbund gespeicherten.";
-
-/* No comment provided by engineer. */
-"Database passphrase is required to open chat." = "Ein Datenbank-Passwort ist erforderlich, um den Chat zu öffnen.";
-
-/* No comment provided by engineer. */
-"Database upgrade required" = "Datenbank-Aktualisierung erforderlich";
-
-/* No comment provided by engineer. */
-"Error preparing file" = "Fehler beim Vorbereiten der Datei";
-
-/* No comment provided by engineer. */
-"Error preparing message" = "Fehler beim Vorbereiten der Nachricht";
-
-/* No comment provided by engineer. */
-"Error: %@" = "Fehler: %@";
-
-/* No comment provided by engineer. */
-"File error" = "Dateifehler";
-
-/* No comment provided by engineer. */
-"Incompatible database version" = "Datenbank-Version nicht kompatibel";
-
-/* No comment provided by engineer. */
-"Invalid migration confirmation" = "Migrations-Bestätigung ungültig";
-
-/* No comment provided by engineer. */
-"Keychain error" = "Schlüsselbund-Fehler";
-
-/* No comment provided by engineer. */
-"Large file!" = "Große Datei!";
-
-/* No comment provided by engineer. */
-"No active profile" = "Kein aktives Profil";
-
-/* No comment provided by engineer. */
-"Ok" = "OK";
-
-/* No comment provided by engineer. */
-"Open the app to downgrade the database." = "Öffne die App, um die Datenbank herabzustufen.";
-
-/* No comment provided by engineer. */
-"Open the app to upgrade the database." = "Öffne die App, um die Datenbank zu aktualisieren.";
-
-/* No comment provided by engineer. */
-"Passphrase" = "Passwort";
-
-/* No comment provided by engineer. */
-"Please create a profile in the SimpleX app" = "Bitte erstelle ein Profil in der SimpleX-App";
-
-/* No comment provided by engineer. */
-"Selected chat preferences prohibit this message." = "Diese Nachricht ist wegen der gewählten Chat-Einstellungen nicht erlaubt.";
-
-/* No comment provided by engineer. */
-"Sending a message takes longer than expected." = "Das Senden einer Nachricht dauert länger als erwartet.";
-
-/* No comment provided by engineer. */
-"Sending message…" = "Nachricht wird gesendet…";
-
-/* No comment provided by engineer. */
-"Share" = "Teilen";
-
-/* No comment provided by engineer. */
-"Slow network?" = "Langsames Netzwerk?";
-
-/* No comment provided by engineer. */
-"Unknown database error: %@" = "Unbekannter Datenbankfehler: %@";
-
-/* No comment provided by engineer. */
-"Unsupported format" = "Nicht unterstütztes Format";
-
-/* No comment provided by engineer. */
-"Wait" = "Warten";
-
-/* No comment provided by engineer. */
-"Wrong database passphrase" = "Falsches Datenbank-Passwort";
-
-/* No comment provided by engineer. */
-"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Du kannst das Teilen in den Einstellungen zu Datenschutz & Sicherheit - SimpleX-Sperre erlauben.";
+/* 
+  Localizable.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/es.lproj/InfoPlist.strings

@@ -1,9 +1,7 @@
-/* Bundle display name */
-"CFBundleDisplayName" = "SimpleX SE";
-
-/* Bundle name */
-"CFBundleName" = "SimpleX SE";
-
-/* Copyright (human-readable) */
-"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Todos los derechos reservados.";
+/* 
+  InfoPlist.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/es.lproj/Localizable.strings

@@ -1,111 +1,7 @@
-/* No comment provided by engineer. */
-"%@" = "%@";
-
-/* No comment provided by engineer. */
-"App is locked!" = "¡Aplicación bloqueada!";
-
-/* No comment provided by engineer. */
-"Cancel" = "Cancelar";
-
-/* No comment provided by engineer. */
-"Cannot access keychain to save database password" = "Keychain inaccesible para guardar la contraseña de la base de datos";
-
-/* No comment provided by engineer. */
-"Cannot forward message" = "No se puede reenviar el mensaje";
-
-/* No comment provided by engineer. */
-"Comment" = "Comentario";
-
-/* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "El tamaño máximo de archivo admitido es %@.";
-
-/* No comment provided by engineer. */
-"Database downgrade required" = "Se requiere volver a versión anterior de la base de datos";
-
-/* No comment provided by engineer. */
-"Database encrypted!" = "¡Base de datos cifrada!";
-
-/* No comment provided by engineer. */
-"Database error" = "Error en base de datos";
-
-/* No comment provided by engineer. */
-"Database passphrase is different from saved in the keychain." = "La contraseña de la base de datos es distinta a la almacenada en keychain.";
-
-/* No comment provided by engineer. */
-"Database passphrase is required to open chat." = "Se requiere la contraseña de la base de datos para abrir la aplicación.";
-
-/* No comment provided by engineer. */
-"Database upgrade required" = "Se requiere actualizar la base de datos";
-
-/* No comment provided by engineer. */
-"Error preparing file" = "Error al preparar el archivo";
-
-/* No comment provided by engineer. */
-"Error preparing message" = "Error al preparar el mensaje";
-
-/* No comment provided by engineer. */
-"Error: %@" = "Error: %@";
-
-/* No comment provided by engineer. */
-"File error" = "Error de archivo";
-
-/* No comment provided by engineer. */
-"Incompatible database version" = "Versión de base de datos incompatible";
-
-/* No comment provided by engineer. */
-"Invalid migration confirmation" = "Confirmación de migración no válida";
-
-/* No comment provided by engineer. */
-"Keychain error" = "Error en keychain";
-
-/* No comment provided by engineer. */
-"Large file!" = "¡Archivo grande!";
-
-/* No comment provided by engineer. */
-"No active profile" = "Ningún perfil activo";
-
-/* No comment provided by engineer. */
-"Ok" = "Ok";
-
-/* No comment provided by engineer. */
-"Open the app to downgrade the database." = "Abre la aplicación para volver a versión anterior de la base de datos.";
-
-/* No comment provided by engineer. */
-"Open the app to upgrade the database." = "Abre la aplicación para actualizar la base de datos.";
-
-/* No comment provided by engineer. */
-"Passphrase" = "Frase de contraseña";
-
-/* No comment provided by engineer. */
-"Please create a profile in the SimpleX app" = "Por favor, crea un perfil en SimpleX";
-
-/* No comment provided by engineer. */
-"Selected chat preferences prohibit this message." = "Las preferencias seleccionadas no permiten este mensaje.";
-
-/* No comment provided by engineer. */
-"Sending a message takes longer than expected." = "Enviar el mensaje lleva más tiempo del esperado.";
-
-/* No comment provided by engineer. */
-"Sending message…" = "Enviando mensaje…";
-
-/* No comment provided by engineer. */
-"Share" = "Compartir";
-
-/* No comment provided by engineer. */
-"Slow network?" = "¿Red lenta?";
-
-/* No comment provided by engineer. */
-"Unknown database error: %@" = "Error desconocido en la base de datos: %@";
-
-/* No comment provided by engineer. */
-"Unsupported format" = "Formato sin soporte";
-
-/* No comment provided by engineer. */
-"Wait" = "Espera";
-
-/* No comment provided by engineer. */
-"Wrong database passphrase" = "Contraseña incorrecta de la base de datos";
-
-/* No comment provided by engineer. */
-"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Puedes dar permiso para compartir en Privacidad y Seguridad / Bloque SimpleX.";
+/* 
+  Localizable.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/fr.lproj/InfoPlist.strings

@@ -1,9 +1,7 @@
-/* Bundle display name */
-"CFBundleDisplayName" = "SimpleX SE";
-
-/* Bundle name */
-"CFBundleName" = "SimpleX SE";
-
-/* Copyright (human-readable) */
-"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Tous droits réservés.";
+/* 
+  InfoPlist.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/fr.lproj/Localizable.strings

@@ -1,111 +1,7 @@
-/* No comment provided by engineer. */
-"%@" = "%@";
-
-/* No comment provided by engineer. */
-"App is locked!" = "L'app est verrouillée !";
-
-/* No comment provided by engineer. */
-"Cancel" = "Annuler";
-
-/* No comment provided by engineer. */
-"Cannot access keychain to save database password" = "Impossible d'accéder à la keychain pour enregistrer le mot de passe de la base de données";
-
-/* No comment provided by engineer. */
-"Cannot forward message" = "Impossible de transférer le message";
-
-/* No comment provided by engineer. */
-"Comment" = "Commenter";
-
-/* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "Actuellement, la taille maximale des fichiers supportés est de %@.";
-
-/* No comment provided by engineer. */
-"Database downgrade required" = "Mise à jour de la base de données nécessaire";
-
-/* No comment provided by engineer. */
-"Database encrypted!" = "Base de données chiffrée !";
-
-/* No comment provided by engineer. */
-"Database error" = "Erreur de base de données";
-
-/* No comment provided by engineer. */
-"Database passphrase is different from saved in the keychain." = "La phrase secrète de la base de données est différente de celle enregistrée dans la keychain.";
-
-/* No comment provided by engineer. */
-"Database passphrase is required to open chat." = "La phrase secrète de la base de données est nécessaire pour ouvrir le chat.";
-
-/* No comment provided by engineer. */
-"Database upgrade required" = "Mise à niveau de la base de données nécessaire";
-
-/* No comment provided by engineer. */
-"Error preparing file" = "Erreur lors de la préparation du fichier";
-
-/* No comment provided by engineer. */
-"Error preparing message" = "Erreur lors de la préparation du message";
-
-/* No comment provided by engineer. */
-"Error: %@" = "Erreur : %@";
-
-/* No comment provided by engineer. */
-"File error" = "Erreur de fichier";
-
-/* No comment provided by engineer. */
-"Incompatible database version" = "Version de la base de données incompatible";
-
-/* No comment provided by engineer. */
-"Invalid migration confirmation" = "Confirmation de migration invalide";
-
-/* No comment provided by engineer. */
-"Keychain error" = "Erreur de la keychain";
-
-/* No comment provided by engineer. */
-"Large file!" = "Fichier trop lourd !";
-
-/* No comment provided by engineer. */
-"No active profile" = "Pas de profil actif";
-
-/* No comment provided by engineer. */
-"Ok" = "Ok";
-
-/* No comment provided by engineer. */
-"Open the app to downgrade the database." = "Ouvrez l'app pour rétrograder la base de données.";
-
-/* No comment provided by engineer. */
-"Open the app to upgrade the database." = "Ouvrez l'app pour mettre à jour la base de données.";
-
-/* No comment provided by engineer. */
-"Passphrase" = "Phrase secrète";
-
-/* No comment provided by engineer. */
-"Please create a profile in the SimpleX app" = "Veuillez créer un profil dans l'app SimpleX";
-
-/* No comment provided by engineer. */
-"Selected chat preferences prohibit this message." = "Les paramètres de chat sélectionnés ne permettent pas l'envoi de ce message.";
-
-/* No comment provided by engineer. */
-"Sending a message takes longer than expected." = "L'envoi d'un message prend plus de temps que prévu.";
-
-/* No comment provided by engineer. */
-"Sending message…" = "Envoi du message…";
-
-/* No comment provided by engineer. */
-"Share" = "Partager";
-
-/* No comment provided by engineer. */
-"Slow network?" = "Réseau lent ?";
-
-/* No comment provided by engineer. */
-"Unknown database error: %@" = "Erreur inconnue de la base de données : %@";
-
-/* No comment provided by engineer. */
-"Unsupported format" = "Format non pris en charge";
-
-/* No comment provided by engineer. */
-"Wait" = "Attendez";
-
-/* No comment provided by engineer. */
-"Wrong database passphrase" = "Mauvaise phrase secrète pour la base de données";
-
-/* No comment provided by engineer. */
-"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Vous pouvez autoriser le partage dans les paramètres Confidentialité et sécurité / SimpleX Lock.";
+/* 
+  Localizable.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/hu.lproj/InfoPlist.strings

@@ -1,9 +1,7 @@
-/* Bundle display name */
-"CFBundleDisplayName" = "SimpleX SE";
-
-/* Bundle name */
-"CFBundleName" = "SimpleX SE";
-
-/* Copyright (human-readable) */
-"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Minden jog fenntartva.";
+/* 
+  InfoPlist.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/hu.lproj/Localizable.strings

@@ -1,111 +1,7 @@
-/* No comment provided by engineer. */
-"%@" = "%@";
-
-/* No comment provided by engineer. */
-"App is locked!" = "Az alkalmazás zárolva!";
-
-/* No comment provided by engineer. */
-"Cancel" = "Mégse";
-
-/* No comment provided by engineer. */
-"Cannot access keychain to save database password" = "Nem lehet hozzáférni a kulcstartóhoz az adatbázis jelszavának mentéséhez";
-
-/* No comment provided by engineer. */
-"Cannot forward message" = "Nem lehet továbbítani az üzenetet";
-
-/* No comment provided by engineer. */
-"Comment" = "Hozzászólás";
-
-/* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "Jelenleg a maximális támogatott fájlméret %@.";
-
-/* No comment provided by engineer. */
-"Database downgrade required" = "Adatbázis visszafejlesztése szükséges";
-
-/* No comment provided by engineer. */
-"Database encrypted!" = "Adatbázis titkosítva!";
-
-/* No comment provided by engineer. */
-"Database error" = "Adatbázis hiba";
-
-/* No comment provided by engineer. */
-"Database passphrase is different from saved in the keychain." = "Az adatbázis jelmondata eltér a kulcstartóban lévőtől.";
-
-/* No comment provided by engineer. */
-"Database passphrase is required to open chat." = "Adatbázis jelmondat szükséges a csevegés megnyitásához.";
-
-/* No comment provided by engineer. */
-"Database upgrade required" = "Adatbázis fejlesztése szükséges";
-
-/* No comment provided by engineer. */
-"Error preparing file" = "Hiba a fájl előkészítésekor";
-
-/* No comment provided by engineer. */
-"Error preparing message" = "Hiba az üzenet előkészítésekor";
-
-/* No comment provided by engineer. */
-"Error: %@" = "Hiba: %@";
-
-/* No comment provided by engineer. */
-"File error" = "Fájlhiba";
-
-/* No comment provided by engineer. */
-"Incompatible database version" = "Nem kompatibilis adatbázis verzió";
-
-/* No comment provided by engineer. */
-"Invalid migration confirmation" = "Érvénytelen átköltöztetési visszaigazolás";
-
-/* No comment provided by engineer. */
-"Keychain error" = "Kulcstartó hiba";
-
-/* No comment provided by engineer. */
-"Large file!" = "Nagy fájl!";
-
-/* No comment provided by engineer. */
-"No active profile" = "Nincs aktív profil";
-
-/* No comment provided by engineer. */
-"Ok" = "Rendben";
-
-/* No comment provided by engineer. */
-"Open the app to downgrade the database." = "Nyissa meg az alkalmazást az adatbázis visszafejlesztéséhez.";
-
-/* No comment provided by engineer. */
-"Open the app to upgrade the database." = "Nyissa meg az alkalmazást az adatbázis fejlesztéséhez.";
-
-/* No comment provided by engineer. */
-"Passphrase" = "Jelmondat";
-
-/* No comment provided by engineer. */
-"Please create a profile in the SimpleX app" = "Hozzon létre egy profilt a SimpleX alkalmazásban";
-
-/* No comment provided by engineer. */
-"Selected chat preferences prohibit this message." = "A kiválasztott csevegési beállítások tiltják ezt az üzenetet.";
-
-/* No comment provided by engineer. */
-"Sending a message takes longer than expected." = "Az üzenet elküldése a vártnál tovább tart.";
-
-/* No comment provided by engineer. */
-"Sending message…" = "Üzenet küldése…";
-
-/* No comment provided by engineer. */
-"Share" = "Megosztás";
-
-/* No comment provided by engineer. */
-"Slow network?" = "Lassú internetkapcsolat?";
-
-/* No comment provided by engineer. */
-"Unknown database error: %@" = "Ismeretlen adatbázis hiba: %@";
-
-/* No comment provided by engineer. */
-"Unsupported format" = "Nem támogatott formátum";
-
-/* No comment provided by engineer. */
-"Wait" = "Várjon";
-
-/* No comment provided by engineer. */
-"Wrong database passphrase" = "Hibás adatbázis jelmondat";
-
-/* No comment provided by engineer. */
-"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "A megosztást az Adatvédelem és biztonság / SimpleX zár menüben engedélyezheti.";
+/* 
+  Localizable.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/it.lproj/InfoPlist.strings

@@ -1,9 +1,7 @@
-/* Bundle display name */
-"CFBundleDisplayName" = "SimpleX SE";
-
-/* Bundle name */
-"CFBundleName" = "SimpleX SE";
-
-/* Copyright (human-readable) */
-"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Tutti i diritti riservati.";
+/* 
+  InfoPlist.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/it.lproj/Localizable.strings

@@ -1,111 +1,7 @@
-/* No comment provided by engineer. */
-"%@" = "%@";
-
-/* No comment provided by engineer. */
-"App is locked!" = "L'app è bloccata!";
-
-/* No comment provided by engineer. */
-"Cancel" = "Annulla";
-
-/* No comment provided by engineer. */
-"Cannot access keychain to save database password" = "Impossibile accedere al portachiavi per salvare la password del database";
-
-/* No comment provided by engineer. */
-"Cannot forward message" = "Impossibile inoltrare il messaggio";
-
-/* No comment provided by engineer. */
-"Comment" = "Commento";
-
-/* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "Attualmente la dimensione massima supportata è di %@.";
-
-/* No comment provided by engineer. */
-"Database downgrade required" = "Downgrade del database necessario";
-
-/* No comment provided by engineer. */
-"Database encrypted!" = "Database crittografato!";
-
-/* No comment provided by engineer. */
-"Database error" = "Errore del database";
-
-/* No comment provided by engineer. */
-"Database passphrase is different from saved in the keychain." = "La password del database è diversa da quella salvata nel portachiavi.";
-
-/* No comment provided by engineer. */
-"Database passphrase is required to open chat." = "La password del database è necessaria per aprire la chat.";
-
-/* No comment provided by engineer. */
-"Database upgrade required" = "Aggiornamento del database necessario";
-
-/* No comment provided by engineer. */
-"Error preparing file" = "Errore nella preparazione del file";
-
-/* No comment provided by engineer. */
-"Error preparing message" = "Errore nella preparazione del messaggio";
-
-/* No comment provided by engineer. */
-"Error: %@" = "Errore: %@";
-
-/* No comment provided by engineer. */
-"File error" = "Errore del file";
-
-/* No comment provided by engineer. */
-"Incompatible database version" = "Versione del database incompatibile";
-
-/* No comment provided by engineer. */
-"Invalid migration confirmation" = "Conferma di migrazione non valida";
-
-/* No comment provided by engineer. */
-"Keychain error" = "Errore del portachiavi";
-
-/* No comment provided by engineer. */
-"Large file!" = "File grande!";
-
-/* No comment provided by engineer. */
-"No active profile" = "Nessun profilo attivo";
-
-/* No comment provided by engineer. */
-"Ok" = "Ok";
-
-/* No comment provided by engineer. */
-"Open the app to downgrade the database." = "Apri l'app per eseguire il downgrade del database.";
-
-/* No comment provided by engineer. */
-"Open the app to upgrade the database." = "Apri l'app per aggiornare il database.";
-
-/* No comment provided by engineer. */
-"Passphrase" = "Password";
-
-/* No comment provided by engineer. */
-"Please create a profile in the SimpleX app" = "Crea un profilo nell'app SimpleX";
-
-/* No comment provided by engineer. */
-"Selected chat preferences prohibit this message." = "Le preferenze della chat selezionata vietano questo messaggio.";
-
-/* No comment provided by engineer. */
-"Sending a message takes longer than expected." = "L'invio di un messaggio richiede più tempo del previsto.";
-
-/* No comment provided by engineer. */
-"Sending message…" = "Invio messaggio…";
-
-/* No comment provided by engineer. */
-"Share" = "Condividi";
-
-/* No comment provided by engineer. */
-"Slow network?" = "Rete lenta?";
-
-/* No comment provided by engineer. */
-"Unknown database error: %@" = "Errore del database sconosciuto: %@";
-
-/* No comment provided by engineer. */
-"Unsupported format" = "Formato non supportato";
-
-/* No comment provided by engineer. */
-"Wait" = "Attendi";
-
-/* No comment provided by engineer. */
-"Wrong database passphrase" = "Password del database sbagliata";
-
-/* No comment provided by engineer. */
-"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Puoi consentire la condivisione in Privacy e sicurezza / impostazioni di SimpleX Lock.";
+/* 
+  Localizable.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/nl.lproj/InfoPlist.strings

@@ -1,9 +1,7 @@
-/* Bundle display name */
-"CFBundleDisplayName" = "SimpleX SE";
-
-/* Bundle name */
-"CFBundleName" = "SimpleX SE";
-
-/* Copyright (human-readable) */
-"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. All rights reserved.";
+/* 
+  InfoPlist.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/nl.lproj/Localizable.strings

@@ -1,111 +1,7 @@
-/* No comment provided by engineer. */
-"%@" = "%@";
-
-/* No comment provided by engineer. */
-"App is locked!" = "App is vergrendeld!";
-
-/* No comment provided by engineer. */
-"Cancel" = "Annuleren";
-
-/* No comment provided by engineer. */
-"Cannot access keychain to save database password" = "Kan geen toegang krijgen tot de keychain om het database wachtwoord op te slaan";
-
-/* No comment provided by engineer. */
-"Cannot forward message" = "Kan bericht niet doorsturen";
-
-/* No comment provided by engineer. */
-"Comment" = "Opmerking";
-
-/* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "De momenteel maximaal ondersteunde bestandsgrootte is %@.";
-
-/* No comment provided by engineer. */
-"Database downgrade required" = "Database downgrade vereist";
-
-/* No comment provided by engineer. */
-"Database encrypted!" = "Database versleuteld!";
-
-/* No comment provided by engineer. */
-"Database error" = "Database fout";
-
-/* No comment provided by engineer. */
-"Database passphrase is different from saved in the keychain." = "Het wachtwoord van de database verschilt van het wachtwoord die in de keychain is opgeslagen.";
-
-/* No comment provided by engineer. */
-"Database passphrase is required to open chat." = "Database wachtwoord is vereist om je gesprekken te openen.";
-
-/* No comment provided by engineer. */
-"Database upgrade required" = "Database upgrade vereist";
-
-/* No comment provided by engineer. */
-"Error preparing file" = "Fout bij voorbereiden bestand";
-
-/* No comment provided by engineer. */
-"Error preparing message" = "Fout bij het voorbereiden van bericht";
-
-/* No comment provided by engineer. */
-"Error: %@" = "Fout: %@";
-
-/* No comment provided by engineer. */
-"File error" = "Bestandsfout";
-
-/* No comment provided by engineer. */
-"Incompatible database version" = "Incompatibele database versie";
-
-/* No comment provided by engineer. */
-"Invalid migration confirmation" = "Ongeldige migratie bevestiging";
-
-/* No comment provided by engineer. */
-"Keychain error" = "Keychain fout";
-
-/* No comment provided by engineer. */
-"Large file!" = "Groot bestand!";
-
-/* No comment provided by engineer. */
-"No active profile" = "Geen actief profiel";
-
-/* No comment provided by engineer. */
-"Ok" = "Ok";
-
-/* No comment provided by engineer. */
-"Open the app to downgrade the database." = "Open de app om de database te downgraden.";
-
-/* No comment provided by engineer. */
-"Open the app to upgrade the database." = "Open de app om de database te upgraden.";
-
-/* No comment provided by engineer. */
-"Passphrase" = "Wachtwoord";
-
-/* No comment provided by engineer. */
-"Please create a profile in the SimpleX app" = "Maak een profiel aan in de SimpleX app";
-
-/* No comment provided by engineer. */
-"Selected chat preferences prohibit this message." = "Geselecteerde chat voorkeuren verbieden dit bericht.";
-
-/* No comment provided by engineer. */
-"Sending a message takes longer than expected." = "Het verzenden van een bericht duurt langer dan verwacht.";
-
-/* No comment provided by engineer. */
-"Sending message…" = "Bericht versturen…";
-
-/* No comment provided by engineer. */
-"Share" = "Deel";
-
-/* No comment provided by engineer. */
-"Slow network?" = "Traag netwerk?";
-
-/* No comment provided by engineer. */
-"Unknown database error: %@" = "Onbekende database fout: %@";
-
-/* No comment provided by engineer. */
-"Unsupported format" = "Niet ondersteund formaat";
-
-/* No comment provided by engineer. */
-"Wait" = "wachten";
-
-/* No comment provided by engineer. */
-"Wrong database passphrase" = "Verkeerde database wachtwoord";
-
-/* No comment provided by engineer. */
-"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "U kunt delen toestaan in de instellingen voor Privacy en beveiliging / SimpleX Lock.";
+/* 
+  Localizable.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/ru.lproj/InfoPlist.strings

@@ -1,9 +1,7 @@
-/* Bundle display name */
-"CFBundleDisplayName" = "SimpleX SE";
-
-/* Bundle name */
-"CFBundleName" = "SimpleX SE";
-
-/* Copyright (human-readable) */
-"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Все права защищены.";
+/* 
+  InfoPlist.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

apps/ios/SimpleX SE/ru.lproj/Localizable.strings

@@ -1,111 +1,3 @@
-/* No comment provided by engineer. */
-"%@" = "%@";
-
-/* No comment provided by engineer. */
-"App is locked!" = "Приложение заблокировано!";
-
-/* No comment provided by engineer. */
-"Cancel" = "Отменить";
-
-/* No comment provided by engineer. */
-"Cannot access keychain to save database password" = "Невозможно сохранить пароль в keychain";
-
-/* No comment provided by engineer. */
-"Cannot forward message" = "Невозможно переслать сообщение";
-
-/* No comment provided by engineer. */
-"Comment" = "Комментарий";
-
-/* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "В настоящее время максимальный поддерживаемый размер файла составляет %@.";
-
-/* No comment provided by engineer. */
-"Database downgrade required" = "Требуется откат базы данных";
-
-/* No comment provided by engineer. */
-"Database encrypted!" = "База данных зашифрована!";
-
-/* No comment provided by engineer. */
-"Database error" = "Ошибка базы данных";
-
-/* No comment provided by engineer. */
-"Database passphrase is different from saved in the keychain." = "Пароль базы данных отличается от сохраненного в keychain.";
-
-/* No comment provided by engineer. */
-"Database passphrase is required to open chat." = "Введите пароль базы данных, чтобы открыть чат.";
-
-/* No comment provided by engineer. */
-"Database upgrade required" = "Требуется обновление базы данных";
-
-/* No comment provided by engineer. */
-"Error preparing file" = "Ошибка подготовки файла";
-
-/* No comment provided by engineer. */
-"Error preparing message" = "Ошибка подготовки сообщения";
-
-/* No comment provided by engineer. */
-"Error: %@" = "Ошибка: %@";
-
-/* No comment provided by engineer. */
-"File error" = "Ошибка файла";
-
-/* No comment provided by engineer. */
-"Incompatible database version" = "Несовместимая версия базы данных";
-
-/* No comment provided by engineer. */
-"Invalid migration confirmation" = "Ошибка подтверждения миграции";
-
-/* No comment provided by engineer. */
-"Keychain error" = "Ошибка keychain";
-
-/* No comment provided by engineer. */
-"Large file!" = "Большой файл!";
-
-/* No comment provided by engineer. */
-"No active profile" = "Нет активного профиля";
-
-/* No comment provided by engineer. */
-"Ok" = "Ок";
-
-/* No comment provided by engineer. */
-"Open the app to downgrade the database." = "Откройте приложение, чтобы откатить базу данных.";
-
-/* No comment provided by engineer. */
-"Open the app to upgrade the database." = "Откройте приложение, чтобы обновить базу данных.";
-
-/* No comment provided by engineer. */
-"Passphrase" = "Пароль";
-
-/* No comment provided by engineer. */
-"Please create a profile in the SimpleX app" = "Пожалуйста, создайте профиль в приложении SimpleX.";
-
-/* No comment provided by engineer. */
-"Selected chat preferences prohibit this message." = "Выбранные настройки чата запрещают это сообщение.";
-
-/* No comment provided by engineer. */
-"Sending a message takes longer than expected." = "Отправка сообщения занимает дольше ожиданного.";
-
-/* No comment provided by engineer. */
-"Sending message…" = "Отправка сообщения…";
-
 /* No comment provided by engineer. */
 "Share" = "Поделиться";
 
-/* No comment provided by engineer. */
-"Slow network?" = "Медленная сеть?";
-
-/* No comment provided by engineer. */
-"Unknown database error: %@" = "Неизвестная ошибка базы данных: %@";
-
-/* No comment provided by engineer. */
-"Unsupported format" = "Неподдерживаемый формат";
-
-/* No comment provided by engineer. */
-"Wait" = "Подождать";
-
-/* No comment provided by engineer. */
-"Wrong database passphrase" = "Неправильный пароль базы данных";
-
-/* No comment provided by engineer. */
-"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Вы можете разрешить функцию Поделиться в настройках Конфиденциальности / Блокировка SimpleX.";
-

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -135,6 +135,7 @@
 		5CE4407927ADB701007B033A /* EmojiItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE4407827ADB701007B033A /* EmojiItemView.swift */; };
 		5CEACCE327DE9246000BD591 /* ComposeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCE227DE9246000BD591 /* ComposeView.swift */; };
 		5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCEC27DEA495000BD591 /* MsgContentView.swift */; };
+		5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */; };
 		5CEBD7482A5F115D00665FE2 /* SetDeliveryReceiptsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */; };
 		5CF937202B24DE8C00E1D781 /* SharedFileSubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */; };
 		5CF937232B2503D000E1D781 /* NSESubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF937212B25034A00E1D781 /* NSESubscriber.swift */; };
@@ -193,13 +194,11 @@
 		8CC4ED902BD7B8530078AEE8 /* CallAudioDeviceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC4ED8F2BD7B8530078AEE8 /* CallAudioDeviceManager.swift */; };
 		8CC956EE2BC0041000412A11 /* NetworkObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC956ED2BC0041000412A11 /* NetworkObserver.swift */; };
 		8CE848A32C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CE848A22C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift */; };
-		B76E6C312C5C41D900EC11AA /* ContactListNavLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B76E6C302C5C41D900EC11AA /* ContactListNavLink.swift */; };
 		CE1EB0E42C459A660099D896 /* ShareAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1EB0E32C459A660099D896 /* ShareAPI.swift */; };
 		CE2AD9CE2C452A4D00E844E3 /* ChatUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE2AD9CD2C452A4D00E844E3 /* ChatUtils.swift */; };
 		CE3097FB2C4C0C9F00180898 /* ErrorAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3097FA2C4C0C9F00180898 /* ErrorAlert.swift */; };
 		CE38A29A2C3FCA54005ED185 /* ImageUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CBD2859295711D700EC2CF4 /* ImageUtils.swift */; };
 		CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = CE38A29B2C3FCD72005ED185 /* SwiftyGif */; };
-		CE75480A2C622630009579B7 /* SwipeLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7548092C622630009579B7 /* SwipeLabel.swift */; };
 		CE984D4B2C36C5D500E3AEFF /* ChatItemClipShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE984D4A2C36C5D500E3AEFF /* ChatItemClipShape.swift */; };
 		CEDE70222C48FD9500233B1F /* SEChatState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEDE70212C48FD9500233B1F /* SEChatState.swift */; };
 		CEE723AA2C3BD3D70009AE93 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE723A92C3BD3D70009AE93 /* ShareViewController.swift */; };
@@ -213,16 +212,16 @@
 		D741547A29AF90B00022400A /* PushKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D741547929AF90B00022400A /* PushKit.framework */; };
 		D77B92DC2952372200A5A1CC /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = D77B92DB2952372200A5A1CC /* SwiftyGif */; };
 		D7F0E33929964E7E0068AF69 /* LZString in Frameworks */ = {isa = PBXBuildFile; productRef = D7F0E33829964E7E0068AF69 /* LZString */; };
-		E51CC1E62C62085600DB91FE /* OneHandUICard.swift in Sources */ = {isa = PBXBuildFile; fileRef = E51CC1E52C62085600DB91FE /* OneHandUICard.swift */; };
+		E50581062C3DDD9D009C3F71 /* Yams in Frameworks */ = {isa = PBXBuildFile; productRef = E50581052C3DDD9D009C3F71 /* Yams */; };
 		E5DCF8DB2C56FAC1007928CC /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
+		E5DCF8E12C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8DC2C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a */; };
+		E5DCF8E22C5847EB007928CC /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8DD2C5847EB007928CC /* libgmp.a */; };
+		E5DCF8E32C5847EB007928CC /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8DE2C5847EB007928CC /* libgmpxx.a */; };
+		E5DCF8E42C5847EB007928CC /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8DF2C5847EB007928CC /* libffi.a */; };
+		E5DCF8E52C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5DCF8E02C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a */; };
 		E5DCF9712C590272007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF96F2C590272007928CC /* Localizable.strings */; };
 		E5DCF9842C5902CE007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9822C5902CE007928CC /* Localizable.strings */; };
 		E5DCF9982C5906FF007928CC /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9962C5906FF007928CC /* InfoPlist.strings */; };
-		E5E218532C6D4C0F0013B4C6 /* libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E2184E2C6D4C0F0013B4C6 /* libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q-ghc9.6.3.a */; };
-		E5E218542C6D4C0F0013B4C6 /* libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E2184F2C6D4C0F0013B4C6 /* libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q.a */; };
-		E5E218552C6D4C0F0013B4C6 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E218502C6D4C0F0013B4C6 /* libgmp.a */; };
-		E5E218562C6D4C0F0013B4C6 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E218512C6D4C0F0013B4C6 /* libffi.a */; };
-		E5E218572C6D4C0F0013B4C6 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E218522C6D4C0F0013B4C6 /* libgmpxx.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -473,6 +472,7 @@
 		5CE6C7B42AAB1527007F345C /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CEACCE227DE9246000BD591 /* ComposeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeView.swift; sourceTree = "<group>"; };
 		5CEACCEC27DEA495000BD591 /* MsgContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgContentView.swift; sourceTree = "<group>"; };
+		5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardPadding.swift; sourceTree = "<group>"; };
 		5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetDeliveryReceiptsView.swift; sourceTree = "<group>"; };
 		5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedFileSubscriber.swift; sourceTree = "<group>"; };
 		5CF937212B25034A00E1D781 /* NSESubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSESubscriber.swift; sourceTree = "<group>"; };
@@ -531,11 +531,9 @@
 		8CC4ED8F2BD7B8530078AEE8 /* CallAudioDeviceManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallAudioDeviceManager.swift; sourceTree = "<group>"; };
 		8CC956ED2BC0041000412A11 /* NetworkObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkObserver.swift; sourceTree = "<group>"; };
 		8CE848A22C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableChatItemToolbars.swift; sourceTree = "<group>"; };
-		B76E6C302C5C41D900EC11AA /* ContactListNavLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactListNavLink.swift; sourceTree = "<group>"; };
 		CE1EB0E32C459A660099D896 /* ShareAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareAPI.swift; sourceTree = "<group>"; };
 		CE2AD9CD2C452A4D00E844E3 /* ChatUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatUtils.swift; sourceTree = "<group>"; };
 		CE3097FA2C4C0C9F00180898 /* ErrorAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorAlert.swift; sourceTree = "<group>"; };
-		CE7548092C622630009579B7 /* SwipeLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeLabel.swift; sourceTree = "<group>"; };
 		CE984D4A2C36C5D500E3AEFF /* ChatItemClipShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemClipShape.swift; sourceTree = "<group>"; };
 		CEDE70212C48FD9500233B1F /* SEChatState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SEChatState.swift; sourceTree = "<group>"; };
 		CEE723A72C3BD3D70009AE93 /* SimpleX SE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX SE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -549,7 +547,11 @@
 		D741547729AF89AF0022400A /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
 		D7AA2C3429A936B400737B40 /* MediaEncryption.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = MediaEncryption.playground; path = Shared/MediaEncryption.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
-		E51CC1E52C62085600DB91FE /* OneHandUICard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneHandUICard.swift; sourceTree = "<group>"; };
+		E5DCF8DC2C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a"; sourceTree = "<group>"; };
+		E5DCF8DD2C5847EB007928CC /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		E5DCF8DE2C5847EB007928CC /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		E5DCF8DF2C5847EB007928CC /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		E5DCF8E02C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a"; sourceTree = "<group>"; };
 		E5DCF9702C590272007928CC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9722C590274007928CC /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9732C590275007928CC /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -602,11 +604,6 @@
 		E5DCF9A62C590731007928CC /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E5DCF9A72C590732007928CC /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E5DCF9A82C590732007928CC /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		E5E2184E2C6D4C0F0013B4C6 /* libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q-ghc9.6.3.a"; sourceTree = "<group>"; };
-		E5E2184F2C6D4C0F0013B4C6 /* libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q.a"; sourceTree = "<group>"; };
-		E5E218502C6D4C0F0013B4C6 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		E5E218512C6D4C0F0013B4C6 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		E5E218522C6D4C0F0013B4C6 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -646,13 +643,14 @@
 			buildActionMask = 2147483647;
 			files = (
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				E5E218542C6D4C0F0013B4C6 /* libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
+				E50581062C3DDD9D009C3F71 /* Yams in Frameworks */,
+				E5DCF8E52C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a in Frameworks */,
+				E5DCF8E42C5847EB007928CC /* libffi.a in Frameworks */,
+				E5DCF8E12C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a in Frameworks */,
+				E5DCF8E22C5847EB007928CC /* libgmp.a in Frameworks */,
 				CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */,
-				E5E218572C6D4C0F0013B4C6 /* libgmpxx.a in Frameworks */,
-				E5E218562C6D4C0F0013B4C6 /* libffi.a in Frameworks */,
-				E5E218552C6D4C0F0013B4C6 /* libgmp.a in Frameworks */,
-				E5E218532C6D4C0F0013B4C6 /* libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q-ghc9.6.3.a in Frameworks */,
+				E5DCF8E32C5847EB007928CC /* libgmpxx.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -687,7 +685,6 @@
 		5C2E260D27A30E2400F70299 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				B76E6C2F2C5C41C300EC11AA /* Contacts */,
 				5CB0BA8C282711BC00B3292C /* Onboarding */,
 				3C714775281C080100CB4D4B /* Call */,
 				5C971E1F27AEBF7000C8A3CE /* Helpers */,
@@ -729,11 +726,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				E5E218512C6D4C0F0013B4C6 /* libffi.a */,
-				E5E218502C6D4C0F0013B4C6 /* libgmp.a */,
-				E5E218522C6D4C0F0013B4C6 /* libgmpxx.a */,
-				E5E2184E2C6D4C0F0013B4C6 /* libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q-ghc9.6.3.a */,
-				E5E2184F2C6D4C0F0013B4C6 /* libHSsimplex-chat-6.0.0.8-9fvDFLivFrv8AINTqPH03q.a */,
+				E5DCF8DF2C5847EB007928CC /* libffi.a */,
+				E5DCF8DD2C5847EB007928CC /* libgmp.a */,
+				E5DCF8DE2C5847EB007928CC /* libgmpxx.a */,
+				E5DCF8E02C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB-ghc9.6.3.a */,
+				E5DCF8DC2C5847EB007928CC /* libHSsimplex-chat-6.0.0.3-5yF58NJ20MV4vZ7jQKFAxB.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -784,11 +781,11 @@
 				18415DAAAD1ADBEDB0EDA852 /* VideoPlayerView.swift */,
 				64466DCB29FFE3E800E3D48D /* MailView.swift */,
 				64C3B0202A0D359700E19930 /* CustomTimePicker.swift */,
+				5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */,
 				8C7F8F0D2C19C0C100D16888 /* ViewModifiers.swift */,
 				8C74C3ED2C1B942300039E77 /* ChatWallpaper.swift */,
 				8C9BC2642C240D5100875A27 /* ThemeModeEditor.swift */,
 				CE984D4A2C36C5D500E3AEFF /* ChatItemClipShape.swift */,
-				CE7548092C622630009579B7 /* SwipeLabel.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -935,7 +932,6 @@
 				5C10D88728EED12E00E58BF0 /* ContactConnectionInfo.swift */,
 				18415835CBD939A9ABDC108A /* UserPicker.swift */,
 				64EEB0F62C353F1C00972D62 /* ServersSummaryView.swift */,
-				E51CC1E52C62085600DB91FE /* OneHandUICard.swift */,
 			);
 			path = ChatList;
 			sourceTree = "<group>";
@@ -1080,14 +1076,6 @@
 			path = Theme;
 			sourceTree = "<group>";
 		};
-		B76E6C2F2C5C41C300EC11AA /* Contacts */ = {
-			isa = PBXGroup;
-			children = (
-				B76E6C302C5C41D900EC11AA /* ContactListNavLink.swift */,
-			);
-			path = Contacts;
-			sourceTree = "<group>";
-		};
 		CEE723A82C3BD3D70009AE93 /* SimpleX SE */ = {
 			isa = PBXGroup;
 			children = (
@@ -1200,6 +1188,7 @@
 			);
 			name = SimpleXChat;
 			packageProductDependencies = (
+				E50581052C3DDD9D009C3F71 /* Yams */,
 				CE38A29B2C3FCD72005ED185 /* SwiftyGif */,
 			);
 			productName = SimpleXChat;
@@ -1361,7 +1350,6 @@
 				5C93292F29239A170090FFF9 /* ProtocolServersView.swift in Sources */,
 				5CB924D727A8563F00ACCCDD /* SettingsView.swift in Sources */,
 				5CEACCE327DE9246000BD591 /* ComposeView.swift in Sources */,
-				E51CC1E62C62085600DB91FE /* OneHandUICard.swift in Sources */,
 				5C65DAF929D0CC20003CEE45 /* DeveloperView.swift in Sources */,
 				5C36027327F47AD5009F19D9 /* AppDelegate.swift in Sources */,
 				5CB924E127A867BA00ACCCDD /* UserProfile.swift in Sources */,
@@ -1394,7 +1382,6 @@
 				64466DC829FC2B3B00E3D48D /* CreateSimpleXAddress.swift in Sources */,
 				3CDBCF4827FF621E00354CDD /* CILinkView.swift in Sources */,
 				5C7505A827B6D34800BE3227 /* ChatInfoToolbar.swift in Sources */,
-				B76E6C312C5C41D900EC11AA /* ContactListNavLink.swift in Sources */,
 				5C10D88A28F187F300E58BF0 /* FullScreenMediaView.swift in Sources */,
 				D72A9088294BD7A70047C86D /* NativeTextEditor.swift in Sources */,
 				CE984D4B2C36C5D500E3AEFF /* ChatItemClipShape.swift in Sources */,
@@ -1432,6 +1419,7 @@
 				646BB38E283FDB6D001CE359 /* LocalAuthenticationUtils.swift in Sources */,
 				8C74C3EA2C1B90AF00039E77 /* ThemeManager.swift in Sources */,
 				5C7505A227B65FDB00BE3227 /* CIMetaView.swift in Sources */,
+				5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */,
 				5C35CFC827B2782E00FB6C6D /* BGManager.swift in Sources */,
 				5CB634B129E5EFEA0066AD6B /* PasscodeView.swift in Sources */,
 				8C69FE7D2B8C7D2700267E38 /* AppSettings.swift in Sources */,
@@ -1443,7 +1431,6 @@
 				64D0C2C229FA57AB00B38D5F /* UserAddressLearnMore.swift in Sources */,
 				8CE848A32C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift in Sources */,
 				64466DCC29FFE3E800E3D48D /* MailView.swift in Sources */,
-				CE75480A2C622630009579B7 /* SwipeLabel.swift in Sources */,
 				5C971E2127AEBF8300C8A3CE /* ChatInfoImage.swift in Sources */,
 				5C55A921283CCCB700C4E99E /* IncomingCallView.swift in Sources */,
 				6454036F2822A9750090DDFF /* ComposeFileView.swift in Sources */,
@@ -1879,7 +1866,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 233;
+				CURRENT_PROJECT_VERSION = 229;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1904,7 +1891,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 6.0.1;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1928,7 +1915,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 233;
+				CURRENT_PROJECT_VERSION = 229;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1953,7 +1940,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.1;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1969,11 +1956,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 233;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.0.1;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1989,11 +1976,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 233;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.0.1;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2014,7 +2001,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 233;
+				CURRENT_PROJECT_VERSION = 229;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -2029,7 +2016,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.1;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2051,7 +2038,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 233;
+				CURRENT_PROJECT_VERSION = 229;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -2066,7 +2053,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.1;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2088,7 +2075,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 233;
+				CURRENT_PROJECT_VERSION = 229;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2114,7 +2101,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.1;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2139,7 +2126,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 233;
+				CURRENT_PROJECT_VERSION = 229;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2165,7 +2152,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.1;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2190,7 +2177,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 233;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2205,7 +2192,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.0.1;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2224,7 +2211,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 233;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2239,7 +2226,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.0.1;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2316,7 +2303,7 @@
 			repositoryURL = "https://github.com/twostraws/CodeScanner";
 			requirement = {
 				kind = exactVersion;
-				version = 2.5.0;
+				version = 2.1.1;
 			};
 		};
 		8C73C1162C21E17B00892670 /* XCRemoteSwiftPackageReference "Yams" */ = {
@@ -2384,6 +2371,11 @@
 			package = D7F0E33729964E7D0068AF69 /* XCRemoteSwiftPackageReference "lzstring-swift" */;
 			productName = LZString;
 		};
+		E50581052C3DDD9D009C3F71 /* Yams */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 8C73C1162C21E17B00892670 /* XCRemoteSwiftPackageReference "Yams" */;
+			productName = Yams;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 5CA059BE279559F40002BEB4 /* Project object */;

apps/ios/SimpleX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,8 +6,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/twostraws/CodeScanner",
       "state" : {
-        "revision" : "34da57fb63b47add20de8a85da58191523ccce57",
-        "version" : "2.5.0"
+        "revision" : "c27a66149b7483fe42e2ec6aad61d5c3fffe522d",
+        "version" : "2.1.1"
       }
     },
     {
@@ -23,6 +23,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/kirualex/SwiftyGif",
       "state" : {
+        "branch" : "master",
         "revision" : "5e8619335d394901379c9add5c4c1c2f420b3800"
       }
     },

apps/ios/SimpleXChat/APITypes.swift

@@ -8,13 +8,14 @@
 
 import Foundation
 import SwiftUI
+import Yams
 
 public let jsonDecoder = getJSONDecoder()
 public let jsonEncoder = getJSONEncoder()
 
 public enum ChatCommand {
     case showActiveUser
-    case createActiveUser(profile: Profile?, pastTimestamp: Bool)
+    case createActiveUser(profile: Profile?, sameServers: Bool, pastTimestamp: Bool)
     case listUsers
     case apiSetActiveUser(userId: Int64, viewPwd: String?)
     case setAllContactReceipts(enable: Bool)
@@ -100,7 +101,7 @@ public enum ChatCommand {
     case apiConnectPlan(userId: Int64, connReq: String)
     case apiConnect(userId: Int64, incognito: Bool, connReq: String)
     case apiConnectContactViaAddress(userId: Int64, incognito: Bool, contactId: Int64)
-    case apiDeleteChat(type: ChatType, id: Int64, chatDeleteMode: ChatDeleteMode)
+    case apiDeleteChat(type: ChatType, id: Int64, notify: Bool?)
     case apiClearChat(type: ChatType, id: Int64)
     case apiListContacts(userId: Int64)
     case apiUpdateProfile(userId: Int64, profile: Profile)
@@ -155,8 +156,8 @@ public enum ChatCommand {
         get {
             switch self {
             case .showActiveUser: return "/u"
-            case let .createActiveUser(profile, pastTimestamp):
-                let user = NewUser(profile: profile, pastTimestamp: pastTimestamp)
+            case let .createActiveUser(profile, sameServers, pastTimestamp):
+                let user = NewUser(profile: profile, sameServers: sameServers, pastTimestamp: pastTimestamp)
                 return "/_create user \(encodeJSON(user))"
             case .listUsers: return "/users"
             case let .apiSetActiveUser(userId, viewPwd): return "/_user \(userId)\(maybePwd(viewPwd))"
@@ -265,7 +266,11 @@ public enum ChatCommand {
             case let .apiConnectPlan(userId, connReq): return "/_connect plan \(userId) \(connReq)"
             case let .apiConnect(userId, incognito, connReq): return "/_connect \(userId) incognito=\(onOff(incognito)) \(connReq)"
             case let .apiConnectContactViaAddress(userId, incognito, contactId): return "/_connect contact \(userId) incognito=\(onOff(incognito)) \(contactId)"
-            case let .apiDeleteChat(type, id, chatDeleteMode): return "/_delete \(ref(type, id)) \(chatDeleteMode.cmdString)"
+            case let .apiDeleteChat(type, id, notify): if let notify = notify {
+                return "/_delete \(ref(type, id)) notify=\(onOff(notify))"
+            } else {
+                return "/_delete \(ref(type, id))"
+            }
             case let .apiClearChat(type, id): return "/_clear chat \(ref(type, id))"
             case let .apiListContacts(userId): return "/_contacts \(userId)"
             case let .apiUpdateProfile(userId, profile): return "/_profile \(userId) \(encodeJSON(profile))"
@@ -500,6 +505,10 @@ public enum ChatCommand {
         return nil
     }
 
+    private func onOff(_ b: Bool) -> String {
+        b ? "on" : "off"
+    }
+
     private func onOffParam(_ param: String, _ b: Bool?) -> String {
         if let b = b {
             return " \(param)=\(onOff(b))"
@@ -512,10 +521,6 @@ public enum ChatCommand {
     }
 }
 
-private func onOff(_ b: Bool) -> String {
-    b ? "on" : "off"
-}
-
 public struct APIResponse: Decodable {
     var resp: ChatResponse
 }
@@ -684,7 +689,6 @@ public enum ChatResponse: Decodable, Error {
     case agentSubsSummary(user: UserRef, subsSummary: SMPServerSubs)
     case chatCmdError(user_: UserRef?, chatError: ChatError)
     case chatError(user_: UserRef?, chatError: ChatError)
-    case archiveExported(archiveErrors: [ArchiveError])
     case archiveImported(archiveErrors: [ArchiveError])
     case appSettings(appSettings: AppSettings)
 
@@ -847,7 +851,6 @@ public enum ChatResponse: Decodable, Error {
             case .agentSubsSummary: return "agentSubsSummary"
             case .chatCmdError: return "chatCmdError"
             case .chatError: return "chatError"
-            case .archiveExported: return "archiveExported"
             case .archiveImported: return "archiveImported"
             case .appSettings: return "appSettings"
             }
@@ -1018,7 +1021,6 @@ public enum ChatResponse: Decodable, Error {
             case let .agentSubsSummary(u, subsSummary): return withUser(u, String(describing: subsSummary))
             case let .chatCmdError(u, chatError): return withUser(u, String(describing: chatError))
             case let .chatError(u, chatError): return withUser(u, String(describing: chatError))
-            case let .archiveExported(archiveErrors): return String(describing: archiveErrors)
             case let .archiveImported(archiveErrors): return String(describing: archiveErrors)
             case let .appSettings(appSettings): return String(describing: appSettings)
             }
@@ -1043,27 +1045,6 @@ public func chatError(_ chatResponse: ChatResponse) -> ChatErrorType? {
     }
 }
 
-public enum ChatDeleteMode: Codable {
-    case full(notify: Bool)
-    case entity(notify: Bool)
-    case messages
-
-    var cmdString: String {
-        switch self {
-        case let .full(notify): "full notify=\(onOff(notify))"
-        case let .entity(notify): "entity notify=\(onOff(notify))"
-        case .messages: "messages"
-        }
-    }
-
-    public var isEntity: Bool {
-        switch self {
-        case .entity: return true
-        default: return false
-        }
-    }
-}
-
 public enum ConnectionPlan: Decodable, Hashable {
     case invitationLink(invitationLinkPlan: InvitationLinkPlan)
     case contactAddress(contactAddressPlan: ContactAddressPlan)
@@ -1096,6 +1077,7 @@ public enum GroupLinkPlan: Decodable, Hashable {
 
 struct NewUser: Encodable, Hashable {
     var profile: Profile?
+    var sameServers: Bool
     var pastTimestamp: Bool
 }
 
@@ -1340,31 +1322,13 @@ public struct NetCfg: Codable, Equatable, Hashable {
         smpPingInterval: 1200_000_000
     )
 
-    static let proxyDefaults: NetCfg = NetCfg(
+    public static let proxyDefaults: NetCfg = NetCfg(
         tcpConnectTimeout: 35_000_000,
         tcpTimeout: 20_000_000,
         tcpTimeoutPerKb: 15_000,
         rcvConcurrency: 8,
         smpPingInterval: 1200_000_000
     )
-    
-    public var withProxyTimeouts: NetCfg {
-        var cfg = self
-        cfg.tcpConnectTimeout = NetCfg.proxyDefaults.tcpConnectTimeout
-        cfg.tcpTimeout = NetCfg.proxyDefaults.tcpTimeout
-        cfg.tcpTimeoutPerKb = NetCfg.proxyDefaults.tcpTimeoutPerKb
-        cfg.rcvConcurrency = NetCfg.proxyDefaults.rcvConcurrency
-        cfg.smpPingInterval = NetCfg.proxyDefaults.smpPingInterval
-        return cfg
-    }
-    
-    public var hasProxyTimeouts: Bool {
-        tcpConnectTimeout == NetCfg.proxyDefaults.tcpConnectTimeout &&
-        tcpTimeout == NetCfg.proxyDefaults.tcpTimeout &&
-        tcpTimeoutPerKb == NetCfg.proxyDefaults.tcpTimeoutPerKb &&
-        rcvConcurrency == NetCfg.proxyDefaults.rcvConcurrency &&
-        smpPingInterval == NetCfg.proxyDefaults.smpPingInterval
-    }
 
     public var enableKeepAlive: Bool { tcpKeepAlive != nil }
 }
@@ -1380,16 +1344,16 @@ public enum SocksMode: String, Codable, Hashable {
     case onion = "onion"
 }
 
-public enum SMPProxyMode: String, Codable, Hashable, SelectableItem {
+public enum SMPProxyMode: String, Codable, Hashable {
     case always = "always"
     case unknown = "unknown"
     case unprotected = "unprotected"
     case never = "never"
 
-    public var label: LocalizedStringKey {
+    public var text: LocalizedStringKey {
         switch self {
         case .always: return "always"
-        case .unknown: return "unknown servers"
+        case .unknown: return "unknown relays"
         case .unprotected: return "unprotected"
         case .never: return "never"
         }
@@ -1400,12 +1364,12 @@ public enum SMPProxyMode: String, Codable, Hashable, SelectableItem {
     public static let values: [SMPProxyMode] = [.always, .unknown, .unprotected, .never]
 }
 
-public enum SMPProxyFallback: String, Codable, Hashable, SelectableItem {
+public enum SMPProxyFallback: String, Codable, Hashable {
     case allow = "allow"
     case allowProtected = "allowProtected"
     case prohibit = "prohibit"
 
-    public var label: LocalizedStringKey {
+    public var text: LocalizedStringKey {
         switch self {
         case .allow: return "yes"
         case .allowProtected: return "when IP hidden"
@@ -1932,7 +1896,7 @@ public enum DatabaseError: Decodable, Hashable {
 
 public enum SQLiteError: Decodable, Hashable {
     case errorNotADatabase
-    case error(dbError: String)
+    case error(String)
 }
 
 public enum AgentErrorType: Decodable, Hashable {
@@ -2072,8 +2036,8 @@ public enum SMPAgentError: Decodable, Hashable {
 }
 
 public enum ArchiveError: Decodable, Hashable {
-    case `import`(importError: String)
-    case fileError(file: String, fileError: String)
+    case `import`(chatError: ChatError)
+    case importFile(file: String, chatError: ChatError)
 }
 
 public enum RemoteCtrlError: Decodable, Hashable {
@@ -2156,8 +2120,7 @@ public struct AppSettings: Codable, Equatable, Hashable {
     public var uiDarkColorScheme: String? = nil
     public var uiCurrentThemeIds: [String: String]? = nil
     public var uiThemes: [ThemeOverrides]? = nil
-    public var oneHandUI: Bool? = nil
-    
+
     public func prepareForExport() -> AppSettings {
         var empty = AppSettings()
         let def = AppSettings.defaults
@@ -2187,7 +2150,6 @@ public struct AppSettings: Codable, Equatable, Hashable {
         if uiDarkColorScheme != def.uiDarkColorScheme { empty.uiDarkColorScheme = uiDarkColorScheme }
         if uiCurrentThemeIds != def.uiCurrentThemeIds { empty.uiCurrentThemeIds = uiCurrentThemeIds }
         if uiThemes != def.uiThemes { empty.uiThemes = uiThemes }
-        if oneHandUI != def.oneHandUI { empty.oneHandUI = oneHandUI }
         return empty
     }
 
@@ -2218,8 +2180,7 @@ public struct AppSettings: Codable, Equatable, Hashable {
             uiColorScheme: DefaultTheme.SYSTEM_THEME_NAME,
             uiDarkColorScheme: DefaultTheme.SIMPLEX.themeName,
             uiCurrentThemeIds: nil as [String: String]?,
-            uiThemes: nil as [ThemeOverrides]?,
-            oneHandUI: false
+            uiThemes: nil as [ThemeOverrides]?
         )
     }
 }

apps/ios/SimpleXChat/AppGroup.swift

@@ -23,7 +23,7 @@ let GROUP_DEFAULT_NTF_PREVIEW_MODE = "ntfPreviewMode"
 public let GROUP_DEFAULT_NTF_ENABLE_LOCAL = "ntfEnableLocal" // no longer used
 public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic" // no longer used
 // replaces DEFAULT_PERFORM_LA
-let GROUP_DEFAULT_APP_LOCAL_AUTH_ENABLED = "appLocalAuthEnabled"
+let GROUP_DEFAULT_PERFORM_LA = "performLocalAuthentication"
 public let GROUP_DEFAULT_ALLOW_SHARE_EXTENSION = "allowShareExtension"
 // replaces DEFAULT_PRIVACY_LINK_PREVIEWS
 let GROUP_DEFAULT_PRIVACY_LINK_PREVIEWS = "privacyLinkPreviews"
@@ -55,7 +55,6 @@ public let GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE = "initialRandomDBPassphra
 public let GROUP_DEFAULT_CONFIRM_DB_UPGRADES = "confirmDBUpgrades"
 public let GROUP_DEFAULT_CALL_KIT_ENABLED = "callKitEnabled"
 public let GROUP_DEFAULT_PQ_EXPERIMENTAL_ENABLED = "pqExperimentalEnabled" // no longer used
-public let GROUP_DEFAULT_ONE_HAND_UI = "oneHandUI"
 
 public let APP_GROUP_NAME = "group.chat.simplex.app"
 
@@ -67,8 +66,8 @@ public func registerGroupDefaults() {
         GROUP_DEFAULT_NTF_ENABLE_PERIODIC: false,
         GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS: OnionHosts.no.rawValue,
         GROUP_DEFAULT_NETWORK_SESSION_MODE: TransportSessionMode.user.rawValue,
-        GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE: SMPProxyMode.unknown.rawValue,
-        GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK: SMPProxyFallback.allowProtected.rawValue,
+        GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE: SMPProxyMode.never.rawValue,
+        GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK: SMPProxyFallback.allow.rawValue,
         GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT: NetCfg.defaults.tcpConnectTimeout,
         GROUP_DEFAULT_NETWORK_TCP_TIMEOUT: NetCfg.defaults.tcpTimeout,
         GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB: NetCfg.defaults.tcpTimeoutPerKb,
@@ -82,7 +81,7 @@ public func registerGroupDefaults() {
         GROUP_DEFAULT_INCOGNITO: false,
         GROUP_DEFAULT_STORE_DB_PASSPHRASE: true,
         GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE: false,
-        GROUP_DEFAULT_APP_LOCAL_AUTH_ENABLED: true,
+        GROUP_DEFAULT_PERFORM_LA: true,
         GROUP_DEFAULT_ALLOW_SHARE_EXTENSION: false,
         GROUP_DEFAULT_PRIVACY_LINK_PREVIEWS: false,
         GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES: true,
@@ -93,7 +92,6 @@ public func registerGroupDefaults() {
         GROUP_DEFAULT_CONFIRM_DB_UPGRADES: false,
         GROUP_DEFAULT_CALL_KIT_ENABLED: true,
         GROUP_DEFAULT_PQ_EXPERIMENTAL_ENABLED: false,
-        GROUP_DEFAULT_ONE_HAND_UI: true
     ])
 }
 
@@ -205,7 +203,7 @@ public let ntfPreviewModeGroupDefault = EnumDefault<NotificationPreviewMode>(
 
 public let incognitoGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_INCOGNITO)
 
-public let appLocalAuthEnabledGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_APP_LOCAL_AUTH_ENABLED)
+public let performLAGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PERFORM_LA)
 
 public let allowShareExtensionGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_ALLOW_SHARE_EXTENSION)
 
@@ -237,13 +235,13 @@ public let networkSessionModeGroupDefault = EnumDefault<TransportSessionMode>(
 public let networkSMPProxyModeGroupDefault = EnumDefault<SMPProxyMode>(
     defaults: groupDefaults,
     forKey: GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE,
-    withDefault: .unknown
+    withDefault: .never
 )
 
 public let networkSMPProxyFallbackGroupDefault = EnumDefault<SMPProxyFallback>(
     defaults: groupDefaults,
     forKey: GROUP_DEFAULT_NETWORK_SMP_PROXY_FALLBACK,
-    withDefault: .allowProtected
+    withDefault: .allow
 )
 
 public let storeDBPassphraseGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_STORE_DB_PASSPHRASE)

apps/ios/SimpleXChat/ChatTypes.swift

@@ -1289,15 +1289,6 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
             }
         }
     }
-    
-    public var chatDeleted: Bool {
-        get {
-            switch self {
-            case let .direct(contact): return contact.chatDeleted
-            default: return false
-            }
-        }
-    }
 
     public var sendMsgEnabled: Bool {
         get {
@@ -1410,27 +1401,6 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         }
     }
 
-    public enum ShowEnableCallsAlert: Hashable {
-        case userEnable
-        case askContact
-        case other
-    }
-
-    public var showEnableCallsAlert: ShowEnableCallsAlert {
-        switch self {
-        case let .direct(contact):
-            if contact.mergedPreferences.calls.userPreference.preference.allow == .no {
-                return .userEnable
-            } else if contact.mergedPreferences.calls.contactPreference.allow == .no {
-                return .askContact
-            } else {
-                return .other
-            }
-        default:
-            return .other
-        }
-    }
-
     public var ntfsEnabled: Bool {
         self.chatSettings?.enableNtfs == .all
     }
@@ -1538,8 +1508,7 @@ public struct Contact: Identifiable, Decodable, NamedChat, Hashable {
     var contactGroupMemberId: Int64?
     var contactGrpInvSent: Bool
     public var uiThemes: ThemeModeOverrides?
-    public var chatDeleted: Bool
-    
+
     public var id: ChatId { get { "@\(contactId)" } }
     public var apiId: Int64 { get { contactId } }
     public var ready: Bool { get { activeConn?.connStatus == .ready } }
@@ -1606,15 +1575,13 @@ public struct Contact: Identifiable, Decodable, NamedChat, Hashable {
         mergedPreferences: ContactUserPreferences.sampleData,
         createdAt: .now,
         updatedAt: .now,
-        contactGrpInvSent: false,
-        chatDeleted: false
+        contactGrpInvSent: false
     )
 }
 
 public enum ContactStatus: String, Decodable, Hashable {
     case active = "active"
     case deleted = "deleted"
-    case deletedByUser = "deletedByUser"
 }
 
 public struct ContactRef: Decodable, Equatable, Hashable {

apps/ios/SimpleXChat/ErrorAlert.swift

@@ -72,25 +72,25 @@ extension View {
         _ errorAlert: Binding<ErrorAlert?>,
         @ViewBuilder actions: (ErrorAlert) -> A = { _ in EmptyView() }
     ) -> some View {
-        alert(
-            errorAlert.wrappedValue?.title ?? "",
-            isPresented: Binding<Bool>(
-                get: { errorAlert.wrappedValue != nil },
-                set: { if !$0 { errorAlert.wrappedValue = nil } }
-            ),
-            actions: {
-                if let actions_ = errorAlert.wrappedValue?.actions {
-                    actions_()
-                } else {
-                    if let alert = errorAlert.wrappedValue { actions(alert) }
+        if let alert = errorAlert.wrappedValue {
+            self.alert(
+                alert.title,
+                isPresented: Binding<Bool>(
+                    get: { errorAlert.wrappedValue != nil },
+                    set: { if !$0 { errorAlert.wrappedValue = nil } }
+                ),
+                actions: {
+                    if let actions_ = alert.actions {
+                        actions_()
+                    } else {
+                        actions(alert)
+                    }
+                },
+                message: {
+                    if let message = alert.message { Text(message) }
                 }
-            },
-            message: {
-                if let message = errorAlert.wrappedValue?.message {
-                    Text(message)
-                }
-            }
-        )
+            )
+        } else { self }
     }
 }
 

apps/ios/SimpleXChat/ImageUtils.swift

@@ -174,7 +174,7 @@ public func downsampleImage(at url: URL, to size: Int64) -> UIImage? {
         if let source = CGImageSourceCreateWithURL(url as CFURL, nil) {
             CGImageSourceCreateThumbnailAtIndex(
                     source,
-                    0,
+                    Int.zero,
                     [
                         kCGImageSourceCreateThumbnailFromImageAlways: true,
                         kCGImageSourceShouldCacheImmediately: true,
@@ -433,25 +433,17 @@ private let squareToCircleRatio = 0.935
 
 private let radiusFactor = (1 - squareToCircleRatio) / 50
 
-@ViewBuilder public func clipProfileImage(_ img: Image, size: CGFloat, radius: Double, blurred: Bool = false) -> some View {
+@ViewBuilder public func clipProfileImage(_ img: Image, size: CGFloat, radius: Double) -> some View {
+    let v = img.resizable()
     if radius >= 50 {
-        blurredFrame(img, size, blurred).clipShape(Circle())
+        v.frame(width: size, height: size).clipShape(Circle())
     } else if radius <= 0 {
         let sz = size * squareToCircleRatio
-        blurredFrame(img, sz, blurred).padding((size - sz) / 2)
+        v.frame(width: sz, height: sz).padding((size - sz) / 2)
     } else {
         let sz = size * (squareToCircleRatio + radius * radiusFactor)
-        blurredFrame(img, sz, blurred)
+        v.frame(width: sz, height: sz)
         .clipShape(RoundedRectangle(cornerRadius: sz * radius / 100, style: .continuous))
         .padding((size - sz) / 2)
     }
 }
-
-@ViewBuilder private func blurredFrame(_ img: Image, _ size: CGFloat, _ blurred: Bool) -> some View {
-    let v = img.resizable().frame(width: size, height: size)
-    if blurred {
-        v.blur(radius: size / 4)
-    } else {
-        v
-    }
-}

apps/ios/bg.lproj/Localizable.strings

@@ -335,8 +335,7 @@
 "above, then choose:" = "по-горе, след това избери:";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+   accept incoming call via notification */
 "Accept" = "Приеми";
 
 /* No comment provided by engineer. */
@@ -345,8 +344,7 @@
 /* notification body */
 "Accept contact request from %@?" = "Приемане на заявка за контакт от %@?";
 
-/* accept contact request via notification
-   swipe action */
+/* accept contact request via notification */
 "Accept incognito" = "Приеми инкогнито";
 
 /* call status */
@@ -643,7 +641,7 @@
 /* rcv group event chat item */
 "blocked %@" = "блокиран %@";
 
-/* marked deleted chat item preview text */
+/* blocked chat item */
 "blocked by admin" = "блокиран от админ";
 
 /* No comment provided by engineer. */
@@ -809,7 +807,7 @@
 /* No comment provided by engineer. */
 "Choose from library" = "Избери от библиотеката";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Clear" = "Изчисти";
 
 /* No comment provided by engineer. */
@@ -986,6 +984,9 @@
 /* notification */
 "Contact is connected" = "Контактът е свързан";
 
+/* No comment provided by engineer. */
+"Contact is not connected yet!" = "Контактът все още не е свързан!";
+
 /* No comment provided by engineer. */
 "Contact name" = "Име на контакт";
 
@@ -1160,8 +1161,7 @@
 /* No comment provided by engineer. */
 "default (yes)" = "по подразбиране (да)";
 
-/* chat item action
-   swipe action */
+/* chat item action */
 "Delete" = "Изтрий";
 
 /* No comment provided by engineer. */
@@ -1200,6 +1200,12 @@
 /* No comment provided by engineer. */
 "Delete contact" = "Изтрий контакт";
 
+/* No comment provided by engineer. */
+"Delete Contact" = "Изтрий контакт";
+
+/* No comment provided by engineer. */
+"Delete contact?\nThis cannot be undone!" = "Изтрий контакт?\nТова не може да бъде отменено!";
+
 /* No comment provided by engineer. */
 "Delete database" = "Изтрий базата данни";
 
@@ -1254,6 +1260,9 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "Изтрий старата база данни?";
 
+/* No comment provided by engineer. */
+"Delete pending connection" = "Изтрий предстоящата връзка";
+
 /* No comment provided by engineer. */
 "Delete pending connection?" = "Изтрий предстоящата връзка?";
 
@@ -1644,6 +1653,9 @@
 /* No comment provided by engineer. */
 "Error deleting connection" = "Грешка при изтриване на връзката";
 
+/* No comment provided by engineer. */
+"Error deleting contact" = "Грешка при изтриване на контакт";
+
 /* No comment provided by engineer. */
 "Error deleting database" = "Грешка при изтриване на базата данни";
 
@@ -1804,7 +1816,7 @@
 /* No comment provided by engineer. */
 "Faster joining and more reliable messages." = "По-бързо присъединяване и по-надеждни съобщения.";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Favorite" = "Любим";
 
 /* No comment provided by engineer. */
@@ -2272,7 +2284,7 @@
 /* No comment provided by engineer. */
 "Japanese interface" = "Японски интерфейс";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Join" = "Присъединяване";
 
 /* No comment provided by engineer. */
@@ -2323,7 +2335,7 @@
 /* No comment provided by engineer. */
 "Learn more" = "Научете повече";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Leave" = "Напусни";
 
 /* No comment provided by engineer. */
@@ -2551,13 +2563,13 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Множество профили за чат";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Mute" = "Без звук";
 
 /* No comment provided by engineer. */
 "Muted when inactive!" = "Без звук при неактивност!";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Name" = "Име";
 
 /* No comment provided by engineer. */
@@ -2707,10 +2719,10 @@
 "One-time invitation link" = "Линк за еднократна покана";
 
 /* No comment provided by engineer. */
-"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "За свързване ще са **необходими** Onion хостове.\nИзисква се активиране на VPN.";
+"Onion hosts will be required for connection. Requires enabling VPN." = "За свързване ще са необходими Onion хостове. Изисква се активиране на VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available.\nRequires compatible VPN." = "Ще се използват Onion хостове, когато са налични.\nИзисква се активиране на VPN.";
+"Onion hosts will be used when available. Requires enabling VPN." = "Ще се използват Onion хостове, когато са налични. Изисква се активиране на VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Няма се използват Onion хостове.";
@@ -3009,7 +3021,7 @@
 /* chat item menu */
 "React…" = "Реагирай…";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Read" = "Прочетено";
 
 /* No comment provided by engineer. */
@@ -3084,8 +3096,7 @@
 /* No comment provided by engineer. */
 "Reduced battery usage" = "Намалена консумация на батерията";
 
-/* reject incoming call via notification
-   swipe action */
+/* reject incoming call via notification */
 "Reject" = "Отхвърляне";
 
 /* No comment provided by engineer. */
@@ -3193,6 +3204,9 @@
 /* chat item action */
 "Reveal" = "Покажи";
 
+/* No comment provided by engineer. */
+"Revert" = "Отмени промените";
+
 /* No comment provided by engineer. */
 "Revoke" = "Отзови";
 
@@ -3322,7 +3336,7 @@
 /* chat item text */
 "security code changed" = "кодът за сигурност е променен";
 
-/* chat item action */
+/* No comment provided by engineer. */
 "Select" = "Избери";
 
 /* No comment provided by engineer. */
@@ -3349,6 +3363,9 @@
 /* No comment provided by engineer. */
 "send direct message" = "изпрати лично съобщение";
 
+/* No comment provided by engineer. */
+"Send direct message" = "Изпрати лично съобщение";
+
 /* No comment provided by engineer. */
 "Send direct message to connect" = "Изпрати лично съобщение за свързване";
 
@@ -3571,6 +3588,9 @@
 /* No comment provided by engineer. */
 "Small groups (max 20)" = "Малки групи (максимум 20)";
 
+/* No comment provided by engineer. */
+"SMP servers" = "SMP сървъри";
+
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Някои не-фатални грешки са възникнали по време на импортиране - може да видите конзолата за повече подробности.";
 
@@ -3670,6 +3690,9 @@
 /* No comment provided by engineer. */
 "Tap to scan" = "Докосни за сканиране";
 
+/* No comment provided by engineer. */
+"Tap to start a new chat" = "Докосни за започване на нов чат";
+
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Времето на изчакване за установяване на TCP връзка";
 
@@ -3883,7 +3906,7 @@
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Неочаквано състояние на миграция";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Unfav." = "Премахни от любимите";
 
 /* No comment provided by engineer. */
@@ -3931,10 +3954,10 @@
 /* authentication reason */
 "Unlock app" = "Отключи приложението";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Unmute" = "Уведомявай";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Unread" = "Непрочетено";
 
 /* No comment provided by engineer. */
@@ -3943,12 +3966,18 @@
 /* No comment provided by engineer. */
 "Update" = "Актуализация";
 
+/* No comment provided by engineer. */
+"Update .onion hosts setting?" = "Актуализиране на настройката за .onion хостове?";
+
 /* No comment provided by engineer. */
 "Update database passphrase" = "Актуализирай паролата на базата данни";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Актуализиране на мрежовите настройки?";
 
+/* No comment provided by engineer. */
+"Update transport isolation mode?" = "Актуализиране на режима на изолация на транспорта?";
+
 /* rcv group event chat item */
 "updated group profile" = "актуализиран профил на групата";
 
@@ -3958,6 +3987,9 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Актуализирането на настройките ще свърже отново клиента към всички сървъри.";
 
+/* No comment provided by engineer. */
+"Updating this setting will re-connect the client to all servers." = "Актуализирането на тази настройка ще свърже повторно клиента към всички сървъри.";
+
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Актуализирай и отвори чата";
 
@@ -4006,6 +4038,9 @@
 /* No comment provided by engineer. */
 "User profile" = "Потребителски профил";
 
+/* No comment provided by engineer. */
+"Using .onion hosts requires compatible VPN provider." = "Използването на .onion хостове изисква съвместим VPN доставчик.";
+
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Използват се сървърите на SimpleX Chat.";
 
@@ -4174,6 +4209,9 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Грешна парола!";
 
+/* No comment provided by engineer. */
+"XFTP servers" = "XFTP сървъри";
+
 /* pref value */
 "yes" = "да";
 
@@ -4309,6 +4347,9 @@
 /* No comment provided by engineer. */
 "You have already requested connection!\nRepeat connection request?" = "Вече сте направили заявката за връзка!\nИзпрати отново заявката за свързване?";
 
+/* No comment provided by engineer. */
+"You have no chats" = "Нямате чатове";
+
 /* No comment provided by engineer. */
 "You have to enter passphrase every time the app starts - it is not stored on the device." = "Трябва да въвеждате парола при всяко стартиране на приложението - тя не се съхранява на устройството.";
 
@@ -4399,6 +4440,9 @@
 /* No comment provided by engineer. */
 "Your chat profiles" = "Вашите чат профили";
 
+/* No comment provided by engineer. */
+"Your contact needs to be online for the connection to complete.\nYou can cancel this connection and remove the contact (and try later with a new link)." = "Вашият контакт трябва да бъде онлайн, за да осъществите връзката.\nМожете да откажете тази връзка и да премахнете контакта (и да опитате по -късно с нов линк).";
+
 /* No comment provided by engineer. */
 "Your contact sent a file that is larger than currently supported maximum size (%@)." = "Вашият контакт изпрати файл, който е по-голям от поддържания в момента максимален размер (%@).";
 

apps/ios/cs.lproj/Localizable.strings

@@ -287,8 +287,7 @@
 "above, then choose:" = "výše, pak vyberte:";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+   accept incoming call via notification */
 "Accept" = "Přijmout";
 
 /* No comment provided by engineer. */
@@ -297,8 +296,7 @@
 /* notification body */
 "Accept contact request from %@?" = "Přijmout žádost o kontakt od %@?";
 
-/* accept contact request via notification
-   swipe action */
+/* accept contact request via notification */
 "Accept incognito" = "Přijmout inkognito";
 
 /* call status */
@@ -659,7 +657,7 @@
 /* No comment provided by engineer. */
 "Choose from library" = "Vybrat z knihovny";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Clear" = "Vyčistit";
 
 /* No comment provided by engineer. */
@@ -788,6 +786,9 @@
 /* notification */
 "Contact is connected" = "Kontakt je připojen";
 
+/* No comment provided by engineer. */
+"Contact is not connected yet!" = "Kontakt ještě není připojen!";
+
 /* No comment provided by engineer. */
 "Contact name" = "Jméno kontaktu";
 
@@ -938,8 +939,7 @@
 /* No comment provided by engineer. */
 "default (yes)" = "výchozí (ano)";
 
-/* chat item action
-   swipe action */
+/* chat item action */
 "Delete" = "Smazat";
 
 /* No comment provided by engineer. */
@@ -972,6 +972,9 @@
 /* No comment provided by engineer. */
 "Delete contact" = "Smazat kontakt";
 
+/* No comment provided by engineer. */
+"Delete Contact" = "Smazat kontakt";
+
 /* No comment provided by engineer. */
 "Delete database" = "Odstranění databáze";
 
@@ -1023,6 +1026,9 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "Smazat starou databázi?";
 
+/* No comment provided by engineer. */
+"Delete pending connection" = "Smazat čekající připojení";
+
 /* No comment provided by engineer. */
 "Delete pending connection?" = "Smazat čekající připojení?";
 
@@ -1347,6 +1353,9 @@
 /* No comment provided by engineer. */
 "Error deleting connection" = "Chyba při mazání připojení";
 
+/* No comment provided by engineer. */
+"Error deleting contact" = "Chyba mazání kontaktu";
+
 /* No comment provided by engineer. */
 "Error deleting database" = "Chyba při mazání databáze";
 
@@ -1477,7 +1486,7 @@
 /* No comment provided by engineer. */
 "Fast and no wait until the sender is online!" = "Rychle a bez čekání, než bude odesílatel online!";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Favorite" = "Oblíbené";
 
 /* No comment provided by engineer. */
@@ -1861,7 +1870,7 @@
 /* No comment provided by engineer. */
 "Japanese interface" = "Japonské rozhraní";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Join" = "Připojte se na";
 
 /* No comment provided by engineer. */
@@ -1891,7 +1900,7 @@
 /* No comment provided by engineer. */
 "Learn more" = "Zjistit více";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Leave" = "Opustit";
 
 /* No comment provided by engineer. */
@@ -2068,13 +2077,13 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Více chatovacích profilů";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Mute" = "Ztlumit";
 
 /* No comment provided by engineer. */
 "Muted when inactive!" = "Ztlumit při neaktivitě!";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Name" = "Jméno";
 
 /* No comment provided by engineer. */
@@ -2206,10 +2215,10 @@
 "One-time invitation link" = "Jednorázový zvací odkaz";
 
 /* No comment provided by engineer. */
-"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Pro připojení budou vyžadováni Onion hostitelé.\nVyžaduje povolení sítě VPN.";
+"Onion hosts will be required for connection. Requires enabling VPN." = "Pro připojení budou vyžadováni Onion hostitelé. Vyžaduje povolení sítě VPN.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available.\nRequires compatible VPN." = "Onion hostitelé budou použiti, pokud jsou k dispozici.\nVyžaduje povolení sítě VPN.";
+"Onion hosts will be used when available. Requires enabling VPN." = "Onion hostitelé budou použiti, pokud jsou k dispozici. Vyžaduje povolení sítě VPN.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion hostitelé nebudou použiti.";
@@ -2436,7 +2445,7 @@
 /* chat item menu */
 "React…" = "Reagovat…";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Read" = "Číst";
 
 /* No comment provided by engineer. */
@@ -2502,8 +2511,7 @@
 /* No comment provided by engineer. */
 "Reduced battery usage" = "Snížení spotřeby baterie";
 
-/* reject incoming call via notification
-   swipe action */
+/* reject incoming call via notification */
 "Reject" = "Odmítnout";
 
 /* No comment provided by engineer. */
@@ -2587,6 +2595,9 @@
 /* chat item action */
 "Reveal" = "Odhalit";
 
+/* No comment provided by engineer. */
+"Revert" = "Vrátit";
+
 /* No comment provided by engineer. */
 "Revoke" = "Odvolat";
 
@@ -2689,7 +2700,7 @@
 /* chat item text */
 "security code changed" = "bezpečnostní kód změněn";
 
-/* chat item action */
+/* No comment provided by engineer. */
 "Select" = "Vybrat";
 
 /* No comment provided by engineer. */
@@ -2716,6 +2727,9 @@
 /* No comment provided by engineer. */
 "send direct message" = "odeslat přímou zprávu";
 
+/* No comment provided by engineer. */
+"Send direct message" = "Odeslat přímou zprávu";
+
 /* No comment provided by engineer. */
 "Send direct message to connect" = "Odeslat přímou zprávu pro připojení";
 
@@ -2908,6 +2922,9 @@
 /* No comment provided by engineer. */
 "Small groups (max 20)" = "Malé skupiny (max. 20)";
 
+/* No comment provided by engineer. */
+"SMP servers" = "SMP servery";
+
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Během importu došlo k nezávažným chybám - podrobnosti naleznete v chat konzoli.";
 
@@ -2983,6 +3000,9 @@
 /* No comment provided by engineer. */
 "Tap to join incognito" = "Klepnutím se připojíte inkognito";
 
+/* No comment provided by engineer. */
+"Tap to start a new chat" = "Klepnutím na zahájíte nový chat";
+
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Časový limit připojení TCP";
 
@@ -3148,7 +3168,7 @@
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Neočekávaný stav přenášení";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Unfav." = "Odobl.";
 
 /* No comment provided by engineer. */
@@ -3187,27 +3207,36 @@
 /* authentication reason */
 "Unlock app" = "Odemknout aplikaci";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Unmute" = "Zrušit ztlumení";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Unread" = "Nepřečtený";
 
 /* No comment provided by engineer. */
 "Update" = "Aktualizovat";
 
+/* No comment provided by engineer. */
+"Update .onion hosts setting?" = "Aktualizovat nastavení hostitelů .onion?";
+
 /* No comment provided by engineer. */
 "Update database passphrase" = "Aktualizovat přístupovou frázi databáze";
 
 /* No comment provided by engineer. */
 "Update network settings?" = "Aktualizovat nastavení sítě?";
 
+/* No comment provided by engineer. */
+"Update transport isolation mode?" = "Aktualizovat režim dopravní izolace?";
+
 /* rcv group event chat item */
 "updated group profile" = "aktualizoval profil skupiny";
 
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Aktualizací nastavení se klient znovu připojí ke všem serverům.";
 
+/* No comment provided by engineer. */
+"Updating this setting will re-connect the client to all servers." = "Aktualizace tohoto nastavení znovu připojí klienta ke všem serverům.";
+
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Zvýšit a otevřít chat";
 
@@ -3241,6 +3270,9 @@
 /* No comment provided by engineer. */
 "User profile" = "Profil uživatele";
 
+/* No comment provided by engineer. */
+"Using .onion hosts requires compatible VPN provider." = "Použití hostitelů .onion vyžaduje kompatibilního poskytovatele VPN.";
+
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Používat servery SimpleX Chat.";
 
@@ -3355,6 +3387,9 @@
 /* No comment provided by engineer. */
 "Wrong passphrase!" = "Špatná přístupová fráze!";
 
+/* No comment provided by engineer. */
+"XFTP servers" = "XFTP servery";
+
 /* pref value */
 "yes" = "ano";
 
@@ -3445,6 +3480,9 @@
 /* No comment provided by engineer. */
 "You could not be verified; please try again." = "Nemohli jste být ověřeni; Zkuste to prosím znovu.";
 
+/* No comment provided by engineer. */
+"You have no chats" = "Nemáte žádné konverzace";
+
 /* No comment provided by engineer. */
 "You have to enter passphrase every time the app starts - it is not stored on the device." = "Musíte zadat přístupovou frázi při každém spuštění aplikace - není uložena v zařízení.";
 
@@ -3526,6 +3564,9 @@
 /* No comment provided by engineer. */
 "Your chat profiles" = "Vaše chat profily";
 
+/* No comment provided by engineer. */
+"Your contact needs to be online for the connection to complete.\nYou can cancel this connection and remove the contact (and try later with a new link)." = "K dokončení připojení, musí být váš kontakt online.\nToto připojení můžete zrušit a kontakt odebrat (a zkusit to později s novým odkazem).";
+
 /* No comment provided by engineer. */
 "Your contact sent a file that is larger than currently supported maximum size (%@)." = "Kontakt odeslal soubor, který je větší než aktuálně podporovaná maximální velikost (%@).";
 

apps/ios/de.lproj/Localizable.strings

@@ -314,13 +314,13 @@
 "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." = "**Für jeden Kontakt und jedes Gruppenmitglied** wird eine separate TCP-Verbindung genutzt.\n**Bitte beachten Sie**: Wenn Sie viele Verbindungen haben, kann der Batterieverbrauch und die Datennutzung wesentlich höher sein und einige Verbindungen können scheitern.";
 
 /* No comment provided by engineer. */
-"Abort" = "Beenden";
+"Abort" = "Abbrechen";
 
 /* No comment provided by engineer. */
-"Abort changing address" = "Wechsel der Empfängeradresse beenden";
+"Abort changing address" = "Wechsel der Empfängeradresse abbrechen";
 
 /* No comment provided by engineer. */
-"Abort changing address?" = "Wechsel der Empfängeradresse beenden?";
+"Abort changing address?" = "Wechsel der Empfängeradresse abbrechen?";
 
 /* No comment provided by engineer. */
 "About SimpleX" = "Über SimpleX";
@@ -338,8 +338,7 @@
 "Accent" = "Akzent";
 
 /* accept contact request via notification
-   accept incoming call via notification
-   swipe action */
+   accept incoming call via notification */
 "Accept" = "Annehmen";
 
 /* No comment provided by engineer. */
@@ -348,8 +347,7 @@
 /* notification body */
 "Accept contact request from %@?" = "Die Kontaktanfrage von %@ annehmen?";
 
-/* accept contact request via notification
-   swipe action */
+/* accept contact request via notification */
 "Accept incognito" = "Inkognito akzeptieren";
 
 /* call status */
@@ -401,7 +399,7 @@
 "Address" = "Adresse";
 
 /* No comment provided by engineer. */
-"Address change will be aborted. Old receiving address will be used." = "Der Wechsel der Empfängeradresse wird beendet. Die bisherige Adresse wird weiter verwendet.";
+"Address change will be aborted. Old receiving address will be used." = "Der Wechsel der Empfängeradresse wird abgebrochen. Die bisherige Adresse wird weiter verwendet.";
 
 /* member role */
 "admin" = "Admin";
@@ -472,9 +470,6 @@
 /* No comment provided by engineer. */
 "Allow calls only if your contact allows them." = "Erlauben Sie Anrufe nur dann, wenn es Ihr Kontakt ebenfalls erlaubt.";
 
-/* No comment provided by engineer. */
-"Allow calls?" = "Anrufe erlauben?";
-
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Erlauben Sie verschwindende Nachrichten nur dann, wenn es Ihr Kontakt ebenfalls erlaubt.";
 
@@ -496,9 +491,6 @@
 /* No comment provided by engineer. */
 "Allow sending disappearing messages." = "Das Senden von verschwindenden Nachrichten erlauben.";
 
-/* No comment provided by engineer. */
-"Allow sharing" = "Teilen erlauben";
-
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Unwiederbringliches löschen von gesendeten Nachrichten erlauben. (24 Stunden)";
 
@@ -595,12 +587,6 @@
 /* No comment provided by engineer. */
 "Archive and upload" = "Archivieren und Hochladen";
 
-/* No comment provided by engineer. */
-"Archive contacts to chat later." = "Kontakte für spätere Chats archivieren.";
-
-/* No comment provided by engineer. */
-"Archived contacts" = "Archivierte Kontakte";
-
 /* No comment provided by engineer. */
 "Archiving database" = "Datenbank wird archiviert";
 
@@ -676,9 +662,6 @@
 /* No comment provided by engineer. */
 "Better messages" = "Verbesserungen bei Nachrichten";
 
-/* No comment provided by engineer. */
-"Better networking" = "Kontrollieren Sie Ihr Netzwerk";
-
 /* No comment provided by engineer. */
 "Black" = "Schwarz";
 
@@ -706,18 +689,12 @@
 /* rcv group event chat item */
 "blocked %@" = "%@ wurde blockiert";
 
-/* marked deleted chat item preview text */
+/* blocked chat item */
 "blocked by admin" = "wurde vom Administrator blockiert";
 
 /* No comment provided by engineer. */
 "Blocked by admin" = "wurde vom Administrator blockiert";
 
-/* No comment provided by engineer. */
-"Blur for better privacy." = "Für bessere Privatsphäre verpixeln.";
-
-/* No comment provided by engineer. */
-"Blur media" = "Medium unscharf machen";
-
 /* No comment provided by engineer. */
 "bold" = "fett";
 
@@ -742,9 +719,6 @@
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Per Chat-Profil (Voreinstellung) oder [per Verbindung](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
-/* No comment provided by engineer. */
-"call" = "Anrufen";
-
 /* No comment provided by engineer. */
 "Call already ended!" = "Anruf ist bereits beendet!";
 
@@ -760,27 +734,15 @@
 /* No comment provided by engineer. */
 "Calls" = "Anrufe";
 
-/* No comment provided by engineer. */
-"Calls prohibited!" = "Anrufe nicht zugelassen!";
-
 /* No comment provided by engineer. */
 "Camera not available" = "Kamera nicht verfügbar";
 
-/* No comment provided by engineer. */
-"Can't call contact" = "Kontakt kann nicht angerufen werden";
-
-/* No comment provided by engineer. */
-"Can't call member" = "Mitglied kann nicht angerufen werden";
-
 /* No comment provided by engineer. */
 "Can't invite contact!" = "Kontakt kann nicht eingeladen werden!";
 
 /* No comment provided by engineer. */
 "Can't invite contacts!" = "Kontakte können nicht eingeladen werden!";
 
-/* No comment provided by engineer. */
-"Can't message member" = "Mitglied kann nicht benachrichtigt werden";
-
 /* No comment provided by engineer. */
 "Cancel" = "Abbrechen";
 
@@ -866,9 +828,6 @@
 /* No comment provided by engineer. */
 "Chat database deleted" = "Chat-Datenbank gelöscht";
 
-/* No comment provided by engineer. */
-"Chat database exported" = "Chat-Datenbank wurde exportiert";
-
 /* No comment provided by engineer. */
 "Chat database imported" = "Chat-Datenbank importiert";
 
@@ -881,9 +840,6 @@
 /* No comment provided by engineer. */
 "Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "Der Chat ist angehalten. Wenn Sie diese Datenbank bereits auf einem anderen Gerät genutzt haben, sollten Sie diese vor dem Starten des Chats wieder zurückspielen.";
 
-/* No comment provided by engineer. */
-"Chat list" = "Chat-Liste";
-
 /* No comment provided by engineer. */
 "Chat migrated!" = "Chat wurde migriert!";
 
@@ -920,7 +876,7 @@
 /* No comment provided by engineer. */
 "Chunks uploaded" = "Daten-Pakete hochgeladen";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Clear" = "Löschen";
 
 /* No comment provided by engineer. */
@@ -935,9 +891,6 @@
 /* No comment provided by engineer. */
 "Clear verification" = "Überprüfung zurücknehmen";
 
-/* No comment provided by engineer. */
-"Color chats with the new themes." = "Farbige Chats mit neuen Designs.";
-
 /* No comment provided by engineer. */
 "Color mode" = "Farbvariante";
 
@@ -965,9 +918,6 @@
 /* No comment provided by engineer. */
 "Confirm" = "Bestätigen";
 
-/* No comment provided by engineer. */
-"Confirm contact deletion?" = "Löschen des Kontakts bestätigen?";
-
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Datenbank-Aktualisierungen bestätigen";
 
@@ -1007,9 +957,6 @@
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "Mit den SimpleX Chat-Entwicklern verbinden.";
 
-/* No comment provided by engineer. */
-"Connect to your friends faster." = "Schneller mit Ihren Freunden verbinden.";
-
 /* No comment provided by engineer. */
 "Connect to yourself?" = "Mit Ihnen selbst verbinden?";
 
@@ -1076,9 +1023,6 @@
 /* No comment provided by engineer. */
 "Connecting server… (error: %@)" = "Mit dem Server verbinden… (Fehler: %@)";
 
-/* No comment provided by engineer. */
-"Connecting to contact, please wait or check later!" = "Verbinde mit Kontakt, bitte warten oder später erneut überprüfen!";
-
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Mit dem Desktop verbinden";
 
@@ -1088,9 +1032,6 @@
 /* No comment provided by engineer. */
 "Connection" = "Verbindung";
 
-/* No comment provided by engineer. */
-"Connection and servers status." = "Verbindungs- und Server-Status.";
-
 /* No comment provided by engineer. */
 "Connection error" = "Verbindungsfehler";
 
@@ -1100,9 +1041,6 @@
 /* chat list item title (it should not be shown */
 "connection established" = "Verbindung hergestellt";
 
-/* No comment provided by engineer. */
-"Connection notifications" = "Verbindungsbenachrichtigungen";
-
 /* No comment provided by engineer. */
 "Connection request sent!" = "Verbindungsanfrage wurde gesendet!";
 
@@ -1130,9 +1068,6 @@
 /* No comment provided by engineer. */
 "Contact already exists" = "Der Kontakt ist bereits vorhanden";
 
-/* No comment provided by engineer. */
-"Contact deleted!" = "Kontakt gelöscht!";
-
 /* No comment provided by engineer. */
 "contact has e2e encryption" = "Kontakt nutzt E2E-Verschlüsselung";
 
@@ -1146,7 +1081,7 @@
 "Contact is connected" = "Mit Ihrem Kontakt verbunden";
 
 /* No comment provided by engineer. */
-"Contact is deleted." = "Kontakt wurde gelöscht.";
+"Contact is not connected yet!" = "Ihr Kontakt ist noch nicht verbunden!";
 
 /* No comment provided by engineer. */
 "Contact name" = "Kontaktname";
@@ -1154,9 +1089,6 @@
 /* No comment provided by engineer. */
 "Contact preferences" = "Kontakt-Präferenzen";
 
-/* No comment provided by engineer. */
-"Contact will be deleted - this cannot be undone!" = "Kontakt wird gelöscht. Dies kann nicht rückgängig gemacht werden!";
-
 /* No comment provided by engineer. */
 "Contacts" = "Kontakte";
 
@@ -1166,9 +1098,6 @@
 /* No comment provided by engineer. */
 "Continue" = "Weiter";
 
-/* No comment provided by engineer. */
-"Conversation deleted!" = "Unterhaltung gelöscht!";
-
 /* No comment provided by engineer. */
 "Copy" = "Kopieren";
 
@@ -1349,13 +1278,9 @@
 /* No comment provided by engineer. */
 "default (yes)" = "Voreinstellung (Ja)";
 
-/* chat item action
-   swipe action */
+/* chat item action */
 "Delete" = "Löschen";
 
-/* No comment provided by engineer. */
-"Delete %lld messages of members?" = "%lld Nachrichten der Mitglieder löschen?";
-
 /* No comment provided by engineer. */
 "Delete %lld messages?" = "%lld Nachrichten löschen?";
 
@@ -1393,7 +1318,10 @@
 "Delete contact" = "Kontakt löschen";
 
 /* No comment provided by engineer. */
-"Delete contact?" = "Kontakt löschen?";
+"Delete Contact" = "Kontakt löschen";
+
+/* No comment provided by engineer. */
+"Delete contact?\nThis cannot be undone!" = "Kontakt löschen?\nDies kann nicht rückgängig gemacht werden!";
 
 /* No comment provided by engineer. */
 "Delete database" = "Datenbank löschen";
@@ -1449,6 +1377,9 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "Alte Datenbank löschen?";
 
+/* No comment provided by engineer. */
+"Delete pending connection" = "Ausstehende Verbindung löschen";
+
 /* No comment provided by engineer. */
 "Delete pending connection?" = "Ausstehende Verbindung löschen?";
 
@@ -1458,15 +1389,9 @@
 /* server test step */
 "Delete queue" = "Lösche Warteschlange";
 
-/* No comment provided by engineer. */
-"Delete up to 20 messages at once." = "Löschen Sie bis zu 20 Nachrichten auf einmal.";
-
 /* No comment provided by engineer. */
 "Delete user profile?" = "Benutzerprofil löschen?";
 
-/* No comment provided by engineer. */
-"Delete without notification" = "Ohne Benachrichtigung löschen";
-
 /* deleted chat item */
 "deleted" = "Gelöscht";
 
@@ -1509,15 +1434,9 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Desktop-Geräte";
 
-/* No comment provided by engineer. */
-"Destination server address of %@ is incompatible with forwarding server %@ settings." = "Adresse des Zielservers von %@ ist nicht kompatibel mit den Einstellungen des Weiterleitungsservers %@.";
-
 /* snd error text */
 "Destination server error: %@" = "Zielserver-Fehler: %@";
 
-/* No comment provided by engineer. */
-"Destination server version of %@ is incompatible with forwarding server %@." = "Die Version des Zielservers %@ ist nicht kompatibel mit dem Weiterleitungsserver %@.";
-
 /* No comment provided by engineer. */
 "Detailed statistics" = "Detaillierte Statistiken";
 
@@ -1527,9 +1446,6 @@
 /* No comment provided by engineer. */
 "Develop" = "Entwicklung";
 
-/* No comment provided by engineer. */
-"Developer options" = "Optionen für Entwickler";
-
 /* No comment provided by engineer. */
 "Developer tools" = "Entwicklertools";
 
@@ -1569,9 +1485,6 @@
 /* No comment provided by engineer. */
 "disabled" = "deaktiviert";
 
-/* No comment provided by engineer. */
-"Disabled" = "Deaktiviert";
-
 /* No comment provided by engineer. */
 "Disappearing message" = "Verschwindende Nachricht";
 
@@ -1719,9 +1632,6 @@
 /* enabled status */
 "enabled" = "Aktiviert";
 
-/* No comment provided by engineer. */
-"Enabled" = "Aktiviert";
-
 /* No comment provided by engineer. */
 "Enabled for" = "Aktiviert für";
 
@@ -1843,7 +1753,7 @@
 "Error" = "Fehler";
 
 /* No comment provided by engineer. */
-"Error aborting address change" = "Fehler beim Beenden des Adresswechsels";
+"Error aborting address change" = "Fehler beim Abbrechen des Adresswechsels";
 
 /* No comment provided by engineer. */
 "Error accepting contact request" = "Fehler beim Annehmen der Kontaktanfrage";
@@ -1863,9 +1773,6 @@
 /* No comment provided by engineer. */
 "Error changing setting" = "Fehler beim Ändern der Einstellung";
 
-/* No comment provided by engineer. */
-"Error connecting to forwarding server %@. Please try later." = "Fehler beim Verbinden mit dem Weiterleitungsserver %@. Bitte versuchen Sie es später erneut.";
-
 /* No comment provided by engineer. */
 "Error creating address" = "Fehler beim Erstellen der Adresse";
 
@@ -1896,6 +1803,9 @@
 /* No comment provided by engineer. */
 "Error deleting connection" = "Fehler beim Löschen der Verbindung";
 
+/* No comment provided by engineer. */
+"Error deleting contact" = "Fehler beim Löschen des Kontakts";
+
 /* No comment provided by engineer. */
 "Error deleting database" = "Fehler beim Löschen der Datenbank";
 
@@ -2077,7 +1987,7 @@
 /* No comment provided by engineer. */
 "Faster joining and more reliable messages." = "Schnellerer Gruppenbeitritt und zuverlässigere Nachrichtenzustellung.";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Favorite" = "Favorit";
 
 /* No comment provided by engineer. */
@@ -2176,15 +2086,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Weitergeleitet aus";
 
-/* No comment provided by engineer. */
-"Forwarding server %@ failed to connect to destination server %@. Please try later." = "Weiterleitungsserver %@ konnte sich nicht mit dem Zielserver %@ verbinden. Bitte versuchen Sie es später erneut.";
-
-/* No comment provided by engineer. */
-"Forwarding server address is incompatible with network settings: %@." = "Adresse des Weiterleitungsservers ist nicht kompatibel mit den Netzwerkeinstellungen: %@.";
-
-/* No comment provided by engineer. */
-"Forwarding server version is incompatible with network settings: %@." = "Version des Weiterleitungsservers ist nicht kompatibel mit den Netzwerkeinstellungen: %@.";
-
 /* snd error text */
 "Forwarding server: %@\nDestination server error: %@" = "Weiterleitungsserver: %1$@\nZielserver Fehler: %2$@";
 
@@ -2536,9 +2437,6 @@
 /* group name */
 "invitation to group %@" = "Einladung zur Gruppe %@";
 
-/* No comment provided by engineer. */
-"invite" = "Einladen";
-
 /* No comment provided by engineer. */
 "Invite friends" = "Freunde einladen";
 
@@ -2584,9 +2482,6 @@
 /* No comment provided by engineer. */
 "It can happen when:\n1. The messages expired in the sending client after 2 days or on the server after 30 days.\n2. Message decryption failed, because you or your contact used old database backup.\n3. The connection was compromised." = "Dies kann unter folgenden Umständen passieren:\n1. Die Nachrichten verfallen auf dem sendenden Client-System nach 2 Tagen oder auf dem Server nach 30 Tagen.\n2. Die Nachrichten-Entschlüsselung ist fehlgeschlagen, da von Ihnen oder Ihrem Kontakt ein altes Datenbank-Backup genutzt wurde.\n3. Die Verbindung wurde kompromittiert.";
 
-/* No comment provided by engineer. */
-"It protects your IP address and connections." = "Ihre IP-Adresse und Verbindungen werden geschützt.";
-
 /* No comment provided by engineer. */
 "It seems like you are already connected via this link. If it is not the case, there was an error (%@)." = "Es sieht so aus, als ob Sie bereits über diesen Link verbunden sind. Wenn das nicht der Fall ist, gab es einen Fehler (%@).";
 
@@ -2599,7 +2494,7 @@
 /* No comment provided by engineer. */
 "Japanese interface" = "Japanische Benutzeroberfläche";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Join" = "Beitreten";
 
 /* No comment provided by engineer. */
@@ -2629,9 +2524,6 @@
 /* No comment provided by engineer. */
 "Keep" = "Behalten";
 
-/* No comment provided by engineer. */
-"Keep conversation" = "Unterhaltung behalten";
-
 /* No comment provided by engineer. */
 "Keep the app open to use it from desktop" = "Die App muss geöffnet bleiben, um sie vom Desktop aus nutzen zu können";
 
@@ -2653,7 +2545,7 @@
 /* No comment provided by engineer. */
 "Learn more" = "Mehr erfahren";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Leave" = "Verlassen";
 
 /* No comment provided by engineer. */
@@ -2743,12 +2635,6 @@
 /* No comment provided by engineer. */
 "Max 30 seconds, received instantly." = "Max. 30 Sekunden, sofort erhalten.";
 
-/* No comment provided by engineer. */
-"Media & file servers" = "Medien- und Datei-Server";
-
-/* blur media */
-"Medium" = "Medium";
-
 /* member role */
 "member" = "Mitglied";
 
@@ -2776,9 +2662,6 @@
 /* No comment provided by engineer. */
 "Menus" = "Menüs";
 
-/* No comment provided by engineer. */
-"message" = "Nachricht";
-
 /* item status text */
 "Message delivery error" = "Fehler bei der Nachrichtenzustellung";
 
@@ -2816,7 +2699,10 @@
 "Message reception" = "Nachrichtenempfang";
 
 /* No comment provided by engineer. */
-"Message servers" = "Nachrichten-Server";
+"Message routing fallback" = "Fallback für das Nachrichten-Routing";
+
+/* No comment provided by engineer. */
+"Message routing mode" = "Modus für das Nachrichten-Routing";
 
 /* No comment provided by engineer. */
 "Message source remains private." = "Die Nachrichtenquelle bleibt privat.";
@@ -2927,15 +2813,12 @@
 "Multiple chat profiles" = "Mehrere Chat-Profile";
 
 /* No comment provided by engineer. */
-"mute" = "Stummschalten";
-
-/* swipe action */
 "Mute" = "Stummschalten";
 
 /* No comment provided by engineer. */
 "Muted when inactive!" = "Bei Inaktivität stummgeschaltet!";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Name" = "Name";
 
 /* No comment provided by engineer. */
@@ -2962,9 +2845,6 @@
 /* No comment provided by engineer. */
 "New chat" = "Neuer Chat";
 
-/* No comment provided by engineer. */
-"New chat experience 🎉" = "Neue Chat-Erfahrung 🎉";
-
 /* notification */
 "New contact request" = "Neue Kontaktanfrage";
 
@@ -2983,9 +2863,6 @@
 /* No comment provided by engineer. */
 "New in %@" = "Neu in %@";
 
-/* No comment provided by engineer. */
-"New media options" = "Neue Medien-Optionen";
-
 /* No comment provided by engineer. */
 "New member role" = "Neue Mitgliedsrolle";
 
@@ -3055,9 +2932,6 @@
 /* No comment provided by engineer. */
 "Not compatible!" = "Nicht kompatibel!";
 
-/* No comment provided by engineer. */
-"Nothing selected" = "Nichts ausgewählt";
-
 /* No comment provided by engineer. */
 "Notifications" = "Benachrichtigungen";
 
@@ -3103,10 +2977,10 @@
 "One-time invitation link" = "Einmal-Einladungslink";
 
 /* No comment provided by engineer. */
-"Onion hosts will be **required** for connection.\nRequires compatible VPN." = "Für diese Verbindung werden Onion-Hosts benötigt.\nDies erfordert die Aktivierung eines VPNs.";
+"Onion hosts will be required for connection. Requires enabling VPN." = "Für diese Verbindung werden Onion-Hosts benötigt. Dies erfordert die Aktivierung eines VPNs.";
 
 /* No comment provided by engineer. */
-"Onion hosts will be used when available.\nRequires compatible VPN." = "Wenn Onion-Hosts verfügbar sind, werden sie verwendet.\nDies erfordert die Aktivierung eines VPNs.";
+"Onion hosts will be used when available. Requires enabling VPN." = "Wenn Onion-Hosts verfügbar sind, werden sie verwendet. Dies erfordert die Aktivierung eines VPNs.";
 
 /* No comment provided by engineer. */
 "Onion hosts will not be used." = "Onion-Hosts werden nicht verwendet.";
@@ -3114,9 +2988,6 @@
 /* No comment provided by engineer. */
 "Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." = "Nur die Endgeräte speichern die Benutzerprofile, Kontakte, Gruppen und Nachrichten, welche über eine **2-Schichten Ende-zu-Ende-Verschlüsselung** gesendet werden.";
 
-/* No comment provided by engineer. */
-"Only delete conversation" = "Nur die Unterhaltung löschen";
-
 /* No comment provided by engineer. */
 "Only group owners can change group preferences." = "Gruppen-Präferenzen können nur von Gruppen-Eigentümern geändert werden.";
 
@@ -3273,12 +3144,6 @@
 /* No comment provided by engineer. */
 "PING interval" = "PING-Intervall";
 
-/* No comment provided by engineer. */
-"Play from the chat list." = "Direkt aus der Chat-Liste abspielen.";
-
-/* No comment provided by engineer. */
-"Please ask your contact to enable calls." = "Bitten Sie Ihren Kontakt darum, Anrufe zu aktivieren.";
-
 /* No comment provided by engineer. */
 "Please ask your contact to enable sending voice messages." = "Bitten Sie Ihren Kontakt darum, das Senden von Sprachnachrichten zu aktivieren.";
 
@@ -3459,13 +3324,10 @@
 /* No comment provided by engineer. */
 "Rate the app" = "Bewerten Sie die App";
 
-/* No comment provided by engineer. */
-"Reachable chat toolbar" = "Erreichbare Chat-Symbolleiste";
-
 /* chat item menu */
 "React…" = "Reagiere…";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Read" = "Gelesen";
 
 /* No comment provided by engineer. */
@@ -3567,8 +3429,7 @@
 /* No comment provided by engineer. */
 "Reduced battery usage" = "Reduzierter Batterieverbrauch";
 
-/* reject incoming call via notification
-   swipe action */
+/* reject incoming call via notification */
 "Reject" = "Ablehnen";
 
 /* No comment provided by engineer. */
@@ -3649,9 +3510,6 @@
 /* No comment provided by engineer. */
 "Reset" = "Zurücksetzen";
 
-/* No comment provided by engineer. */
-"Reset all hints" = "Alle Hinweise zurücksetzen";
-
 /* No comment provided by engineer. */
 "Reset all statistics" = "Alle Statistiken zurücksetzen";
 
@@ -3694,6 +3552,9 @@
 /* chat item action */
 "Reveal" = "Aufdecken";
 
+/* No comment provided by engineer. */
+"Revert" = "Zurückkehren";
+
 /* No comment provided by engineer. */
 "Revoke" = "Widerrufen";
 
@@ -3727,9 +3588,6 @@
 /* No comment provided by engineer. */
 "Save and notify group members" = "Speichern und Gruppenmitglieder benachrichtigen";
 
-/* No comment provided by engineer. */
-"Save and reconnect" = "Speichern und neu verbinden";
-
 /* No comment provided by engineer. */
 "Save and update group profile" = "Gruppen-Profil sichern und aktualisieren";
 
@@ -3805,9 +3663,6 @@
 /* No comment provided by engineer. */
 "Scan server QR code" = "Scannen Sie den QR-Code des Servers";
 
-/* No comment provided by engineer. */
-"search" = "Suchen";
-
 /* No comment provided by engineer. */
 "Search" = "Suche";
 
@@ -3844,11 +3699,8 @@
 /* chat item text */
 "security code changed" = "Sicherheitscode wurde geändert";
 
-/* chat item action */
-"Select" = "Auswählen";
-
 /* No comment provided by engineer. */
-"Selected %lld" = "%lld ausgewählt";
+"Select" = "Auswählen";
 
 /* No comment provided by engineer. */
 "Selected chat preferences prohibit this message." = "Diese Nachricht ist wegen der gewählten Chat-Einstellungen nicht erlaubt.";
@@ -3877,6 +3729,9 @@
 /* No comment provided by engineer. */
 "send direct message" = "Direktnachricht senden";
 
+/* No comment provided by engineer. */
+"Send direct message" = "Direktnachricht senden";
+
 /* No comment provided by engineer. */
 "Send direct message to connect" = "Eine Direktnachricht zum Verbinden senden";
 
@@ -3892,9 +3747,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Live Nachricht senden";
 
-/* No comment provided by engineer. */
-"Send message to enable calls." = "Nachricht senden, um Anrufe zu aktivieren.";
-
 /* No comment provided by engineer. */
 "Send messages directly when IP address is protected and your or destination server does not support private routing." = "Nachrichten werden direkt versendet, wenn die IP-Adresse geschützt ist, und Ihr oder der Zielserver kein privates Routing unterstützt.";
 
@@ -4075,18 +3927,12 @@
 /* No comment provided by engineer. */
 "Share address with contacts?" = "Die Adresse mit Kontakten teilen?";
 
-/* No comment provided by engineer. */
-"Share from other apps." = "Aus anderen Apps heraus teilen.";
-
 /* No comment provided by engineer. */
 "Share link" = "Link teilen";
 
 /* No comment provided by engineer. */
 "Share this 1-time invite link" = "Teilen Sie diesen Einmal-Einladungslink";
 
-/* No comment provided by engineer. */
-"Share to SimpleX" = "Mit SimpleX teilen";
-
 /* No comment provided by engineer. */
 "Share with contacts" = "Mit Kontakten teilen";
 
@@ -4180,18 +4026,12 @@
 /* No comment provided by engineer. */
 "SMP server" = "SMP-Server";
 
-/* blur media */
-"Soft" = "Weich";
-
 /* No comment provided by engineer. */
-"Some file(s) were not exported:" = "Einzelne Datei(en) wurde(n) nicht exportiert:";
+"SMP servers" = "SMP-Server";
 
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Während des Imports sind einige nicht schwerwiegende Fehler aufgetreten - in der Chat-Konsole finden Sie weitere Einzelheiten.";
 
-/* No comment provided by engineer. */
-"Some non-fatal errors occurred during import:" = "Während des Imports traten ein paar nicht schwerwiegende Fehler auf:";
-
 /* notification title */
 "Somebody" = "Jemand";
 
@@ -4258,9 +4098,6 @@
 /* No comment provided by engineer. */
 "strike" = "durchstreichen";
 
-/* blur media */
-"Strong" = "Hart";
-
 /* No comment provided by engineer. */
 "Submit" = "Bestätigen";
 
@@ -4307,7 +4144,7 @@
 "Tap to scan" = "Zum Scannen tippen";
 
 /* No comment provided by engineer. */
-"TCP connection" = "TCP-Verbindung";
+"Tap to start a new chat" = "Zum Starten eines neuen Chats tippen";
 
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Timeout der TCP-Verbindung";
@@ -4384,12 +4221,6 @@
 /* No comment provided by engineer. */
 "The message will be marked as moderated for all members." = "Diese Nachricht wird für alle Mitglieder als moderiert gekennzeichnet.";
 
-/* No comment provided by engineer. */
-"The messages will be deleted for all members." = "Die Nachrichten werden für alle Mitglieder gelöscht werden.";
-
-/* No comment provided by engineer. */
-"The messages will be marked as moderated for all members." = "Die Nachrichten werden für alle Mitglieder als moderiert gekennzeichnet werden.";
-
 /* No comment provided by engineer. */
 "The next generation of private messaging" = "Die nächste Generation von privatem Messaging";
 
@@ -4501,15 +4332,9 @@
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Um die Ende-zu-Ende-Verschlüsselung mit Ihrem Kontakt zu überprüfen, müssen Sie den Sicherheitscode in Ihren Apps vergleichen oder scannen.";
 
-/* No comment provided by engineer. */
-"Toggle chat list:" = "Chat-Liste umschalten:";
-
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Inkognito beim Verbinden einschalten.";
 
-/* No comment provided by engineer. */
-"Toolbar opacity" = "Deckkraft der Symbolleiste";
-
 /* No comment provided by engineer. */
 "Total" = "Summe aller Abonnements";
 
@@ -4558,7 +4383,7 @@
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Unerwarteter Migrationsstatus";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Unfav." = "Fav. entf.";
 
 /* No comment provided by engineer. */
@@ -4586,7 +4411,7 @@
 "Unknown error" = "Unbekannter Fehler";
 
 /* No comment provided by engineer. */
-"unknown servers" = "Unbekannte Relais";
+"unknown relays" = "Unbekannte Relais";
 
 /* No comment provided by engineer. */
 "Unknown servers!" = "Unbekannte Server!";
@@ -4613,15 +4438,12 @@
 "Unlock app" = "App entsperren";
 
 /* No comment provided by engineer. */
-"unmute" = "Stummschaltung aufheben";
-
-/* swipe action */
 "Unmute" = "Stummschaltung aufheben";
 
 /* No comment provided by engineer. */
 "unprotected" = "Ungeschützt";
 
-/* swipe action */
+/* No comment provided by engineer. */
 "Unread" = "Ungelesen";
 
 /* No comment provided by engineer. */
@@ -4630,6 +4452,9 @@
 /* No comment provided by engineer. */
 "Update" = "Aktualisieren";
 
+/* No comment provided by engineer. */
+"Update .onion hosts setting?" = "Einstellung für .onion-Hosts aktualisieren?";
+
 /* No comment provided by engineer. */
 "Update database passphrase" = "Datenbank-Passwort aktualisieren";
 
@@ -4637,7 +4462,7 @@
 "Update network settings?" = "Netzwerkeinstellungen aktualisieren?";
 
 /* No comment provided by engineer. */
-"Update settings?" = "Einstellungen aktualisieren?";
+"Update transport isolation mode?" = "Transport-Isolations-Modus aktualisieren?";
 
 /* rcv group event chat item */
 "updated group profile" = "Aktualisiertes Gruppenprofil";
@@ -4648,6 +4473,9 @@
 /* No comment provided by engineer. */
 "Updating settings will re-connect the client to all servers." = "Die Aktualisierung der Einstellungen wird den Client wieder mit allen Servern verbinden.";
 
+/* No comment provided by engineer. */
+"Updating this setting will re-connect the client to all servers." = "Die Aktualisierung dieser Einstellung wird den Client wieder mit allen Servern verbinden.";
+
 /* No comment provided by engineer. */
 "Upgrade and open chat" = "Aktualisieren und den Chat öffnen";
 
@@ -4708,15 +4536,15 @@
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Die App kann während eines Anrufs genutzt werden.";
 
-/* No comment provided by engineer. */
-"Use the app with one hand." = "Die App mit einer Hand nutzen.";
-
 /* No comment provided by engineer. */
 "User profile" = "Benutzerprofil";
 
 /* No comment provided by engineer. */
 "User selection" = "Benutzer-Auswahl";
 
+/* No comment provided by engineer. */
+"Using .onion hosts requires compatible VPN provider." = "Für die Nutzung von .onion-Hosts sind kompatible VPN-Anbieter erforderlich.";
+
 /* No comment provided by engineer. */
 "Using SimpleX Chat servers." = "Verwendung von SimpleX-Chat-Servern.";
 
@@ -4765,9 +4593,6 @@
 /* No comment provided by engineer. */
 "Via secure quantum resistant protocol." = "Über ein sicheres quantenbeständiges Protokoll.";
 
-/* No comment provided by engineer. */
-"video" = "Video";
-
 /* No comment provided by engineer. */
 "Video call" = "Videoanruf";
 
@@ -4912,6 +4737,9 @@
 /* No comment provided by engineer. */
 "XFTP server" = "XFTP-Server";
 
+/* No comment provided by engineer. */
+"XFTP servers" = "XFTP-Server";
+
 /* pref value */
 "yes" = "Ja";
 
@@ -4978,9 +4806,6 @@
 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "Sie können Anrufe ohne Geräte- und App-Authentifizierung vom Sperrbildschirm aus annehmen.";
 
-/* No comment provided by engineer. */
-"You can change it in Appearance settings." = "Kann von Ihnen in den Erscheinungsbild-Einstellungen geändert werden.";
-
 /* No comment provided by engineer. */
 "You can create it later" = "Sie können dies später erstellen";
 
@@ -5002,9 +4827,6 @@
 /* notification body */
 "You can now chat with %@" = "Sie können nun Nachrichten an %@ versenden";
 
-/* No comment provided by engineer. */
-"You can send messages to %@ from Archived contacts." = "Sie können aus den archivierten Kontakten heraus Nachrichten an %@ versenden.";
-
 /* No comment provided by engineer. */
 "You can set lock screen notification preview via settings." = "Über die Geräte-Einstellungen können Sie die Benachrichtigungsvorschau im Sperrbildschirm erlauben.";
 
@@ -5020,9 +4842,6 @@
 /* No comment provided by engineer. */
 "You can start chat via app Settings / Database or by restarting the app" = "Sie können den Chat über die App-Einstellungen / Datenbank oder durch Neustart der App starten";
 
-/* No comment provided by engineer. */
-"You can still view conversation with %@ in the list of chats." = "Sie können in der Chatliste weiterhin die Unterhaltung mit %@ einsehen.";
-
 /* No comment provided by engineer. */
 "You can turn on SimpleX Lock via Settings." = "Sie können die SimpleX-Sperre über die Einstellungen aktivieren.";
 
@@ -5059,6 +4878,9 @@
 /* No comment provided by engineer. */
 "You have already requested connection!\nRepeat connection request?" = "Sie haben bereits ein Verbindungsanfrage beantragt!\nVerbindungsanfrage wiederholen?";
 
+/* No comment provided by engineer. */
+"You have no chats" = "Sie haben keine Chats";
+
 /* No comment provided by engineer. */
 "You have to enter passphrase every time the app starts - it is not stored on the device." = "Sie müssen das Passwort jedes Mal eingeben, wenn die App startet. Es wird nicht auf dem Gerät gespeichert.";
 
@@ -5074,18 +4896,9 @@
 /* snd group event chat item */
 "you left" = "Sie haben verlassen";
 
-/* No comment provided by engineer. */
-"You may migrate the exported database." = "Sie können die exportierte Datenbank migrieren.";
-
-/* No comment provided by engineer. */
-"You may save the exported archive." = "Sie können das exportierte Archiv speichern.";
-
 /* No comment provided by engineer. */
 "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." = "Sie dürfen die neueste Version Ihrer Chat-Datenbank NUR auf einem Gerät verwenden, andernfalls erhalten Sie möglicherweise keine Nachrichten mehr von einigen Ihrer Kontakte.";
 
-/* No comment provided by engineer. */
-"You need to allow your contact to call to be able to call them." = "Sie müssen Ihrem Kontakt Anrufe zu Ihnen erlauben, bevor Sie ihn selbst anrufen können.";
-
 /* No comment provided by engineer. */
 "You need to allow your contact to send voice messages to be able to send them." = "Sie müssen Ihrem Kontakt das Senden von Sprachnachrichten erlauben, um diese senden zu können.";
 
@@ -5158,6 +4971,9 @@
 /* No comment provided by engineer. */
 "Your chat profiles" = "Ihre Chat-Profile";
 
+/* No comment provided by engineer. */
+"Your contact needs to be online for the connection to complete.\nYou can cancel this connection and remove the contact (and try later with a new link)." = "Damit die Verbindung hergestellt werden kann, muss Ihr Kontakt online sein.\nSie können diese Verbindung abbrechen und den Kontakt entfernen (und es später nochmals mit einem neuen Link versuchen).";
+
 /* No comment provided by engineer. */
 "Your contact sent a file that is larger than currently supported maximum size (%@)." = "Ihr Kontakt hat eine Datei gesendet, die größer ist als die derzeit unterstützte maximale Größe (%@).";