simplexmq

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

@@ -43,86 +43,6 @@ private func addTermItem(_ items: inout [TerminalItem], _ item: TerminalItem) {
     items.append(item)
 }
 
-class ItemsModel: ObservableObject {
-    static let shared = ItemsModel()
-    private let publisher = ObservableObjectPublisher()
-    private var bag = Set<AnyCancellable>()
-    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 {
     @Published var onboardingStage: OnboardingStage?
     @Published var setDeliveryReceipts = false
@@ -145,8 +65,11 @@ 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?
+    @Published var reversedChatItems: [ChatItem] = []
     var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
     @Published var chatToTop: String?
     @Published var groupMembers: [GMember] = []
@@ -183,6 +106,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)
 
@@ -192,8 +117,6 @@ final class ChatModel: ObservableObject {
 
     static let shared = ChatModel()
 
-    let im = ItemsModel.shared
-
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
     let ntfEnableLocal = true
@@ -289,17 +212,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 +289,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 +300,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 +317,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]))
         }
@@ -425,7 +343,7 @@ final class ChatModel: ObservableObject {
         var res: Bool
         if let chat = getChat(cInfo.id) {
             if let pItem = chat.chatItems.last {
-                if pItem.id == cItem.id || (chatId == cInfo.id && im.reversedChatItems.first(where: { $0.id == cItem.id }) == nil) {
+                if pItem.id == cItem.id || (chatId == cInfo.id && reversedChatItems.first(where: { $0.id == cItem.id }) == nil) {
                     chat.chatItems = [cItem]
                 }
             } else {
@@ -455,8 +373,7 @@ final class ChatModel: ObservableObject {
                 if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
                     ci.meta.itemStatus = status
                 }
-                im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
-                im.itemAdded = true
+                reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
             }
             return true
         }
@@ -480,17 +397,17 @@ final class ChatModel: ObservableObject {
     }
 
     private func _updateChatItem(at i: Int, with cItem: ChatItem) {
-        im.reversedChatItems[i] = cItem
-        im.reversedChatItems[i].viewTimestamp = .now
+        reversedChatItems[i] = cItem
+        reversedChatItems[i].viewTimestamp = .now
     }
 
     func getChatItemIndex(_ cItem: ChatItem) -> Int? {
-        im.reversedChatItems.firstIndex(where: { $0.id == cItem.id })
+        reversedChatItems.firstIndex(where: { $0.id == cItem.id })
     }
 
     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) {
@@ -502,7 +419,7 @@ final class ChatModel: ObservableObject {
         if chatId == cInfo.id {
             if let i = getChatItemIndex(cItem) {
                 _ = withAnimation {
-                    im.reversedChatItems.remove(at: i)
+                    self.reversedChatItems.remove(at: i)
                 }
             }
         }
@@ -510,16 +427,16 @@ final class ChatModel: ObservableObject {
     }
 
     func nextChatItemData<T>(_ chatItemId: Int64, previous: Bool, map: @escaping (ChatItem) -> T?) -> T? {
-        guard var i = im.reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else { return nil }
+        guard var i = reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else { return nil }
         if previous {
-            while i < im.reversedChatItems.count - 1 {
+            while i < reversedChatItems.count - 1 {
                 i += 1
-                if let res = map(im.reversedChatItems[i]) { return res }
+                if let res = map(reversedChatItems[i]) { return res }
             }
         } else {
             while i > 0 {
                 i -= 1
-                if let res = map(im.reversedChatItems[i]) { return res }
+                if let res = map(reversedChatItems[i]) { return res }
             }
         }
         return nil
@@ -550,8 +467,7 @@ final class ChatModel: ObservableObject {
     func addLiveDummy(_ chatInfo: ChatInfo) -> ChatItem {
         let cItem = ChatItem.liveDummy(chatInfo.chatType)
         withAnimation {
-            im.reversedChatItems.insert(cItem, at: 0)
-            im.itemAdded = true
+            reversedChatItems.insert(cItem, at: 0)
         }
         return cItem
     }
@@ -559,15 +475,15 @@ final class ChatModel: ObservableObject {
     func removeLiveDummy(animated: Bool = true) {
         if hasLiveDummy {
             if animated {
-                withAnimation { _ = im.reversedChatItems.removeFirst() }
+                withAnimation { _ = reversedChatItems.removeFirst() }
             } else {
-                _ = im.reversedChatItems.removeFirst()
+                _ = reversedChatItems.removeFirst()
             }
         }
     }
 
     private var hasLiveDummy: Bool {
-        im.reversedChatItems.first?.isLiveDummy == true
+        reversedChatItems.first?.isLiveDummy == true
     }
 
     func markChatItemsRead(_ cInfo: ChatInfo) {
@@ -584,7 +500,7 @@ final class ChatModel: ObservableObject {
 
     private func markCurrentChatRead(fromIndex i: Int = 0) {
         var j = i
-        while j < im.reversedChatItems.count {
+        while j < reversedChatItems.count {
             markChatItemRead_(j)
             j += 1
         }
@@ -598,7 +514,7 @@ final class ChatModel: ObservableObject {
                     var unreadBelow = 0
                     var j = i - 1
                     while j >= 0 {
-                        if case .rcvNew = self.im.reversedChatItems[j].meta.itemStatus {
+                        if case .rcvNew = self.reversedChatItems[j].meta.itemStatus {
                             unreadBelow += 1
                         }
                         j -= 1
@@ -633,146 +549,56 @@ final class ChatModel: ObservableObject {
         // clear current chat
         if chatId == cInfo.id {
             chatItemStatuses = [:]
-            im.reversedChatItems = []
+            reversedChatItems = []
         }
     }
 
     func markChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) async {
         if chatId == cInfo.id,
            let itemIndex = getChatItemIndex(cItem),
-           im.reversedChatItems[itemIndex].isRcvNew {
+           let chatIndex = getChatIndex(cInfo.id),
+           reversedChatItems[itemIndex].isRcvNew {
             await MainActor.run {
                 withTransaction(Transaction()) {
                     // update current chat
                     markChatItemRead_(itemIndex)
                     // update preview
-                    unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
+                    decreaseUnreadCounter(chatIndex)
                 }
             }
         }
     }
 
-    private let unreadCollector = UnreadCollector()
-
-    class UnreadCollector {
-        private let subject = PassthroughSubject<Void, Never>()
-        private var bag = Set<AnyCancellable>()
-        private var unreadCounts: [ChatId: 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)
-                        }
-                    }
-                    self.unreadCounts = [:]
-                }
-                .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 = [:]
-        }
-    }
-
     private func markChatItemRead_(_ i: Int) {
-        let meta = im.reversedChatItems[i].meta
+        let meta = reversedChatItems[i].meta
         if case .rcvNew = meta.itemStatus {
-            im.reversedChatItems[i].meta.itemStatus = .rcvRead
-            im.reversedChatItems[i].viewTimestamp = .now
+            reversedChatItems[i].meta.itemStatus = .rcvRead
+            reversedChatItems[i].viewTimestamp = .now
             if meta.itemLive != true, let ttl = meta.itemTimed?.ttl {
-                im.reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
+                reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
             }
         }
     }
 
-    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) {
+        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount - 1
+        decreaseUnreadCounter(user: currentUser!)
     }
 
     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 {
@@ -786,8 +612,8 @@ final class ChatModel: ObservableObject {
         var ns: [String] = []
         if let ciCategory = chatItem.mergeCategory,
            var i = getChatItemIndex(chatItem) {
-            while i < im.reversedChatItems.count {
-                let ci = im.reversedChatItems[i]
+            while i < reversedChatItems.count {
+                let ci = reversedChatItems[i]
                 if ci.mergeCategory != ciCategory { break }
                 if let m = ci.memberConnected {
                     ns.append(m.displayName)
@@ -802,7 +628,7 @@ final class ChatModel: ObservableObject {
     // returns the index of the passed item and the next item (it has smaller index)
     func getNextChatItem(_ ci: ChatItem) -> (Int?, ChatItem?) {
         if let i = getChatItemIndex(ci) {
-            (i, i > 0 ? im.reversedChatItems[i - 1] : nil)
+            (i, i > 0 ? reversedChatItems[i - 1] : nil)
         } else {
             (nil, nil)
         }
@@ -812,10 +638,10 @@ final class ChatModel: ObservableObject {
     // and the previous visible item with another merge category
     func getPrevShownChatItem(_ ciIndex: Int?, _ ciCategory: CIMergeCategory?) -> (Int?, ChatItem?) {
         guard var i = ciIndex else { return (nil, nil) }
-        let fst = im.reversedChatItems.count - 1
+        let fst = reversedChatItems.count - 1
         while i < fst {
             i = i + 1
-            let ci = im.reversedChatItems[i]
+            let ci = reversedChatItems[i]
             if ciCategory == nil || ciCategory != ci.mergeCategory {
                 return (i - 1, ci)
             }
@@ -828,7 +654,7 @@ final class ChatModel: ObservableObject {
         var prevMember: GroupMember? = nil
         var memberIds: Set<Int64> = []
         for i in range {
-            if case let .groupRcv(m) = im.reversedChatItems[i].chatDir {
+            if case let .groupRcv(m) = reversedChatItems[i].chatDir {
                 if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
                 memberIds.insert(m.groupMemberId)
             }
@@ -838,7 +664,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)
         }
     }
@@ -904,29 +729,37 @@ final class ChatModel: ObservableObject {
         var i = 0
         var totalBelow = 0
         var unreadBelow = 0
-        while i < im.reversedChatItems.count - 1 && !itemsInView.contains(im.reversedChatItems[i].viewId) {
+        while i < reversedChatItems.count - 1 && !itemsInView.contains(reversedChatItems[i].viewId) {
             totalBelow += 1
-            if im.reversedChatItems[i].isRcvNew {
+            if reversedChatItems[i].isRcvNew {
                 unreadBelow += 1
             }
             i += 1
         }
-        return UnreadChatItemCounts(
-            // TODO these thresholds account for the fact that items are still "visible" while
-            // covered by compose area, they should be replaced with the actual height in pixels below the screen.
-            isNearBottom: totalBelow < 15,
-            isReallyNearBottom: totalBelow < 2,
-            unreadBelow: unreadBelow
-        )
+        return UnreadChatItemCounts(isNearBottom: totalBelow < 16, unreadBelow: unreadBelow)
     }
 
     func topItemInView(itemsInView: Set<String>) -> ChatItem? {
-        let maxIx = im.reversedChatItems.count - 1
+        let maxIx = reversedChatItems.count - 1
         var i = 0
-        let inView = { itemsInView.contains(self.im.reversedChatItems[$0].viewId) }
+        let inView = { itemsInView.contains(self.reversedChatItems[$0].viewId) }
         while i < maxIx && !inView(i) { i += 1 }
         while i < maxIx && inView(i) { i += 1 }
-        return im.reversedChatItems[min(i - 1, maxIx)]
+        return 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
+        }
     }
 }
 
@@ -942,7 +775,6 @@ struct NTFContactRequest {
 
 struct UnreadChatItemCounts: Equatable {
     var isNearBottom: Bool
-    var isReallyNearBottom: Bool
     var unreadBelow: Int
 }
 
@@ -951,7 +783,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
@@ -998,6 +829,24 @@ final class Chat: ObservableObject, Identifiable, ChatLike {
 
     var viewId: String { get { "\(chatInfo.id) \(created.timeIntervalSince1970)" } }
 
+    func groupFeatureEnabled(_ feature: GroupFeature) -> Bool {
+        if case let .group(groupInfo) = self.chatInfo {
+            let p = groupInfo.fullGroupPreferences
+            return switch feature {
+            case .timedMessages: p.timedMessages.on
+            case .directMessages: p.directMessages.on(for: groupInfo.membership)
+            case .fullDelete: p.fullDelete.on
+            case .reactions: p.reactions.on
+            case .voice: p.voice.on(for: groupInfo.membership)
+            case .files: p.files.on(for: groupInfo.membership)
+            case .simplexLinks: p.simplexLinks.on(for: groupInfo.membership)
+            case .history: p.history.on
+            }
+        } else {
+            return true
+        }
+    }
+
     public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
 }
 

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,15 @@ 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)
-        }
+        m.reversedChatItems = []
+        let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
+        m.updateChatInfo(chat.chatInfo)
+        m.reversedChatItems = chat.chatItems.reversed()
     } catch let error {
         logger.error("loadChat error: \(responseError(error))")
     }
@@ -437,15 +430,15 @@ func apiChatItemReaction(type: ChatType, id: Int64, itemId: Int64, add: Bool, re
     throw r
 }
 
-func apiDeleteChatItems(type: ChatType, id: Int64, itemIds: [Int64], mode: CIDeleteMode) async throws -> [ChatItemDeletion] {
-    let r = await chatSendCmd(.apiDeleteChatItem(type: type, id: id, itemIds: itemIds, mode: mode), bgDelay: msgDelay)
-    if case let .chatItemsDeleted(_, items, _) = r { return items }
+func apiDeleteChatItem(type: ChatType, id: Int64, itemId: Int64, mode: CIDeleteMode) async throws -> (ChatItem, ChatItem?) {
+    let r = await chatSendCmd(.apiDeleteChatItem(type: type, id: id, itemId: itemId, mode: mode), bgDelay: msgDelay)
+    if case let .chatItemDeleted(_, deletedChatItem, toChatItem, _) = r { return (deletedChatItem.chatItem, toChatItem?.chatItem) }
     throw r
 }
 
-func apiDeleteMemberChatItems(groupId: Int64, itemIds: [Int64]) async throws -> [ChatItemDeletion] {
-    let r = await chatSendCmd(.apiDeleteMemberChatItem(groupId: groupId, itemIds: itemIds), bgDelay: msgDelay)
-    if case let .chatItemsDeleted(_, items, _) = r { return items }
+func apiDeleteMemberChatItem(groupId: Int64, groupMemberId: Int64, itemId: Int64) async throws -> (ChatItem, ChatItem?) {
+    let r = await chatSendCmd(.apiDeleteMemberChatItem(groupId: groupId, groupMemberId: groupMemberId, itemId: itemId), bgDelay: msgDelay)
+    if case let .chatItemDeleted(_, deletedChatItem, toChatItem, _) = r { return (deletedChatItem.chatItem, toChatItem?.chatItem) }
     throw r
 }
 
@@ -705,7 +698,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 +758,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 +783,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 +1111,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 +1357,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 +1529,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 +1541,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 +1595,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 +1617,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 +1640,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 +1674,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 +1682,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):
@@ -1812,25 +1745,21 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.updateChatItem(r.chatInfo, r.chatReaction.chatItem)
             }
         }
-    case let .chatItemsDeleted(user, items, _):
+    case let .chatItemDeleted(user, deletedChatItem, toChatItem, _):
         if !active(user) {
-            for item in items {
-                if item.toChatItem == nil && item.deletedChatItem.chatItem.isRcvNew && item.deletedChatItem.chatInfo.ntfsEnabled {
-                    await MainActor.run {
-                        m.decreaseUnreadCounter(user: user)
-                    }
+            if toChatItem == nil && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled {
+                await MainActor.run {
+                    m.decreaseUnreadCounter(user: user)
                 }
             }
             return
         }
 
         await MainActor.run {
-            for item in items {
-                if let toChatItem = item.toChatItem {
-                    _ = m.upsertChatItem(toChatItem.chatInfo, toChatItem.chatItem)
-                } else {
-                    m.removeChatItem(item.deletedChatItem.chatInfo, item.deletedChatItem.chatItem)
-                }
+            if let toChatItem = toChatItem {
+                _ = m.upsertChatItem(toChatItem.chatInfo, toChatItem.chatItem)
+            } else {
+                m.removeChatItem(deletedChatItem.chatInfo, deletedChatItem.chatItem)
             }
         }
     case let .receivedGroupInvitation(user, groupInfo, _, _):
@@ -1910,7 +1839,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 +2020,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 +2062,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/CIChatFeatureView.swift

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct CIChatFeatureView: View {
     @EnvironmentObject var m: ChatModel
-    @ObservedObject var im = ItemsModel.shared
     @ObservedObject var chat: Chat
     @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
@@ -54,8 +53,8 @@ struct CIChatFeatureView: View {
         var fs: [FeatureInfo] = []
         var icons: Set<String> = []
         if var i = m.getChatItemIndex(chatItem) {
-            while i < im.reversedChatItems.count,
-                  let f = featureInfo(im.reversedChatItems[i]) {
+            while i < m.reversedChatItems.count,
+                  let f = featureInfo(m.reversedChatItems[i]) {
                 if !icons.contains(f.icon) {
                     fs.insert(f, at: 0)
                     icons.insert(f.icon)

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

@@ -49,7 +49,7 @@ struct FramedItemView: View {
                 if let qi = chatItem.quotedItem {
                     ciQuoteView(qi)
                         .onTapGesture {
-                            if let ci = ItemsModel.shared.reversedChatItems.first(where: { $0.id == qi.itemId }) {
+                            if let ci = m.reversedChatItems.first(where: { $0.id == qi.itemId }) {
                                 withAnimation {
                                     scrollModel.scrollToItem(id: ci.id)
                                 }
@@ -294,6 +294,7 @@ struct FramedItemView: View {
         .padding(.horizontal, 12)
         .overlay(DetermineWidth())
         .frame(minWidth: 0, alignment: .leading)
+        .textSelection(.enabled)
 
         if let mediaWidth = maxMediaWidth(), mediaWidth < maxWidth {
             v.frame(maxWidth: mediaWidth, alignment: .leading)

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

@@ -35,8 +35,8 @@ struct MarkedDeletedItemView: View {
             var blockedByAdmin = 0
             var deleted = 0
             var moderatedBy: Set<String> = []
-            while i < ItemsModel.shared.reversedChatItems.count,
-                  let ci = .some(ItemsModel.shared.reversedChatItems[i]),
+            while i < m.reversedChatItems.count,
+                  let ci = .some(m.reversedChatItems[i]),
                   ci.mergeCategory == ciCategory,
                   let itemDeleted = ci.meta.itemDeleted {
                 switch itemDeleted {

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

@@ -21,6 +21,7 @@ struct ChatItemForwardingView: View {
     @State private var searchText: String = ""
     @FocusState private var searchFocused
     @State private var alert: SomeAlert?
+    @State private var hasSimplexLink_: Bool?
     private let chatsToForwardTo = filterChatsToForwardTo(chats: ChatModel.shared.chats)
 
     var body: some View {
@@ -66,6 +67,34 @@ struct ChatItemForwardingView: View {
         }
     }
 
+    private func prohibitedByPref(_ chat: Chat) -> Bool {
+        // preference checks should match checks in compose view
+        let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
+        let fileProhibited = (ci.content.msgContent?.isMediaOrFileAttachment ?? false) && !chat.groupFeatureEnabled(.files)
+        let voiceProhibited = (ci.content.msgContent?.isVoice ?? false) && !chat.chatInfo.featureEnabled(.voice)
+        return switch chat.chatInfo {
+        case .direct: voiceProhibited
+        case .group: simplexLinkProhibited || fileProhibited || voiceProhibited
+        case .local: false
+        case .contactRequest: false
+        case .contactConnection: false
+        case .invalidJSON: false
+        }
+    }
+
+    private var hasSimplexLink: Bool {
+        if let hasSimplexLink_ { return hasSimplexLink_ }
+        let r =
+            if let mcText = ci.content.msgContent?.text,
+               let parsedMsg = parseSimpleXMarkdown(mcText) {
+                parsedMsgHasSimplexLink(parsedMsg)
+            } else {
+                false
+            }
+        hasSimplexLink_ = r
+        return r
+    }
+
     private func emptyList() -> some View {
         Text("No filtered chats")
             .foregroundColor(theme.colors.secondary)
@@ -73,11 +102,7 @@ struct ChatItemForwardingView: View {
     }
 
     @ViewBuilder private func forwardListChatView(_ chat: Chat) -> some View {
-        let prohibited = chat.prohibitedByPref(
-            hasSimplexLink: hasSimplexLink(ci.content.msgContent?.text),
-            isMediaOrFileAttachment: ci.content.msgContent?.isMediaOrFileAttachment ?? false,
-            isVoice: ci.content.msgContent?.isVoice ?? false
-        )
+        let prohibited = prohibitedByPref(chat)
         Button {
             if prohibited {
                 alert = SomeAlert(
@@ -97,7 +122,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/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 {
@@ -1125,6 +1120,10 @@ struct ComposeView: View {
     }
 }
 
+func parsedMsgHasSimplexLink(_ parsedMsg: [FormattedText]) -> Bool {
+    parsedMsg.contains(where: { ft in ft.format?.isSimplexLink ?? false })
+}
+
 struct ComposeView_Previews: PreviewProvider {
     static var previews: some View {
         let chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])

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

@@ -257,9 +257,6 @@ struct SendMessageView: View {
         var body: some View {
             Button(action: {}) {
                 Image(systemName: "mic.fill")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 20, height: 20)
                     .foregroundColor(theme.colors.primary)
             }
             .disabled(disabled)
@@ -313,9 +310,6 @@ struct SendMessageView: View {
             }
         } label: {
             Image(systemName: "mic")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 20, height: 20)
                 .foregroundColor(theme.colors.secondary)
         }
         .disabled(composeState.inProgress)

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

@@ -1,133 +0,0 @@
-//
-//  SelectableChatItemToolbars.swift
-//  SimpleX (iOS)
-//
-//  Created by Stanislav Dmitrenko on 30.07.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct SelectedItemsTopToolbar: View {
-    @Environment(\.colorScheme) var colorScheme
-    @EnvironmentObject var theme: AppTheme
-    @Binding var selectedChatItems: Set<Int64>?
-
-    var body: some View {
-        let count = selectedChatItems?.count ?? 0
-        return Text(count == 0 ? "Nothing selected" : "Selected \(count)").font(.headline)
-            .foregroundColor(theme.colors.onBackground)
-            .frame(width: 220)
-    }
-}
-
-struct SelectedItemsBottomToolbar: View {
-    @Environment(\.colorScheme) var colorScheme
-    @EnvironmentObject var theme: AppTheme
-    let chatItems: [ChatItem]
-    @Binding var selectedChatItems: Set<Int64>?
-    var chatInfo: ChatInfo
-    // Bool - delete for everyone is possible
-    var deleteItems: (Bool) -> Void
-    var moderateItems: () -> Void
-    //var shareItems: () -> Void
-    @State var deleteEnabled: Bool = false
-    @State var deleteForEveryoneEnabled: Bool = false
-
-    @State var canModerate: Bool = false
-    @State var moderateEnabled: Bool = false
-
-    @State var allButtonsDisabled = false
-
-    var body: some View {
-        VStack(spacing: 0) {
-            Divider()
-
-            HStack(alignment: .center) {
-                Button {
-                    deleteItems(deleteForEveryoneEnabled)
-                } label: {
-                    Image(systemName: "trash")
-                        .resizable()
-                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!deleteEnabled || allButtonsDisabled ? theme.colors.secondary: .red)
-                }
-                .disabled(!deleteEnabled || allButtonsDisabled)
-
-                Spacer()
-                Button {
-                    moderateItems()
-                } label: {
-                    Image(systemName: "flag")
-                        .resizable()
-                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!moderateEnabled || allButtonsDisabled ? theme.colors.secondary : .red)
-                }
-                .disabled(!moderateEnabled || allButtonsDisabled)
-                .opacity(canModerate ? 1 : 0)
-
-
-                Spacer()
-                Button {
-                    //shareItems()
-                } label: {
-                    Image(systemName: "square.and.arrow.up")
-                        .resizable()
-                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(allButtonsDisabled ? theme.colors.secondary : theme.colors.primary)
-                }
-                .disabled(allButtonsDisabled)
-                .opacity(0)
-            }
-            .frame(maxHeight: .infinity)
-            .padding([.leading, .trailing], 12)
-        }
-        .onAppear {
-            recheckItems(chatInfo, chatItems, selectedChatItems)
-        }
-        .onChange(of: chatInfo) { info in
-            recheckItems(info, chatItems, selectedChatItems)
-        }
-        .onChange(of: chatItems) { items in
-            recheckItems(chatInfo, items, selectedChatItems)
-        }
-        .onChange(of: selectedChatItems) { selected in
-            recheckItems(chatInfo, chatItems, selected)
-        }
-        .frame(height: 55.5)
-        .background(.thinMaterial)
-    }
-
-    private func recheckItems(_ chatInfo: ChatInfo, _ chatItems: [ChatItem], _ selectedItems: Set<Int64>?) {
-        let count = selectedItems?.count ?? 0
-        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
-                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
-                    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
-        }
-    }
-
-    private func possibleToModerate(_ chatInfo: ChatInfo) -> Bool {
-        return switch chatInfo {
-        case let .group(groupInfo):
-            groupInfo.membership.memberRole >= .admin
-        default: false
-        }
-    }
-}

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

@@ -9,55 +9,45 @@
 import SwiftUI
 import SimpleXChat
 
-typealias DynamicSizes = (
-    rowHeight: CGFloat,
-    profileImageSize: CGFloat,
-    mediaSize: CGFloat,
-    incognitoSize: CGFloat,
-    chatInfoSize: CGFloat,
-    unreadCorner: CGFloat,
-    unreadPadding: CGFloat
-)
-
-private let dynamicSizes: [DynamicTypeSize: DynamicSizes] = [
-    .xSmall: (68, 55, 33, 22, 18, 9, 3),
-    .small: (72, 57, 34, 22, 18, 9, 3),
-    .medium: (76, 60, 36, 22, 18, 10, 4),
-    .large: (80, 63, 38, 24, 20, 10, 4),
-    .xLarge: (88, 67, 41, 24, 20, 10, 4),
-    .xxLarge: (100, 71, 44, 27, 22, 11, 4),
-    .xxxLarge: (110, 75, 48, 30, 24, 12, 5),
-    .accessibility1: (110, 75, 48, 30, 24, 12, 5),
-    .accessibility2: (114, 75, 48, 30, 24, 12, 5),
-    .accessibility3: (124, 75, 48, 30, 24, 12, 5),
-    .accessibility4: (134, 75, 48, 30, 24, 12, 5),
-    .accessibility5: (144, 75, 48, 30, 24, 12, 5)
+let dynamicSizes: [
+    DynamicTypeSize: (
+        rowHeight: CGFloat,
+        profileImageSize: CGFloat,
+        mediaSize: CGFloat,
+        chatInfoSize: CGFloat,
+        unreadCorner: CGFloat,
+        unreadPadding: CGFloat
+    )
+] = [
+    .xSmall: (68, 55, 33, 18, 9, 3),
+    .small: (72, 57, 34, 18, 9, 3),
+    .medium: (76, 60, 36, 18, 10, 4),
+    .large: (80, 63, 38, 20, 10, 4),
+    .xLarge: (88, 67, 41, 20, 10, 4),
+    .xxLarge: (94, 71, 44, 22, 11, 4),
+    .xxxLarge: (104, 75, 48, 24, 12, 5),
+    .accessibility1: (104, 75, 48, 24, 12, 5),
+    .accessibility2: (114, 75, 48, 24, 12, 5),
+    .accessibility3: (124, 75, 48, 24, 12, 5),
+    .accessibility4: (134, 75, 48, 24, 12, 5),
+    .accessibility5: (144, 75, 48, 24, 12, 5)
 ]
 
-private let defaultDynamicSizes: DynamicSizes = dynamicSizes[.large]!
-
-func dynamicSize(_ font: DynamicTypeSize) -> DynamicSizes {
-    dynamicSizes[font] ?? defaultDynamicSizes
-}
-
 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 +76,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 +97,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 +184,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 +193,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 +211,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 +234,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 +244,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 +263,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 +289,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 +298,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 +307,7 @@ struct ChatListNavLink: View {
         Button {
             AlertManager.shared.showAlert(deleteGroupAlert(groupInfo))
         } label: {
-            deleteLabel
+            Label("Delete", systemImage: "trash")
         }
         .tint(.red)
     }
@@ -339,23 +317,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 +349,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 +370,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 +423,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 +452,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 +490,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 +526,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

@@ -22,14 +22,14 @@ struct ChatPreviewView: View {
 
     @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
 
-    var dynamicMediaSize: CGFloat { dynamicSize(userFont).mediaSize }
-    var dynamicChatInfoSize: CGFloat { dynamicSize(userFont).chatInfoSize }
+    var dynamicMediaSize: CGFloat { dynamicSizes[userFont]?.mediaSize ?? 36 }
+    var dynamicChatInfoSize: CGFloat { dynamicSizes[userFont]?.chatInfoSize ?? 18 }
     
     var body: some View {
         let cItem = chat.chatItems.last
         return HStack(spacing: 8) {
             ZStack(alignment: .bottomTrailing) {
-                ChatInfoImage(chat: chat, size: dynamicSize(userFont).profileImageSize)
+                ChatInfoImage(chat: chat, size: dynamicSizes[userFont]?.profileImageSize ?? 63)
                 chatPreviewImageOverlayIcon()
                     .padding([.bottom, .trailing], 1)
             }
@@ -77,7 +77,7 @@ struct ChatPreviewView: View {
                         checkActiveContentPreview(chat, ci, mc)
                     }
                     chatStatusImage()
-                        .padding(.top, dynamicChatInfoSize * 1.44)
+                        .padding(.top, 26)
                         .frame(maxWidth: .infinity, alignment: .trailing)
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
@@ -198,10 +198,10 @@ struct ChatPreviewView: View {
             unreadCountText(s.unreadCount)
                 .font(userFont <= .xxxLarge ? .caption  : .caption2)
                 .foregroundColor(.white)
-                .padding(.horizontal, dynamicSize(userFont).unreadPadding)
+                .padding(.horizontal, dynamicSizes[userFont]?.unreadPadding ?? 4)
                 .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
                 .background(chat.chatInfo.ntfsEnabled || chat.chatInfo.chatType == .local ? theme.colors.primary : theme.colors.secondary)
-                .cornerRadius(dynamicSize(userFont).unreadCorner)
+                .cornerRadius(dynamicSizes[userFont]?.unreadCorner ?? 10)
         } else if !chat.chatInfo.ntfsEnabled && chat.chatInfo.chatType != .local {
             Image(systemName: "speaker.slash.fill")
                 .resizable()
@@ -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 {
@@ -372,56 +372,41 @@ struct ChatPreviewView: View {
     }
 
     @ViewBuilder private func chatStatusImage() -> some View {
-        let size = dynamicSize(userFont).incognitoSize
         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)
+                case .error:
+                    Image(systemName: "exclamationmark.circle")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 17, height: 17)
+                        .foregroundColor(theme.colors.secondary)
+                default:
+                    ProgressView()
+                }
             } else {
-                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
+                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
             }
         case .group:
             if progressByTimeout {
                 ProgressView()
             } else {
-                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
+                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
             }
         default:
-            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()
-            }
+            incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary)
         }
     }
 }
 
-@ViewBuilder func incognitoIcon(_ incognito: Bool, _ secondaryColor: Color, size: CGFloat) -> some View {
+@ViewBuilder func incognitoIcon(_ incognito: Bool, _ secondaryColor: Color) -> some View {
     if incognito {
         Image(systemName: "theatermasks")
             .resizable()
             .scaledToFit()
-            .frame(width: size, height: size)
+            .frame(width: 22, height: 22)
             .foregroundColor(secondaryColor)
     } else {
         EmptyView()

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

@@ -13,9 +13,9 @@ struct ContactConnectionView: View {
     @EnvironmentObject var m: ChatModel
     @ObservedObject var chat: Chat
     @EnvironmentObject var theme: AppTheme
-    @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 +31,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)
@@ -61,7 +62,7 @@ struct ContactConnectionView: View {
                 ZStack(alignment: .topTrailing) {
                     Text(contactConnection.description)
                         .frame(maxWidth: .infinity, alignment: .leading)
-                    incognitoIcon(contactConnection.incognito, theme.colors.secondary, size: dynamicSize(userFont).incognitoSize)
+                    incognitoIcon(contactConnection.incognito, theme.colors.secondary)
                         .padding(.top, 26)
                         .frame(maxWidth: .infinity, alignment: .trailing)
                 }
@@ -70,6 +71,9 @@ struct ContactConnectionView: View {
                 Spacer()
             }
             .frame(maxHeight: .infinity)
+            .appSheet(isPresented: $showContactConnectionInfo) {
+                ContactConnectionInfo(contactConnection: contactConnection)
+            }
         }
     }
 }

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

@@ -18,7 +18,7 @@ struct ContactRequestView: View {
 
     var body: some View {
         HStack(spacing: 8) {
-            ChatInfoImage(chat: chat, size: dynamicSize(userFont).profileImageSize)
+            ChatInfoImage(chat: chat, size: dynamicSizes[userFont]?.profileImageSize ?? 63)
                 .padding(.leading, 4)
             VStack(alignment: .leading, spacing: 0) {
                 HStack(alignment: .top) {

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

@@ -9,6 +9,8 @@
 import SwiftUI
 import SimpleXChat
 
+let defaultProfileImageCorner = 22.5
+
 struct ProfileImage: View {
     @EnvironmentObject var theme: AppTheme
     var imageStr: String? = nil
@@ -16,12 +18,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)
@@ -33,6 +34,26 @@ struct ProfileImage: View {
     }
 }
 
+private let squareToCircleRatio = 0.935
+
+private let radiusFactor = (1 - squareToCircleRatio) / 50
+
+@ViewBuilder func clipProfileImage(_ img: Image, size: CGFloat, radius: Double) -> some View {
+    let v = img.resizable()
+    if radius >= 50 {
+        v.frame(width: size, height: size).clipShape(Circle())
+    } else if radius <= 0 {
+        let sz = size * squareToCircleRatio
+        v.frame(width: sz, height: sz).padding((size - sz) / 2)
+    } else {
+        let sz = size * (squareToCircleRatio + radius * radiusFactor)
+        v.frame(width: sz, height: sz)
+        .clipShape(RoundedRectangle(cornerRadius: sz * radius / 100, style: .continuous))
+        .padding((size - sz) / 2)
+    }
+}
+
+
 extension Color {
     func asAnotherColorFromSecondary(_ theme: AppTheme) -> Color {
         return self

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

@@ -64,9 +64,8 @@ struct LocalAuthView: View {
                 deleteAppDatabaseAndFiles()
                 // Clear sensitive data on screen just in case app fails to hide its views while new database is created
                 m.chatId = nil
-                ItemsModel.shared.reversedChatItems = []
+                m.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 {
@@ -83,12 +76,11 @@ extension AppSettings {
         c.androidCallOnLockScreen = AppSettingsLockScreenCalls(rawValue: def.string(forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN)!)
         c.iosCallKitEnabled = callKitEnabledGroupDefault.get()
         c.iosCallKitCallsInRecents = def.bool(forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS)
-        c.uiProfileImageCornerRadius = def.double(forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
+        c.uiProfileImageCornerRadius = def.float(forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
         c.uiColorScheme = currentThemeDefault.get()
         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)
 
@@ -155,8 +143,7 @@ struct AppearanceSettings: View {
                     Text("Themes")
                         .foregroundColor(theme.colors.secondary)
                 }
-                .onChange(of: profileImageCornerRadius) { cornerRadius in
-                    profileImageCornerRadiusGroupDefault.set(cornerRadius)
+                .onChange(of: profileImageCornerRadius) { _ in
                     saveThemeToDatabase(nil)
                 }
                 .onChange(of: colorMode) { mode in
@@ -303,43 +290,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

@@ -70,9 +70,6 @@ struct PrivacySettings: View {
                 Section {
                     settingsRow("network", color: theme.colors.secondary) {
                         Toggle("Send link previews", isOn: $useLinkPreviews)
-                            .onChange(of: useLinkPreviews) { linkPreviews in
-                                privacyLinkPreviewsGroupDefault.set(linkPreviews)
-                            }
                     }
                     settingsRow("message", color: theme.colors.secondary) {
                         Toggle("Show last messages", isOn: $showChatPreviews)
@@ -117,7 +114,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
@@ -368,7 +365,6 @@ struct SimplexLockView: View {
     @State private var selfDestruct: Bool = UserDefaults.standard.bool(forKey: DEFAULT_LA_SELF_DESTRUCT)
     @State private var currentSelfDestruct: Bool = UserDefaults.standard.bool(forKey: DEFAULT_LA_SELF_DESTRUCT)
     @AppStorage(DEFAULT_LA_SELF_DESTRUCT_DISPLAY_NAME) private var selfDestructDisplayName = ""
-    @AppStorage(GROUP_DEFAULT_ALLOW_SHARE_EXTENSION, store: groupDefaults) private var allowShareExtension = false
     @State private var performLAToggleReset = false
     @State private var performLAModeReset = false
     @State private var performLASelfDestructReset = false
@@ -440,12 +436,6 @@ struct SimplexLockView: View {
                     }
                 }
 
-                if performLA {
-                    Section("Share to SimpleX") {
-                        Toggle("Allow sharing", isOn: $allowShareExtension)
-                    }
-                }
-                
                 if performLA && laMode == .passcode {
                     Section(header: Text("Self-destruct passcode").foregroundColor(theme.colors.secondary)) {
                         Toggle(isOn: $selfDestruct) {
@@ -470,7 +460,6 @@ struct SimplexLockView: View {
             }
         }
         .onChange(of: performLA) { performLAToggle in
-            appLocalAuthEnabledGroupDefault.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

@@ -18,7 +18,7 @@ let appBuild = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion")  as?
 
 let DEFAULT_SHOW_LA_NOTICE = "showLocalAuthenticationNotice"
 let DEFAULT_LA_NOTICE_SHOWN = "localAuthenticationNoticeShown"
-let DEFAULT_PERFORM_LA = "performLocalAuthentication" // deprecated, moved to app group
+let DEFAULT_PERFORM_LA = "performLocalAuthentication"
 let DEFAULT_LA_MODE = "localAuthenticationMode"
 let DEFAULT_LA_LOCK_DELAY = "localAuthenticationLockDelay"
 let DEFAULT_LA_SELF_DESTRUCT = "localAuthenticationSelfDestruct"
@@ -28,7 +28,7 @@ let DEFAULT_WEBRTC_POLICY_RELAY = "webrtcPolicyRelay"
 let DEFAULT_WEBRTC_ICE_SERVERS = "webrtcICEServers"
 let DEFAULT_CALL_KIT_CALLS_IN_RECENTS = "callKitCallsInRecents"
 let DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages" // unused. Use GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES instead
-let DEFAULT_PRIVACY_LINK_PREVIEWS = "privacyLinkPreviews" // deprecated, moved to app group
+let DEFAULT_PRIVACY_LINK_PREVIEWS = "privacyLinkPreviews"
 let DEFAULT_PRIVACY_SIMPLEX_LINK_MODE = "privacySimplexLinkMode"
 let DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS = "privacyShowChatPreviews"
 let DEFAULT_PRIVACY_SAVE_LAST_DRAFT = "privacySaveLastDraft"
@@ -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,9 +165,6 @@ 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))
-    privacyLinkPreviewsGroupDefault.set(UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS))
-    profileImageCornerRadiusGroupDefault.set(UserDefaults.standard.double(forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS))
 }
 
 public class StringDefault {

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/bg.xcloc/Source Contents/SimpleX NSE/en.lproj/InfoPlist.strings

@@ -1,9 +1,6 @@
 /* Bundle display name */
 "CFBundleDisplayName" = "SimpleX NSE";
-
 /* Bundle name */
 "CFBundleName" = "SimpleX NSE";
-
 /* Copyright (human-readable) */
 "NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";
-

apps/ios/SimpleX Localizations/bg.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/bg.xcloc/Source Contents/SimpleX SE/en.lproj/InfoPlist.strings

@@ -1,7 +0,0 @@
-/* 
-  InfoPlist.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/bg.xcloc/Source Contents/SimpleX SE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/cs.xcloc/Source Contents/SimpleX NSE/en.lproj/InfoPlist.strings

@@ -1,9 +1,6 @@
 /* Bundle display name */
 "CFBundleDisplayName" = "SimpleX NSE";
-
 /* Bundle name */
 "CFBundleName" = "SimpleX NSE";
-
 /* Copyright (human-readable) */
 "NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";
-

apps/ios/SimpleX Localizations/cs.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/cs.xcloc/Source Contents/SimpleX SE/en.lproj/InfoPlist.strings

@@ -1,7 +0,0 @@
-/* 
-  InfoPlist.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/cs.xcloc/Source Contents/SimpleX SE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/de.xcloc/Source Contents/SimpleX NSE/en.lproj/InfoPlist.strings

@@ -1,9 +1,6 @@
 /* Bundle display name */
 "CFBundleDisplayName" = "SimpleX NSE";
-
 /* Bundle name */
 "CFBundleName" = "SimpleX NSE";
-
 /* Copyright (human-readable) */
 "NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";
-

apps/ios/SimpleX Localizations/de.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/de.xcloc/Source Contents/SimpleX SE/en.lproj/InfoPlist.strings

@@ -1,7 +0,0 @@
-/* 
-  InfoPlist.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/de.xcloc/Source Contents/SimpleX SE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/en.xcloc/Source Contents/SimpleX NSE/en.lproj/InfoPlist.strings

@@ -1,9 +1,6 @@
 /* Bundle display name */
 "CFBundleDisplayName" = "SimpleX NSE";
-
 /* Bundle name */
 "CFBundleName" = "SimpleX NSE";
-
 /* Copyright (human-readable) */
 "NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";
-

apps/ios/SimpleX Localizations/en.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/en.xcloc/Source Contents/SimpleX SE/en.lproj/InfoPlist.strings

@@ -1,7 +0,0 @@
-/* 
-  InfoPlist.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/en.xcloc/Source Contents/SimpleX SE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/es.xcloc/Source Contents/SimpleX NSE/en.lproj/InfoPlist.strings

@@ -1,9 +1,6 @@
 /* Bundle display name */
 "CFBundleDisplayName" = "SimpleX NSE";
-
 /* Bundle name */
 "CFBundleName" = "SimpleX NSE";
-
 /* Copyright (human-readable) */
 "NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";
-

apps/ios/SimpleX Localizations/es.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/es.xcloc/Source Contents/SimpleX SE/en.lproj/InfoPlist.strings

@@ -1,7 +0,0 @@
-/* 
-  InfoPlist.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/es.xcloc/Source Contents/SimpleX SE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/fi.xcloc/Source Contents/SimpleX NSE/en.lproj/InfoPlist.strings

@@ -1,9 +1,6 @@
 /* Bundle display name */
 "CFBundleDisplayName" = "SimpleX NSE";
-
 /* Bundle name */
 "CFBundleName" = "SimpleX NSE";
-
 /* Copyright (human-readable) */
 "NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";
-

apps/ios/SimpleX Localizations/fi.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/fi.xcloc/Source Contents/SimpleX SE/en.lproj/InfoPlist.strings

@@ -1,7 +0,0 @@
-/* 
-  InfoPlist.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/fi.xcloc/Source Contents/SimpleX SE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/fr.xcloc/Source Contents/SimpleX NSE/en.lproj/InfoPlist.strings

@@ -1,9 +1,6 @@
 /* Bundle display name */
 "CFBundleDisplayName" = "SimpleX NSE";
-
 /* Bundle name */
 "CFBundleName" = "SimpleX NSE";
-
 /* Copyright (human-readable) */
 "NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";
-

apps/ios/SimpleX Localizations/fr.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/fr.xcloc/Source Contents/SimpleX SE/en.lproj/InfoPlist.strings

@@ -1,7 +0,0 @@
-/* 
-  InfoPlist.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/fr.xcloc/Source Contents/SimpleX SE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

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 Localizations/hu.xcloc/Source Contents/SimpleX NSE/en.lproj/InfoPlist.strings

@@ -1,9 +1,6 @@
 /* Bundle display name */
 "CFBundleDisplayName" = "SimpleX NSE";
-
 /* Bundle name */
 "CFBundleName" = "SimpleX NSE";
-
 /* Copyright (human-readable) */
 "NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";
-

apps/ios/SimpleX Localizations/hu.xcloc/Source Contents/SimpleX NSE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/hu.xcloc/Source Contents/SimpleX SE/en.lproj/InfoPlist.strings

@@ -1,7 +0,0 @@
-/* 
-  InfoPlist.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/

apps/ios/SimpleX Localizations/hu.xcloc/Source Contents/SimpleX SE/en.lproj/Localizable.strings

@@ -1,7 +0,0 @@
-/* 
-  Localizable.strings
-  SimpleX
-
-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/