don't throttle own messages on desktop

.github/workflows/build.yml

@@ -5,22 +5,12 @@ on:
     branches:
       - master
       - stable
+      - users
     tags:
       - "v*"
       - "!*-fdroid"
       - "!*-armv7a"
   pull_request:
-    paths-ignore:
-      - "apps/ios"
-      - "apps/multiplatform"
-      - "blog"
-      - "docs"
-      - "fastlane"
-      - "images"
-      - "packages"
-      - "website"
-      - "README.md"
-      - "PRIVACY.md"
 
 jobs:
   prepare-release:
@@ -102,7 +92,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         with:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: "3.10.1.0"
@@ -230,7 +220,7 @@ jobs:
           APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
           APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
         run: |
-          scripts/build-desktop-mac.sh
+          scripts/ci/build-desktop-mac.sh
           path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
           echo "package_path=$path" >> $GITHUB_OUTPUT
           echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
@@ -310,9 +300,7 @@ jobs:
       # Unix /
 
       # / Windows
-
-      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
-      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
+      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
 
       - name: 'Setup MSYS2'
         if: matrix.os == 'windows-latest'

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

apps/ios/Shared/AppDelegate.swift

@@ -15,11 +15,35 @@ 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
+    }
+
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         let token = deviceToken.map { String(format: "%02hhx", $0) }.joined()
         logger.debug("AppDelegate: didRegisterForRemoteNotificationsWithDeviceToken \(token)")

apps/ios/Shared/ContentView.swift

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

apps/ios/Shared/Model/ChatModel.swift

@@ -50,77 +50,12 @@ class ItemsModel: ObservableObject {
     var reversedChatItems: [ChatItem] = [] {
         willSet { publisher.send() }
     }
-    var itemAdded = false {
-        willSet { publisher.send() }
-    }
-    
-    // Publishes directly to `objectWillChange` publisher,
-    // this will cause reversedChatItems to be rendered without throttling
-    @Published var isLoading = false
-    @Published var showLoadingProgress = false
-
     init() {
         publisher
             .throttle(for: 0.25, scheduler: DispatchQueue.main, latest: true)
             .sink { self.objectWillChange.send() }
             .store(in: &bag)
     }
-
-    func loadOpenChat(_ chatId: ChatId, willNavigate: @escaping () -> Void = {}) {
-        let navigationTimeout = Task {
-            do {
-                try await Task.sleep(nanoseconds: 250_000000)
-                await MainActor.run {
-                    willNavigate()
-                    ChatModel.shared.chatId = chatId
-                }
-            } catch {}
-        }
-        let progressTimeout = Task {
-            do {
-                try await Task.sleep(nanoseconds: 1500_000000)
-                await MainActor.run { showLoadingProgress = true }
-            } catch {}
-        }
-        Task {
-            if let chat = ChatModel.shared.getChat(chatId) {
-                await MainActor.run { self.isLoading = true }
-//                try? await Task.sleep(nanoseconds: 5000_000000)
-                await loadChat(chat: chat)
-                navigationTimeout.cancel()
-                progressTimeout.cancel()
-                await MainActor.run {
-                    self.isLoading = false
-                    self.showLoadingProgress = false
-                    willNavigate()
-                    ChatModel.shared.chatId = chatId
-                }
-            }
-        }
-    }
-}
-
-class NetworkModel: ObservableObject {
-    // map of connections network statuses, key is agent connection id
-    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
-
-    static let shared = NetworkModel()
-
-    private init() { }
-
-    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] = status
-        }
-    }
-
-    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] ?? .unknown
-        } else {
-            .unknown
-        }
-    }
 }
 
 final class ChatModel: ObservableObject {
@@ -143,8 +78,10 @@ final class ChatModel: ObservableObject {
     @Published var contentViewAccessAuthenticated: Bool = false
     @Published var laRequest: LocalAuthRequest?
     // list of chat "previews"
-    @Published private(set) var chats: [Chat] = []
+    @Published var chats: [Chat] = []
     @Published var deletedChats: Set<String> = []
+    // map of connections network statuses, key is agent connection id
+    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
     // current chat
     @Published var chatId: String?
     var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
@@ -183,6 +120,9 @@ 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)
 
     var messageDelivery: Dictionary<Int64, () -> Void> = [:]
@@ -288,17 +228,10 @@ final class ChatModel: ObservableObject {
         chats.firstIndex(where: { $0.id == id })
     }
 
-    func addChat(_ chat: Chat) {
-        if chatId == nil {
-            withAnimation { addChat_(chat, at: 0) }
-        } else {
-            addChat_(chat, at: 0)
+    func addChat(_ chat: Chat, at position: Int = 0) {
+        withAnimation {
+            chats.insert(chat, at: position)
         }
-        popChatCollector.throttlePopChat(chat.chatInfo.id, currentPosition: 0)
-    }
-
-    func addChat_(_ chat: Chat, at position: Int = 0) {
-        chats.insert(chat, at: position)
     }
 
     func updateChatInfo(_ cInfo: ChatInfo) {
@@ -356,10 +289,26 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateChats(_ newChats: [ChatData]) {
-        chats = newChats.map { Chat($0) }
+    func updateChats(with newChats: [ChatData]) {
+        for i in 0..<newChats.count {
+            let c = newChats[i]
+            if let j = getChatIndex(c.id)   {
+                let chat = chats[j]
+                chat.chatInfo = c.chatInfo
+                chat.chatItems = c.chatItems
+                chat.chatStats = c.chatStats
+                if i != j {
+                    if chatId != c.chatInfo.id  {
+                        popChat_(j, to: i)
+                    }  else if i == 0 {
+                        chatToTop = c.chatInfo.id
+                    }
+                }
+            } else {
+                addChat(Chat(c), at: i)
+            }
+        }
         NtfManager.shared.setNtfBadgeCount(totalUnreadCountForAllUsers())
-        popChatCollector.clear()
     }
 
 //    func addGroup(_ group: SimpleXChat.Group) {
@@ -367,12 +316,6 @@ final class ChatModel: ObservableObject {
 //    }
 
     func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
-        // mark chat non deleted
-        if case let .direct(contact) = cInfo, contact.chatDeleted {
-            var updatedContact = contact
-            updatedContact.chatDeleted = false
-            updateContact(updatedContact)
-        }
         // update previews
         if let i = getChatIndex(cInfo.id) {
             chats[i].chatItems = switch cInfo {
@@ -392,7 +335,7 @@ final class ChatModel: ObservableObject {
             if case .rcvNew = cItem.meta.itemStatus {
                 unreadCollector.changeUnreadCounter(cInfo.id, by: 1)
             }
-            popChatCollector.throttlePopChat(cInfo.id, currentPosition: i)
+            popChatCollector.addChat(cInfo.id)
         } else {
             addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
         }
@@ -438,7 +381,6 @@ final class ChatModel: ObservableObject {
                     ci.meta.itemStatus = status
                 }
                 im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
-                im.itemAdded = true
             }
             return true
         }
@@ -533,7 +475,6 @@ final class ChatModel: ObservableObject {
         let cItem = ChatItem.liveDummy(chatInfo.chatType)
         withAnimation {
             im.reversedChatItems.insert(cItem, at: 0)
-            im.itemAdded = true
         }
         return cItem
     }
@@ -669,61 +610,29 @@ final class ChatModel: ObservableObject {
     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() }
+                .sink {
+                    let m = ChatModel.shared
+                    if m.chatId == nil {
+                        withAnimation {
+                            m.chats = m.chats.sorted(using: KeyPathComparator(\.popTs, order: .reverse))
+                        }
+                    } else {
+                        m.chats = m.chats.sorted(using: KeyPathComparator(\.popTs, order: .reverse))
+                    }
+                }
                 .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
+        func addChat(_ chatId: ChatId) {
+            if let index = ChatModel.shared.getChatIndex(chatId) {
+                ChatModel.shared.chats[index].popTs = CFAbsoluteTimeGetCurrent()
                 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) {
@@ -820,7 +729,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)
         }
     }
@@ -893,13 +801,7 @@ final class ChatModel: ObservableObject {
             }
             i += 1
         }
-        return UnreadChatItemCounts(
-            // TODO these thresholds account for the fact that items are still "visible" while
-            // covered by compose area, they should be replaced with the actual height in pixels below the screen.
-            isNearBottom: totalBelow < 15,
-            isReallyNearBottom: totalBelow < 2,
-            unreadBelow: unreadBelow
-        )
+        return UnreadChatItemCounts(isNearBottom: totalBelow < 16, unreadBelow: unreadBelow)
     }
 
     func topItemInView(itemsInView: Set<String>) -> ChatItem? {
@@ -910,6 +812,20 @@ final class ChatModel: ObservableObject {
         while i < maxIx && inView(i) { i += 1 }
         return im.reversedChatItems[min(i - 1, maxIx)]
     }
+
+    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] = status
+        }
+    }
+
+    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] ?? .unknown
+        } else {
+            .unknown
+        }
+    }
 }
 
 struct ShowingInvitation {
@@ -924,7 +840,6 @@ struct NTFContactRequest {
 
 struct UnreadChatItemCounts: Equatable {
     var isNearBottom: Bool
-    var isReallyNearBottom: Bool
     var unreadBelow: Int
 }
 
@@ -933,7 +848,7 @@ final class Chat: ObservableObject, Identifiable, ChatLike {
     @Published var chatItems: [ChatItem]
     @Published var chatStats: ChatStats
     var created = Date.now
-    fileprivate var popTs: Date?
+    var popTs: CFAbsoluteTime?
 
     init(_ cData: ChatData) {
         self.chatInfo = cData.chatInfo

apps/ios/Shared/Model/NtfManager.swift

@@ -57,9 +57,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                 chatModel.ntfCallInvitationAction = (chatId, ntfAction)
             }
         } else {
-            if let chatId = content.targetContentIdentifier {
-                ItemsModel.shared.loadOpenChat(chatId)
-            }
+            chatModel.chatId = content.targetContentIdentifier
         }
         handler()
     }

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -112,9 +112,9 @@ func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? =
     return resp
 }
 
-func chatSendCmd(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil, log: Bool = true) async -> ChatResponse {
+func chatSendCmd(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil) async -> ChatResponse {
     await withCheckedContinuation { cont in
-        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl, log: log))
+        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl))
     }
 }
 
@@ -320,8 +320,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 +332,22 @@ 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()
+        im.reversedChatItems = []
+        let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
+        if case let .direct(contact) = chat.chatInfo, !cInfo.chatDeleted, chat.chatInfo.chatDeleted {
+            var updatedContact = contact
+            updatedContact.chatDeleted = false
+            m.updateContact(updatedContact)
+        } else {
             m.updateChatInfo(chat.chatInfo)
         }
+        im.reversedChatItems = chat.chatItems.reversed()
     } catch let error {
         logger.error("loadChat error: \(responseError(error))")
     }
@@ -582,13 +584,13 @@ func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) throws -> (Gro
     throw r
 }
 
-func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
+func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, QueueInfo) {
     let r = await chatSendCmd(.apiContactQueueInfo(contactId: contactId))
     if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
     throw r
 }
 
-func apiGroupMemberQueueInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
+func apiGroupMemberQueueInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (RcvMsgInfo?, QueueInfo) {
     let r = await chatSendCmd(.apiGroupMemberQueueInfo(groupId: groupId, groupMemberId: groupMemberId))
     if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
     throw r
@@ -705,7 +707,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)
@@ -1169,12 +1171,12 @@ func acceptContactRequest(incognito: Bool, contactRequest: UserContactRequest) a
         let chat = Chat(chatInfo: ChatInfo.direct(contact: contact), chatItems: [])
         await MainActor.run {
             ChatModel.shared.replaceChat(contactRequest.id, chat)
-            NetworkModel.shared.setContactNetworkStatus(contact, .connected)
+            ChatModel.shared.setContactNetworkStatus(contact, .connected)
         }
         if contact.sndReady {
             DispatchQueue.main.async {
                 dismissAllSheets(animated: true) {
-                    ItemsModel.shared.loadOpenChat(chat.id)
+                    ChatModel.shared.chatId = chat.id
                 }
             }
         }
@@ -1218,18 +1220,12 @@ func apiEndCall(_ contact: Contact) async throws {
     try await sendCommandOkResp(.apiEndCall(contact: contact))
 }
 
-func apiGetCallInvitationsSync() throws -> [RcvCallInvitation] {
+func apiGetCallInvitations() throws -> [RcvCallInvitation] {
     let r = chatSendCmdSync(.apiGetCallInvitations)
     if case let .callInvitations(invs) = r { return invs }
     throw r
 }
 
-func apiGetCallInvitations() async throws -> [RcvCallInvitation] {
-    let r = await chatSendCmd(.apiGetCallInvitations)
-    if case let .callInvitations(invs) = r { return invs }
-    throw r
-}
-
 func apiCallStatus(_ contact: Contact, _ status: String) async throws {
     if let callStatus = WebRTCCallStatus.init(rawValue: status) {
         try await sendCommandOkResp(.apiCallStatus(contact: contact, callStatus: callStatus))
@@ -1426,9 +1422,9 @@ func apiGetVersion() throws -> CoreVersionInfo {
     throw r
 }
 
-func getAgentSubsTotal() async throws -> (SMPServerSubs, Bool) {
+func getAgentSubsTotal() throws -> (SMPServerSubs, Bool) {
     let userId = try currentUserId("getAgentSubsTotal")
-    let r = await chatSendCmd(.getAgentSubsTotal(userId: userId), log: false)
+    let r = chatSendCmdSync(.getAgentSubsTotal(userId: userId), log: false)
     if case let .agentSubsTotal(_, subsTotal, hasSession) = r { return (subsTotal, hasSession) }
     logger.error("getAgentSubsTotal error: \(String(describing: r))")
     throw r
@@ -1523,7 +1519,7 @@ func startChat(refreshInvitations: Bool = true) throws {
         try getUserChatData()
         NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
         if (refreshInvitations) {
-            Task { try await refreshCallInvitations() }
+            try refreshCallInvitations()
         }
         (m.savedToken, m.tokenStatus, m.notificationMode, m.notificationServer) = apiGetNtfToken()
         _ = try apiStartChat()
@@ -1597,7 +1593,7 @@ func getUserChatData() throws {
     m.userAddress = try apiGetUserAddress()
     m.chatItemTTL = try getChatItemTTL()
     let chats = try apiGetChats()
-    m.updateChats(chats)
+    m.chats = chats.map { Chat.init($0) }
 }
 
 private func getUserChatDataAsync() async throws {
@@ -1609,12 +1605,12 @@ private func getUserChatDataAsync() async throws {
         await MainActor.run {
             m.userAddress = userAddress
             m.chatItemTTL = chatItemTTL
-            m.updateChats(chats)
+            m.chats = chats.map { Chat.init($0) }
         }
     } else {
         await MainActor.run {
             m.userAddress = nil
-            m.updateChats([])
+            m.chats = []
         }
     }
 }
@@ -1664,7 +1660,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):
@@ -1687,7 +1682,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 {
@@ -1710,7 +1705,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) {
@@ -1744,7 +1739,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)
             }
@@ -1752,27 +1747,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):
@@ -1780,6 +1775,11 @@ func processReceivedMsg(_ res: ChatResponse) async {
         let cItem = aChatItem.chatItem
         await MainActor.run {
             if active(user) {
+                if case let .direct(contact) = cInfo, contact.chatDeleted {
+                    var updatedContact = contact
+                    updatedContact.chatDeleted = false
+                    m.updateContact(updatedContact)
+                }
                 m.addChatItem(cInfo, cItem)
             } else if cItem.isRcvNew && cInfo.ntfsEnabled {
                 m.increaseUnreadCounter(user: user)
@@ -1913,7 +1913,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):
@@ -2094,8 +2094,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",
@@ -2138,13 +2136,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))")
     }
@@ -2167,42 +2164,32 @@ func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
     }
 }
 
-func refreshCallInvitations() async throws {
+func refreshCallInvitations() throws {
     let m = ChatModel.shared
-    let callInvitations = try await apiGetCallInvitations()
-    await MainActor.run {
-        m.callInvitations = callsByChat(callInvitations)
-        if let (chatId, ntfAction) = m.ntfCallInvitationAction,
-           let invitation = m.callInvitations.removeValue(forKey: chatId) {
-            m.ntfCallInvitationAction = nil
-            CallController.shared.callAction(invitation: invitation, action: ntfAction)
-        } else if let invitation = callInvitations.last(where: { $0.user.showNotifications }) {
-            activateCall(invitation)
-        }
+    let callInvitations = try justRefreshCallInvitations()
+    if let (chatId, ntfAction) = m.ntfCallInvitationAction,
+       let invitation = m.callInvitations.removeValue(forKey: chatId) {
+        m.ntfCallInvitationAction = nil
+        CallController.shared.callAction(invitation: invitation, action: ntfAction)
+    } else if let invitation = callInvitations.last(where: { $0.user.showNotifications }) {
+        activateCall(invitation)
     }
 }
 
-func justRefreshCallInvitations() async throws {
-    let callInvitations = try apiGetCallInvitationsSync()
-    await MainActor.run {
-        ChatModel.shared.callInvitations = callsByChat(callInvitations)
-    }
-}
-
-private func callsByChat(_ callInvitations: [RcvCallInvitation]) -> [ChatId: RcvCallInvitation] {
-    callInvitations.reduce(into: [ChatId: RcvCallInvitation]()) {
-        result, inv in result[inv.contact.id] = inv
-    }
+func justRefreshCallInvitations() throws -> [RcvCallInvitation] {
+    let m = ChatModel.shared
+    let callInvitations = try apiGetCallInvitations()
+    m.callInvitations = callInvitations.reduce(into: [ChatId: RcvCallInvitation]()) { result, inv in result[inv.contact.id] = inv }
+    return callInvitations
 }
 
 func activateCall(_ callInvitation: RcvCallInvitation) {
+    if !callInvitation.user.showNotifications { return }
     let m = ChatModel.shared
-    logger.debug("reportNewIncomingCall activeCallUUID \(String(describing: m.activeCall?.callUUID)) invitationUUID \(String(describing: callInvitation.callUUID))")
-    if !callInvitation.user.showNotifications || m.activeCall?.callUUID == callInvitation.callUUID { return }
     CallController.shared.reportNewIncomingCall(invitation: callInvitation) { error in
         if let error = error {
             DispatchQueue.main.async {
-                m.callInvitations[callInvitation.contact.id]?.callUUID = nil
+                m.callInvitations[callInvitation.contact.id]?.callkitUUID = nil
             }
             logger.error("reportNewIncomingCall error: \(error.localizedDescription)")
         } else {

apps/ios/Shared/SimpleXApp.swift

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

apps/ios/Shared/Theme/Theme.swift

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

apps/ios/Shared/Theme/ThemeManager.swift

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

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

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

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

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

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

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

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

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

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

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

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

@@ -92,7 +92,6 @@ 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
     @State var localAlias: String
@@ -503,14 +502,14 @@ 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))
@@ -558,7 +557,7 @@ struct ChatInfoView: View {
     private func networkStatusAlert() -> Alert {
         Alert(
             title: Text("Network status"),
-            message: Text(networkModel.contactNetworkStatus(contact).statusExplanation)
+            message: Text(chatModel.contactNetworkStatus(contact).statusExplanation)
         )
     }
     
@@ -671,14 +670,7 @@ private struct CallButton: View {
 
         InfoViewButton(image: image, title: title, disabledLook: !canCall, width: width) {
             if canCall {
-                if CallController.useCallKit() {
-                    CallController.shared.startCall(contact, mediaType)
-                } else {
-                    // When CallKit is not used, colorscheme will be changed and it will be visible if not hiding sheets first
-                    dismissAllSheets(animated: true) {
-                        CallController.shared.startCall(contact, mediaType)
-                    }
-                }
+                CallController.shared.startCall(contact, mediaType)
             } else if contact.nextSendGrpInv {
                 showAlert(SomeAlert(
                     alert: mkAlert(
@@ -942,7 +934,7 @@ func syncConnectionForceAlert(_ syncConnectionForce: @escaping () -> Void) -> Al
     )
 }
 
-func queueInfoText(_ info: (RcvMsgInfo?, ServerQueueInfo)) -> String {
+func queueInfoText(_ info: (RcvMsgInfo?, QueueInfo)) -> String {
     let (rcvMsgInfo, qInfo) = info
     var msgInfo: String
     if let rcvMsgInfo { msgInfo = encodeJSON(rcvMsgInfo) } else { msgInfo = "none" }

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

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

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

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

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

@@ -351,7 +351,7 @@ struct ChatItemInfoView: View {
             Button {
                 Task {
                     await MainActor.run {
-                        ItemsModel.shared.loadOpenChat(forwardedFromItem.chatInfo.id)
+                        chatModel.chatId = forwardedFromItem.chatInfo.id
                         dismiss()
                     }
                 }

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

@@ -53,12 +53,13 @@ struct ChatView: View {
         if #available(iOS 16.0, *) {
             viewBody
                 .scrollDismissesKeyboard(.immediately)
+                .keyboardPadding()
                 .toolbarBackground(.hidden, for: .navigationBar)
         } else {
             viewBody
         }
     }
-
+    
     @ViewBuilder
     private var viewBody: some View {
         let cInfo = chat.chatInfo
@@ -129,23 +130,16 @@ struct ChatView: View {
                 }
             }
         }
-        .appSheet(item: $selectedMember) { member in
-            Group {
-                if case let .group(groupInfo) = chat.chatInfo {
-                    GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
-                }
-            }
-        }
         .onAppear {
-            selectedChatItems = nil
+            loadChat(chat: chat)
             initChatView()
+            selectedChatItems = nil
         }
         .onChange(of: chatModel.chatId) { cId in
             showChatInfoSheet = false
-            selectedChatItems = nil
-            scrollModel.scrollToBottom()
             stopAudioPlayer()
             if let cId {
+                selectedChatItems = nil
                 if let c = chatModel.getChat(cId) {
                     chat = c
                 }
@@ -158,10 +152,8 @@ struct ChatView: View {
         .onChange(of: revealedChatItem) { _ in
             NotificationCenter.postReverseListNeedsLayout()
         }
-        .onChange(of: im.isLoading) { isLoading in
-            if !isLoading,
-               im.reversedChatItems.count <= loadItemsPerPage,
-               filtered(im.reversedChatItems).count < 10 {
+        .onChange(of: im.reversedChatItems) { reversedChatItems in
+            if reversedChatItems.count <= loadItemsPerPage && filtered(reversedChatItems).count < 10 {
                 loadChatItems(chat.chatInfo)
             }
         }
@@ -170,6 +162,7 @@ struct ChatView: View {
             VideoPlayerView.players.removeAll()
             stopAudioPlayer()
             if chatModel.chatId == cInfo.id && !presentationMode.wrappedValue.isPresented {
+                chatModel.chatId = nil
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
                     if chatModel.chatId == nil {
                         chatModel.chatItemStatuses = [:]
@@ -196,7 +189,7 @@ struct ChatView: View {
                     } label: {
                         ChatInfoToolbar(chat: chat)
                     }
-                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
+                    .appSheet(isPresented: $showChatInfoSheet) {
                         ChatInfoView(
                             chat: chat,
                             contact: contact,
@@ -229,7 +222,6 @@ struct ChatView: View {
                 }
             }
             ToolbarItem(placement: .navigationBarTrailing) {
-                let isLoading = im.isLoading && im.showLoadingProgress
                 if selectedChatItems != nil {
                     Button {
                         withAnimation {
@@ -252,23 +244,19 @@ struct ChatView: View {
                                 }
                             }
                             Menu {
-                                if !isLoading {
-                                    if callsPrefEnabled && chatModel.activeCall == nil {
-                                        Button {
-                                            CallController.shared.startCall(contact, .video)
-                                        } label: {
-                                            Label("Video call", systemImage: "video")
-                                        }
-                                        .disabled(!contact.ready || !contact.active)
+                                if callsPrefEnabled && chatModel.activeCall == nil {
+                                    Button {
+                                        CallController.shared.startCall(contact, .video)
+                                    } label: {
+                                        Label("Video call", systemImage: "video")
                                     }
-                                    searchButton()
-                                    ToggleNtfsButton(chat: chat)
-                                        .disabled(!contact.ready || !contact.active)
+                                    .disabled(!contact.ready || !contact.active)
                                 }
+                                searchButton()
+                                ToggleNtfsButton(chat: chat)
+                                    .disabled(!contact.ready || !contact.active)
                             } label: {
                                 Image(systemName: "ellipsis")
-                                    .tint(isLoading ? Color.clear : nil)
-                                    .overlay { if isLoading { ProgressView() } }
                             }
                         }
                     case let .group(groupInfo):
@@ -293,14 +281,10 @@ struct ChatView: View {
                                 }
                             }
                             Menu {
-                                if !isLoading {
-                                    searchButton()
-                                    ToggleNtfsButton(chat: chat)
-                                }
+                                searchButton()
+                                ToggleNtfsButton(chat: chat)
                             } label: {
                                 Image(systemName: "ellipsis")
-                                    .tint(isLoading ? Color.clear : nil)
-                                    .overlay { if isLoading { ProgressView() } }
                             }
                         }
                     case .local:
@@ -366,7 +350,9 @@ struct ChatView: View {
                 searchText = ""
                 searchMode = false
                 searchFocussed = false
-                Task { await loadChat(chat: chat) }
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
+                    loadChat(chat: chat)
+                }
             }
         }
         .padding(.horizontal)
@@ -404,42 +390,32 @@ struct ChatView: View {
                                 : voiceNoFrame
                                     ? (g.size.width - 32)
                                     : (g.size.width - 32) * 0.84
-                return ChatItemWithMenu(
-                    chat: $chat,
-                    chatItem: ci,
-                    maxWidth: maxWidth,
-                    composeState: $composeState,
-                    selectedMember: $selectedMember,
-                    revealedChatItem: $revealedChatItem,
-                    selectedChatItems: $selectedChatItems
-                )
-                .onAppear {
-                    floatingButtonModel.appeared(viewId: ci.viewId)
-                }
-                .onDisappear {
-                    floatingButtonModel.disappeared(viewId: ci.viewId)
-                }
-                .id(ci.id) // Required to trigger `onAppear` on iOS15
+                return chatItemView(ci, maxWidth)
+                    .onAppear {
+                        floatingButtonModel.appeared(viewId: ci.viewId)
+                    }
+                    .onDisappear {
+                        floatingButtonModel.disappeared(viewId: ci.viewId)
+                    }
+                    .id(ci.id) // Required to trigger `onAppear` on iOS15
             } loadPage: {
                 loadChatItems(cInfo)
             }
-            .opacity(ItemsModel.shared.isLoading ? 0 : 1)
             .padding(.vertical, -InvertedTableView.inset)
             .onTapGesture { hideKeyboard() }
             .onChange(of: searchText) { _ in
-                Task { await loadChat(chat: chat, search: searchText) }
+                loadChat(chat: chat, search: searchText)
+            }
+            .onChange(of: chatModel.chatId) { chatId in
+                if let chatId, let c = chatModel.getChat(chatId) {
+                    chat = c
+                    showChatInfoSheet = false
+                    loadChat(chat: c)
+                }
             }
             .onChange(of: im.reversedChatItems) { _ in
                 floatingButtonModel.chatItemsChanged()
             }
-            .onChange(of: im.itemAdded) { added in
-                if added {
-                    im.itemAdded = false
-                    if floatingButtonModel.unreadChatItemCounts.isReallyNearBottom {
-                        scrollModel.scrollToBottom()
-                    }
-                }
-            }
         }
     }
 
@@ -472,19 +448,19 @@ struct ChatView: View {
         init() {
             unreadChatItemCounts = UnreadChatItemCounts(
                 isNearBottom: true,
-                isReallyNearBottom: true,
                 unreadBelow: 0
             )
             events
                 .receive(on: DispatchQueue.global(qos: .background))
                 .scan(Set<String>()) { itemsInView, event in
-                    var updated = itemsInView
-                    switch event {
-                    case let .appeared(viewId): updated.insert(viewId)
-                    case let .disappeared(viewId): updated.remove(viewId)
-                    case .chatItemsChanged: ()
+                    return switch event {
+                    case let .appeared(viewId):
+                        itemsInView.union([viewId])
+                    case let .disappeared(viewId):
+                        itemsInView.subtracting([viewId])
+                    case .chatItemsChanged:
+                        itemsInView
                     }
-                    return updated
                 }
                 .map { ChatModel.shared.unreadChatItemCounts(itemsInView: $0) }
                 .removeDuplicates()
@@ -568,8 +544,8 @@ struct ChatView: View {
 
     private func endCallButton(_ call: Call) -> some View {
         Button {
-            if CallController.useCallKit(), let callUUID = call.callUUID {
-                CallController.shared.endCall(callUUID: callUUID)
+            if let uuid = call.callkitUUID {
+                CallController.shared.endCall(callUUID: uuid)
             } else {
                 CallController.shared.endCall(call: call) {}
             }
@@ -692,10 +668,22 @@ struct ChatView: View {
         VoiceItemState.chatView = [:]
     }
 
+    @ViewBuilder private func chatItemView(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
+        ChatItemWithMenu(
+            chat: chat,
+            chatItem: ci,
+            maxWidth: maxWidth,
+            composeState: $composeState,
+            selectedMember: $selectedMember,
+            revealedChatItem: $revealedChatItem,
+            selectedChatItems: $selectedChatItems
+        )
+    }
+
     private struct ChatItemWithMenu: View {
         @EnvironmentObject var m: ChatModel
         @EnvironmentObject var theme: AppTheme
-        @Binding @ObservedObject var chat: Chat
+        @ObservedObject var chat: Chat
         let chatItem: ChatItem
         let maxWidth: CGFloat
         @Binding var composeState: ComposeState
@@ -725,7 +713,7 @@ struct ChatView: View {
             Group {
                 if revealed, let range = range {
                     let items = Array(zip(Array(range), im.reversedChatItems[range]))
-                    ForEach(items.reversed(), id: \.1.viewId) { (i, ci) in
+                    ForEach(items, id: \.1.viewId) { (i, ci) in
                         let prev = i == prevHidden ? prevItem : im.reversedChatItems[i + 1]
                         chatItemView(ci, nil, prev)
                         .overlay {
@@ -823,8 +811,8 @@ struct ChatView: View {
                             HStack(alignment: .top, spacing: 8) {
                                 MemberProfileImage(member, size: memberImageSize, backgroundColor: theme.colors.background)
                                     .onTapGesture {
-                                        if let member =  m.getGroupMember(member.groupMemberId) {
-                                            selectedMember = member
+                                        if m.membersLoaded {
+                                            selectedMember = m.getGroupMember(member.groupMemberId)
                                         } else {
                                             Task {
                                                 await m.loadGroupMembers(groupInfo) {
@@ -833,6 +821,9 @@ struct ChatView: View {
                                             }
                                         }
                                     }
+                                    .appSheet(item: $selectedMember) { member in
+                                        GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
+                                    }
                                 chatItemWithMenu(ci, range, maxWidth)
                             }
                         }

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

@@ -382,11 +382,7 @@ struct ComposeView: View {
                 }
             }
         }
-        .background {
-            Color.clear
-                .overlay(ToolbarMaterial.material(toolbarMaterial))
-                .ignoresSafeArea(.all, edges: .bottom)
-        }
+        .background(ToolbarMaterial.material(toolbarMaterial))
         .onChange(of: composeState.message) { msg in
             if composeState.linkPreviewAllowed {
                 if msg.count > 0 {

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

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

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

@@ -321,24 +321,24 @@ struct GroupMemberInfoView: View {
 
     func knownDirectChatButton(_ chat: Chat, width: CGFloat) -> some View {
         InfoViewButton(image: "message.fill", title: "message", width: width) {
-            ItemsModel.shared.loadOpenChat(chat.id) {
-                dismissAllSheets(animated: true)
+            dismissAllSheets(animated: true)
+            DispatchQueue.main.async {
+                chatModel.chatId = chat.id
             }
         }
     }
 
     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))")
+            do {
+                let chat = try apiGetChat(type: .direct, id: contactId)
+                chatModel.addChat(chat)
+                dismissAllSheets(animated: true)
+                DispatchQueue.main.async {
+                    chatModel.chatId = chat.id
                 }
+            } catch let error {
+                logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
             }
         }
     }
@@ -352,10 +352,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))")

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
@@ -152,23 +153,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: 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>) {
@@ -180,13 +176,6 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
                 snapshot,
                 animatingDifferences: itemCount != 0 && abs(items.count - itemCount) == 1
             )
-            // Sets content offset on initial load
-            if itemCount == 0 {
-                tableView.setContentOffset(
-                    CGPoint(x: 0, y: -InvertedTableView.inset),
-                    animated: false
-                )
-            }
             itemCount = items.count
         }
     }

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

@@ -114,7 +114,7 @@ struct ChatListNavLink: View {
                     }
             } else {
                 NavLinkPlain(
-                    chatId: chat.chatInfo.id,
+                    tag: chat.chatInfo.id,
                     selection: $chatModel.chatId,
                     label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
                 )
@@ -194,7 +194,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
@@ -221,7 +221,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
@@ -355,7 +355,6 @@ struct ChatListNavLink: View {
             .tint(.red)
         }
         .frame(height: dynamicRowHeight)
-        .contentShape(Rectangle())
         .onTapGesture { showContactRequestDialog = true }
         .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
             Button("Accept") { Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) } }
@@ -393,7 +392,6 @@ struct ChatListNavLink: View {
                 }
             }
         }
-        .contentShape(Rectangle())
         .onTapGesture {
             showContactConnectionInfo = true
         }
@@ -474,7 +472,9 @@ struct ChatListNavLink: View {
         Task {
             let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { AlertManager.shared.showAlert($0) })
             if ok {
-                ItemsModel.shared.loadOpenChat(contact.id)
+                await MainActor.run {
+                    chatModel.chatId = contact.id
+                }
                 AlertManager.shared.showAlert(connReqSentAlert(.contact))
             }
         }

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

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

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

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

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

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

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

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

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

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

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

@@ -56,7 +56,7 @@ struct ContactListNavLink: View {
     func recentContactNavLink(_ contact: Contact) -> some View {
         Button {
             dismissAllSheets(animated: true) {
-                ItemsModel.shared.loadOpenChat(contact.id)
+                ChatModel.shared.chatId = contact.id
             }
         } label: {
             contactPreview(contact, titleColor: theme.colors.onBackground)
@@ -82,8 +82,11 @@ struct ContactListNavLink: View {
         Button {
             Task {
                 await MainActor.run {
+                    var updatedContact = contact
+                    updatedContact.chatDeleted = false
+                    ChatModel.shared.updateContact(updatedContact)
                     dismissAllSheets(animated: true) {
-                        ItemsModel.shared.loadOpenChat(contact.id)
+                        ChatModel.shared.chatId = contact.id
                     }
                 }
             }
@@ -188,7 +191,9 @@ struct ContactListNavLink: View {
         Task {
             let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { alert = SomeAlert(alert: $0, id: "ContactListNavLink connectContactViaAddress") })
             if ok {
-                ItemsModel.shared.loadOpenChat(contact.id)
+                await MainActor.run {
+                    ChatModel.shared.chatId = contact.id
+                }
                 DispatchQueue.main.async {
                     dismissAllSheets(animated: true) {
                         AlertManager.shared.showAlert(connReqSentAlert(.contact))

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

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

apps/ios/Shared/Views/Helpers/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)
@@ -100,7 +91,7 @@ extension PresetWallpaper {
             scale
         } else if let type = ChatModel.shared.currentUser?.uiThemes?.preferredMode(base.mode == DefaultThemeMode.dark)?.wallpaper?.toAppWallpaper().type, type.sameType(WallpaperType.preset(filename, nil)) {
             type.scale
-        } else if let scale = themeOverridesDefault.get().first(where: { $0.wallpaper != nil && $0.wallpaper!.preset == filename && $0.base == base })?.wallpaper?.scale {
+        } else if let scale = themeOverridesDefault.get().first(where: { $0.wallpaper != nil && $0.wallpaper!.preset == filename })?.wallpaper?.scale {
             scale
         } else {
             Float(1.0)

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

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

apps/ios/Shared/Views/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/LocalAuth/LocalAuthView.swift

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

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

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

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

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

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

@@ -37,7 +37,7 @@ struct AddGroupView: View {
                 ) { _ in
                     DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                         dismissAllSheets(animated: true) {
-                            ItemsModel.shared.loadOpenChat(groupInfo.id)
+                            m.chatId = groupInfo.id
                         }
                     }
                 }
@@ -52,14 +52,14 @@ struct AddGroupView: View {
                 ) {
                     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()
         }
     }
 

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

@@ -61,39 +61,18 @@ struct NewChatSheet: View {
     @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)
+        NavigationView {
+            viewBody()
                 .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 {
+    
+    @ViewBuilder private func viewBody() -> some View {
         List {
             HStack {
                 ContactsListSearchBar(
@@ -111,25 +90,21 @@ struct NewChatSheet: View {
 
             if (searchText.isEmpty) {
                 Section {
-                    NavigationLink(isActive: $isAddContactActive) {
+                    NavigationLink {
                         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
-                        }
+                        Label("Add contact", systemImage: "link.badge.plus")
                     }
-                    NavigationLink(isActive: $isScanPasteLinkActive) {
+                    NavigationLink {
                         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
-                        }
+                        Label("Scan / Paste link", systemImage: "qrcode")
                     }
                     NavigationLink {
                         AddGroupView()
@@ -141,7 +116,7 @@ struct NewChatSheet: View {
                     }
                 }
                 
-                if (showArchive) {
+                if (!filterContactTypes(chats: chatModel.chats, contactTypes: [.chatDeleted]).isEmpty) {
                     Section {
                         NavigationLink {
                             DeletedChats()
@@ -165,22 +140,6 @@ struct NewChatSheet: View {
         }
     }
     
-    /// 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)
@@ -199,7 +158,7 @@ func chatContactType(chat: Chat) -> ContactType {
     case .contactRequest:
         return .request
     case let .direct(contact):
-        if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
+        if contact.activeConn == nil && contact.profile.contactLink != nil {
             return .card
         } else if contact.chatDeleted {
             return .chatDeleted

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

@@ -296,7 +296,6 @@ private struct ConnectView: View {
     @Binding var pastedLink: String
     @Binding var alert: NewChatViewAlert?
     @State private var sheet: PlanAndConnectActionSheet?
-    @State private var pasteboardHasStrings = UIPasteboard.general.hasStrings
 
     var body: some View {
         List {
@@ -333,7 +332,7 @@ private struct ConnectView: View {
             } label: {
                 Text("Tap to paste link")
             }
-            .disabled(!pasteboardHasStrings)
+            .disabled(!ChatModel.shared.pasteboardHasStrings)
             .frame(maxWidth: .infinity, alignment: .center)
         } else {
             linkTextView(pastedLink)
@@ -899,11 +898,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?()
                 }
             }
@@ -918,11 +917,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?()
                 }
             }

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/UserSettings/AdvancedNetworkSettings.swift

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

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

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

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

@@ -73,8 +73,6 @@ let DEFAULT_SYSTEM_DARK_THEME = "systemDarkTheme"
 let DEFAULT_CURRENT_THEME_IDS = "currentThemeIds"
 let DEFAULT_THEME_OVERRIDES = "themeOverrides"
 
-let DEFAULT_NETWORK_PROXY = "networkProxy"
-
 let ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN = "androidCallOnLockScreen"
 
 let appDefaults: [String: Any] = [
@@ -247,7 +245,6 @@ public class CodableDefault<T: Codable> {
     }
 }
 
-let networkProxyDefault: CodableDefault<NetworkProxy> = CodableDefault(defaults: UserDefaults.standard, forKey: DEFAULT_NETWORK_PROXY, withDefault: NetworkProxy.def)
 
 struct SettingsView: View {
     @Environment(\.colorScheme) var colorScheme

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

@@ -524,17 +524,17 @@
       </trans-unit>
       <trans-unit id="Abort" xml:space="preserve">
         <source>Abort</source>
-        <target>Beenden</target>
+        <target>Abbrechen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Abort changing address" xml:space="preserve">
         <source>Abort changing address</source>
-        <target>Wechsel der Empfängeradresse beenden</target>
+        <target>Wechsel der Empfängeradresse abbrechen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Abort changing address?" xml:space="preserve">
         <source>Abort changing address?</source>
-        <target>Wechsel der Empfängeradresse beenden?</target>
+        <target>Wechsel der Empfängeradresse abbrechen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="About SimpleX" xml:space="preserve">
@@ -657,7 +657,7 @@
       </trans-unit>
       <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve">
         <source>Address change will be aborted. Old receiving address will be used.</source>
-        <target>Der Wechsel der Empfängeradresse wird beendet. Die bisherige Adresse wird weiter verwendet.</target>
+        <target>Der Wechsel der Empfängeradresse wird abgebrochen. Die bisherige Adresse wird weiter verwendet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Admins can block a member for all." xml:space="preserve">
@@ -1057,7 +1057,7 @@
       </trans-unit>
       <trans-unit id="Better networking" xml:space="preserve">
         <source>Better networking</source>
-        <target>Kontrollieren Sie Ihr Netzwerk</target>
+        <target>Bessere Vernetzung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
@@ -2701,7 +2701,7 @@ Das ist Ihr eigener Einmal-Link!</target>
       </trans-unit>
       <trans-unit id="Error aborting address change" xml:space="preserve">
         <source>Error aborting address change</source>
-        <target>Fehler beim Beenden des Adresswechsels</target>
+        <target>Fehler beim Abbrechen des Adresswechsels</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error accepting contact request" xml:space="preserve">

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

@@ -582,12 +582,12 @@
       </trans-unit>
       <trans-unit id="Acknowledged" xml:space="preserve">
         <source>Acknowledged</source>
-        <target>Confirmaciones</target>
+        <target>Recibido</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Acknowledgement errors" xml:space="preserve">
         <source>Acknowledgement errors</source>
-        <target>Errores de confirmación</target>
+        <target>Errores de reconocimiento</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Active connections" xml:space="preserve">
@@ -697,7 +697,7 @@
       </trans-unit>
       <trans-unit id="All data is private to your device." xml:space="preserve">
         <source>All data is private to your device.</source>
-        <target>Todos los datos son privados y están en tu dispositivo.</target>
+        <target>Todos los datos son privados para tu dispositivo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">
@@ -802,7 +802,7 @@
       </trans-unit>
       <trans-unit id="Allow to send SimpleX links." xml:space="preserve">
         <source>Allow to send SimpleX links.</source>
-        <target>Se permite enviar enlaces SimpleX.</target>
+        <target>Permitir enviar enlaces SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -947,7 +947,7 @@
       </trans-unit>
       <trans-unit id="Archive contacts to chat later." xml:space="preserve">
         <source>Archive contacts to chat later.</source>
-        <target>Archiva contactos para charlar más tarde.</target>
+        <target>Archivar contactos para charlar más tarde.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
@@ -1102,7 +1102,7 @@
       </trans-unit>
       <trans-unit id="Blur for better privacy." xml:space="preserve">
         <source>Blur for better privacy.</source>
-        <target>Difumina para mayor privacidad.</target>
+        <target>Difuminar para más privacidad.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Blur media" xml:space="preserve">
@@ -1293,7 +1293,7 @@
       </trans-unit>
       <trans-unit id="Chat database" xml:space="preserve">
         <source>Chat database</source>
-        <target>Base de datos de SimpleX</target>
+        <target>Base de datos del chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat database deleted" xml:space="preserve">
@@ -1313,17 +1313,17 @@
       </trans-unit>
       <trans-unit id="Chat is running" xml:space="preserve">
         <source>Chat is running</source>
-        <target>SimpleX está en ejecución</target>
+        <target>Chat está en ejecución</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat is stopped" xml:space="preserve">
         <source>Chat is stopped</source>
-        <target>SimpleX está parado</target>
+        <target>Chat está parado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve">
         <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
-        <target>SimpleX está parado. Si has usado esta base de datos en otro dispositivo, debes transferirla de vuelta antes de iniciar SimpleX.</target>
+        <target>Chat parado. Si has usado esta base de datos en otro dispositivo, debes transferirla de vuelta antes de iniciar Chat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat list" xml:space="preserve">
@@ -1438,7 +1438,7 @@
       </trans-unit>
       <trans-unit id="Completed" xml:space="preserve">
         <source>Completed</source>
-        <target>Completadas</target>
+        <target>Completado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Configure ICE servers" xml:space="preserve">
@@ -1493,7 +1493,7 @@
       </trans-unit>
       <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve">
         <source>Confirm that you remember database passphrase to migrate it.</source>
-        <target>Para migrar confirma que recuerdas la frase de contraseña de la base de datos.</target>
+        <target>Confirma que recuerdas la frase de contraseña de la base de datos para migrarla.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm upload" xml:space="preserve">
@@ -1567,7 +1567,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Connected" xml:space="preserve">
         <source>Connected</source>
-        <target>Conectadas</target>
+        <target>Conectado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connected desktop" xml:space="preserve">
@@ -1617,7 +1617,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Connection and servers status." xml:space="preserve">
         <source>Connection and servers status.</source>
-        <target>Estado de tu conexión y servidores.</target>
+        <target>Estado de conexión y servidores.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
@@ -1812,7 +1812,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Created" xml:space="preserve">
         <source>Created</source>
-        <target>Creadas</target>
+        <target>Creado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Created at" xml:space="preserve">
@@ -2191,7 +2191,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Deleted" xml:space="preserve">
         <source>Deleted</source>
-        <target>Eliminadas</target>
+        <target>Eliminado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Deleted at" xml:space="preserve">
@@ -2206,7 +2206,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Deletion errors" xml:space="preserve">
         <source>Deletion errors</source>
-        <target>Errores de eliminación</target>
+        <target>Errores de borrado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delivery" xml:space="preserve">
@@ -2406,7 +2406,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Do not send history to new members." xml:space="preserve">
         <source>Do not send history to new members.</source>
-        <target>No se envía el historial a los miembros nuevos.</target>
+        <target>No enviar historial a miembros nuevos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
@@ -2951,7 +2951,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error stopping chat" xml:space="preserve">
         <source>Error stopping chat</source>
-        <target>Error al parar SimpleX</target>
+        <target>Error al parar Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
@@ -3631,7 +3631,7 @@ Error: %2$@</target>
       </trans-unit>
       <trans-unit id="In order to continue, chat should be stopped." xml:space="preserve">
         <source>In order to continue, chat should be stopped.</source>
-        <target>Para continuar, SimpleX debe estar parado.</target>
+        <target>Para continuar, Chat debe estar parado.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="In reply to" xml:space="preserve">
@@ -4151,7 +4151,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Message may be delivered later if member becomes active." xml:space="preserve">
         <source>Message may be delivered later if member becomes active.</source>
-        <target>El mensaje podría ser entregado más tarde si el miembro vuelve a estar activo.</target>
+        <target>El mensaje puede ser entregado más tarde si el miembro vuelve a estar activo.</target>
         <note>item status description</note>
       </trans-unit>
       <trans-unit id="Message queue info" xml:space="preserve">
@@ -4481,7 +4481,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="No direct connection yet, message is forwarded by admin." xml:space="preserve">
         <source>No direct connection yet, message is forwarded by admin.</source>
-        <target>Aún no hay conexión directa con este miembro, el mensaje es reenviado por el administrador.</target>
+        <target>Aún no hay conexión directa, el mensaje es reenviado por el administrador.</target>
         <note>item status description</note>
       </trans-unit>
       <trans-unit id="No filtered chats" xml:space="preserve">
@@ -4819,7 +4819,7 @@ Requiere activación de la VPN.</target>
       </trans-unit>
       <trans-unit id="Pending" xml:space="preserve">
         <source>Pending</source>
-        <target>Pendientes</target>
+        <target>Pendiente</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
@@ -5068,7 +5068,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Prohibit sending SimpleX links." xml:space="preserve">
         <source>Prohibit sending SimpleX links.</source>
-        <target>No se permite enviar enlaces SimpleX.</target>
+        <target>No permitir el envío de enlaces SimpleX.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit sending direct messages to members." xml:space="preserve">
@@ -5125,7 +5125,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Proxied" xml:space="preserve">
         <source>Proxied</source>
-        <target>Como proxy</target>
+        <target>Con proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Proxied servers" xml:space="preserve">
@@ -5240,7 +5240,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Received total" xml:space="preserve">
         <source>Received total</source>
-        <target>Total recibidos</target>
+        <target>Total recibido</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Receiving address will be changed to a different server. Address change will complete after sender comes online." xml:space="preserve">
@@ -5436,7 +5436,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Reset all statistics" xml:space="preserve">
         <source>Reset all statistics</source>
-        <target>Restablecer todas las estadísticas</target>
+        <target>Restablecer estadísticas</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reset all statistics?" xml:space="preserve">
@@ -5526,7 +5526,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Run chat" xml:space="preserve">
         <source>Run chat</source>
-        <target>Ejecutar SimpleX</target>
+        <target>Ejecutar chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SMP server" xml:space="preserve">
@@ -5711,7 +5711,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Secured" xml:space="preserve">
         <source>Secured</source>
-        <target>Aseguradas</target>
+        <target>Seguro</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Security assessment" xml:space="preserve">
@@ -5841,7 +5841,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
         <source>Send up to 100 last messages to new members.</source>
-        <target>Se envían hasta 100 mensajes más recientes a los miembros nuevos.</target>
+        <target>Enviar hasta 100 últimos mensajes a los miembros nuevos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
@@ -5906,7 +5906,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Sent directly" xml:space="preserve">
         <source>Sent directly</source>
-        <target>Directamente</target>
+        <target>Enviado directamente</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sent file event" xml:space="preserve">
@@ -5936,12 +5936,12 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Sent total" xml:space="preserve">
         <source>Sent total</source>
-        <target>Total enviados</target>
+        <target>Total enviado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sent via proxy" xml:space="preserve">
         <source>Sent via proxy</source>
-        <target>Mediante proxy</target>
+        <target>Enviado mediante proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
@@ -6141,7 +6141,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Show percentage" xml:space="preserve">
         <source>Show percentage</source>
-        <target>Mostrar porcentajes</target>
+        <target>Mostrar porcentaje</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
@@ -6326,17 +6326,17 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Stop chat" xml:space="preserve">
         <source>Stop chat</source>
-        <target>Parar SimpleX</target>
+        <target>Parar chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
         <source>Stop chat to enable database actions</source>
-        <target>Para habilitar las acciones sobre la base de datos, debes parar SimpleX</target>
+        <target>Para habilitar las acciones sobre la base de datos, debes parar Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." xml:space="preserve">
         <source>Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped.</source>
-        <target>Para poder exportar, importar o eliminar la base de datos primero debes parar SimpleX. Mientras tanto no podrás recibir ni enviar mensajes.</target>
+        <target>Para poder exportar, importar o eliminar la base de datos primero debes parar Chat. Mientras tanto no podrás recibir ni enviar mensajes.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat?" xml:space="preserve">
@@ -6538,7 +6538,7 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="The app will ask to confirm downloads from unknown file servers (except .onion)." xml:space="preserve">
         <source>The app will ask to confirm downloads from unknown file servers (except .onion).</source>
-        <target>La aplicación pedirá que confirmes las descargas desde servidores de archivos desconocidos (excepto si son .onion).</target>
+        <target>La aplicación pedirá que confirmes las descargas desde servidores de archivos desconocidos (excepto .onion).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The attempt to change database passphrase was not completed." xml:space="preserve">
@@ -6643,7 +6643,7 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
         <source>They can be overridden in contact and group settings.</source>
-        <target>Se puede modificar desde la configuración particular de cada grupo y contacto.</target>
+        <target>Se pueden anular en la configuración de contactos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -7087,7 +7087,7 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
       </trans-unit>
       <trans-unit id="Use the app with one hand." xml:space="preserve">
         <source>Use the app with one hand.</source>
-        <target>Usa la aplicación con una sola mano.</target>
+        <target>Usa la aplicación con una mano.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="User profile" xml:space="preserve">
@@ -7449,7 +7449,7 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You can change it in Appearance settings." xml:space="preserve">
         <source>You can change it in Appearance settings.</source>
-        <target>Puedes cambiar la posición de la barra desde el menú Apariencia.</target>
+        <target>Puede cambiarlo desde el menú Apariencia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can create it later" xml:space="preserve">
@@ -8208,7 +8208,7 @@ Los servidores SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
-        <target>expirados</target>
+        <target>expirado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">

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

@@ -524,7 +524,7 @@
       </trans-unit>
       <trans-unit id="Abort" xml:space="preserve">
         <source>Abort</source>
-        <target>Abandonner</target>
+        <target>Annuler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Abort changing address" xml:space="preserve">
@@ -752,7 +752,6 @@
       </trans-unit>
       <trans-unit id="Allow calls?" xml:space="preserve">
         <source>Allow calls?</source>
-        <target>Autoriser les appels ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve">
@@ -942,17 +941,15 @@
       </trans-unit>
       <trans-unit id="Archive and upload" xml:space="preserve">
         <source>Archive and upload</source>
-        <target>Archiver et téléverser</target>
+        <target>Archiver et transférer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archive contacts to chat later." xml:space="preserve">
         <source>Archive contacts to chat later.</source>
-        <target>Archiver les contacts pour discuter plus tard.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
         <source>Archived contacts</source>
-        <target>Contacts archivés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archiving database" xml:space="preserve">
@@ -1057,7 +1054,6 @@
       </trans-unit>
       <trans-unit id="Better networking" xml:space="preserve">
         <source>Better networking</source>
-        <target>Meilleure gestion de réseau</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
@@ -1102,7 +1098,6 @@
       </trans-unit>
       <trans-unit id="Blur for better privacy." xml:space="preserve">
         <source>Blur for better privacy.</source>
-        <target>Rendez les images floues et protégez-les contre les regards indiscrets.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Blur media" xml:space="preserve">
@@ -1157,7 +1152,6 @@
       </trans-unit>
       <trans-unit id="Calls prohibited!" xml:space="preserve">
         <source>Calls prohibited!</source>
-        <target>Les appels ne sont pas autorisés !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Camera not available" xml:space="preserve">
@@ -1167,12 +1161,10 @@
       </trans-unit>
       <trans-unit id="Can't call contact" xml:space="preserve">
         <source>Can't call contact</source>
-        <target>Impossible d'appeler le contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't call member" xml:space="preserve">
         <source>Can't call member</source>
-        <target>Impossible d'appeler le membre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Can't invite contact!" xml:space="preserve">
@@ -1187,7 +1179,6 @@
       </trans-unit>
       <trans-unit id="Can't message member" xml:space="preserve">
         <source>Can't message member</source>
-        <target>Impossible d'envoyer un message à ce membre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Cancel" xml:space="preserve">
@@ -1303,7 +1294,6 @@
       </trans-unit>
       <trans-unit id="Chat database exported" xml:space="preserve">
         <source>Chat database exported</source>
-        <target>Exportation de la base de données des discussions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat database imported" xml:space="preserve">
@@ -1328,7 +1318,6 @@
       </trans-unit>
       <trans-unit id="Chat list" xml:space="preserve">
         <source>Chat list</source>
-        <target>Liste de discussion</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat migrated!" xml:space="preserve">
@@ -1418,7 +1407,6 @@
       </trans-unit>
       <trans-unit id="Color chats with the new themes." xml:space="preserve">
         <source>Color chats with the new themes.</source>
-        <target>Colorez vos discussions avec les nouveaux thèmes.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Color mode" xml:space="preserve">
@@ -1438,7 +1426,7 @@
       </trans-unit>
       <trans-unit id="Completed" xml:space="preserve">
         <source>Completed</source>
-        <target>Complétées</target>
+        <target>Complété</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Configure ICE servers" xml:space="preserve">
@@ -1463,7 +1451,6 @@
       </trans-unit>
       <trans-unit id="Confirm contact deletion?" xml:space="preserve">
         <source>Confirm contact deletion?</source>
-        <target>Confirmer la suppression du contact ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm database upgrades" xml:space="preserve">
@@ -1523,7 +1510,6 @@
       </trans-unit>
       <trans-unit id="Connect to your friends faster." xml:space="preserve">
         <source>Connect to your friends faster.</source>
-        <target>Connectez-vous à vos amis plus rapidement.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect to yourself?" xml:space="preserve">
@@ -1602,7 +1588,6 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Connecting to contact, please wait or check later!" xml:space="preserve">
         <source>Connecting to contact, please wait or check later!</source>
-        <target>Connexion au contact, veuillez patienter ou vérifier plus tard !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting to desktop" xml:space="preserve">
@@ -1617,7 +1602,6 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Connection and servers status." xml:space="preserve">
         <source>Connection and servers status.</source>
-        <target>État de la connexion et des serveurs.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
@@ -1672,7 +1656,6 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Contact deleted!" xml:space="preserve">
         <source>Contact deleted!</source>
-        <target>Contact supprimé !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact hidden:" xml:space="preserve">
@@ -1687,7 +1670,6 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Contact is deleted." xml:space="preserve">
         <source>Contact is deleted.</source>
-        <target>Le contact est supprimé.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contact name" xml:space="preserve">
@@ -1702,7 +1684,6 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Contact will be deleted - this cannot be undone!" xml:space="preserve">
         <source>Contact will be deleted - this cannot be undone!</source>
-        <target>Le contact sera supprimé - il n'est pas possible de revenir en arrière !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contacts" xml:space="preserve">
@@ -1722,7 +1703,6 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Conversation deleted!" xml:space="preserve">
         <source>Conversation deleted!</source>
-        <target>Conversation supprimée !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Copy" xml:space="preserve">
@@ -1812,7 +1792,7 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Created" xml:space="preserve">
         <source>Created</source>
-        <target>Créées</target>
+        <target>Créé</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Created at" xml:space="preserve">
@@ -2066,7 +2046,6 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Delete contact?" xml:space="preserve">
         <source>Delete contact?</source>
-        <target>Supprimer le contact ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete database" xml:space="preserve">
@@ -2176,7 +2155,6 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
-        <target>Supprimez jusqu'à 20 messages à la fois.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete user profile?" xml:space="preserve">
@@ -2186,12 +2164,11 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Delete without notification" xml:space="preserve">
         <source>Delete without notification</source>
-        <target>Supprimer sans notification</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Deleted" xml:space="preserve">
         <source>Deleted</source>
-        <target>Supprimées</target>
+        <target>Supprimé</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Deleted at" xml:space="preserve">
@@ -2276,7 +2253,6 @@ Il s'agit de votre propre lien unique !</target>
       </trans-unit>
       <trans-unit id="Developer options" xml:space="preserve">
         <source>Developer options</source>
-        <target>Options pour les développeurs</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Developer tools" xml:space="preserve">
@@ -3839,7 +3815,6 @@ Erreur : %2$@</target>
       </trans-unit>
       <trans-unit id="It protects your IP address and connections." xml:space="preserve">
         <source>It protects your IP address and connections.</source>
-        <target>Il protège votre adresse IP et vos connexions.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="It seems like you are already connected via this link. If it is not the case, there was an error (%@)." xml:space="preserve">
@@ -3906,7 +3881,6 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="Keep conversation" xml:space="preserve">
         <source>Keep conversation</source>
-        <target>Garder la conversation</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
@@ -4086,7 +4060,6 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="Media &amp; file servers" xml:space="preserve">
         <source>Media &amp; file servers</source>
-        <target>Serveurs de fichiers et de médias</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Medium" xml:space="preserve">
@@ -4181,7 +4154,6 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="Message servers" xml:space="preserve">
         <source>Message servers</source>
-        <target>Serveurs de messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4396,7 +4368,6 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="New chat experience 🎉" xml:space="preserve">
         <source>New chat experience 🎉</source>
-        <target>Nouvelle expérience de discussion 🎉</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New contact request" xml:space="preserve">
@@ -4431,7 +4402,6 @@ Voici votre lien pour le groupe %@ !</target>
       </trans-unit>
       <trans-unit id="New media options" xml:space="preserve">
         <source>New media options</source>
-        <target>Nouvelles options de médias</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New member role" xml:space="preserve">
@@ -4604,7 +4574,6 @@ Nécessite l'activation d'un VPN.</target>
       </trans-unit>
       <trans-unit id="Only delete conversation" xml:space="preserve">
         <source>Only delete conversation</source>
-        <target>Ne supprimer que la conversation</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only group owners can change group preferences." xml:space="preserve">
@@ -4844,12 +4813,10 @@ Nécessite l'activation d'un VPN.</target>
       </trans-unit>
       <trans-unit id="Play from the chat list." xml:space="preserve">
         <source>Play from the chat list.</source>
-        <target>Aperçu depuis la liste de conversation.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable calls." xml:space="preserve">
         <source>Please ask your contact to enable calls.</source>
-        <target>Veuillez demander à votre contact d'autoriser les appels.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable sending voice messages." xml:space="preserve">
@@ -5155,7 +5122,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Reachable chat toolbar" xml:space="preserve">
         <source>Reachable chat toolbar</source>
-        <target>Barre d'outils accessible</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="React…" xml:space="preserve">
@@ -5431,7 +5397,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Reset all hints" xml:space="preserve">
         <source>Reset all hints</source>
-        <target>Rétablir tous les conseils</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reset all statistics" xml:space="preserve">
@@ -5566,7 +5531,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Save and reconnect" xml:space="preserve">
         <source>Save and reconnect</source>
-        <target>Sauvegarder et se reconnecter</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save and update group profile" xml:space="preserve">
@@ -5711,7 +5675,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Secured" xml:space="preserve">
         <source>Secured</source>
-        <target>Sécurisées</target>
+        <target>Sécurisé</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Security assessment" xml:space="preserve">
@@ -5791,7 +5755,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Send link previews" xml:space="preserve">
         <source>Send link previews</source>
-        <target>Aperçu des liens</target>
+        <target>Envoi d'aperçus de liens</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send live message" xml:space="preserve">
@@ -5801,7 +5765,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Send message to enable calls." xml:space="preserve">
         <source>Send message to enable calls.</source>
-        <target>Envoyer un message pour activer les appels.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send messages directly when IP address is protected and your or destination server does not support private routing." xml:space="preserve">
@@ -5966,7 +5929,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Server requires authorization to upload, check password" xml:space="preserve">
         <source>Server requires authorization to upload, check password</source>
-        <target>Le serveur requiert une autorisation pour téléverser, vérifiez le mot de passe</target>
+        <target>Le serveur requiert une autorisation pour uploader, vérifiez le mot de passe</target>
         <note>server test error</note>
       </trans-unit>
       <trans-unit id="Server test failed!" xml:space="preserve">
@@ -6091,7 +6054,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Share from other apps." xml:space="preserve">
         <source>Share from other apps.</source>
-        <target>Partager depuis d'autres applications.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share link" xml:space="preserve">
@@ -6131,7 +6093,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Show last messages" xml:space="preserve">
         <source>Show last messages</source>
-        <target>Aperçu des derniers messages</target>
+        <target>Voir les derniers messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show message status" xml:space="preserve">
@@ -6146,7 +6108,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
-        <target>Aperçu affiché</target>
+        <target>Afficher l'aperçu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Show → on messages sent via private routing." xml:space="preserve">
@@ -6266,7 +6228,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
         <source>Some file(s) were not exported:</source>
-        <target>Certains fichiers n'ont pas été exportés :</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
@@ -6276,7 +6237,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
         <source>Some non-fatal errors occurred during import:</source>
-        <target>L'importation a entraîné des erreurs non fatales :</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
@@ -6386,7 +6346,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="Subscribed" xml:space="preserve">
         <source>Subscribed</source>
-        <target>Inscriptions</target>
+        <target>Inscrit</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Subscription errors" xml:space="preserve">
@@ -6416,7 +6376,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       </trans-unit>
       <trans-unit id="TCP connection" xml:space="preserve">
         <source>TCP connection</source>
-        <target>Connexion TCP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="TCP connection timeout" xml:space="preserve">
@@ -6780,7 +6739,6 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
       </trans-unit>
       <trans-unit id="Toggle chat list:" xml:space="preserve">
         <source>Toggle chat list:</source>
-        <target>Afficher la liste des conversations :</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
@@ -6790,7 +6748,6 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
       </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
-        <target>Opacité de la barre d'outils</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Total" xml:space="preserve">
@@ -6977,7 +6934,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="Update settings?" xml:space="preserve">
         <source>Update settings?</source>
-        <target>Mettre à jour les paramètres ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -7002,7 +6958,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="Upload file" xml:space="preserve">
         <source>Upload file</source>
-        <target>Téléverser le fichier</target>
+        <target>Transférer le fichier</target>
         <note>server test step</note>
       </trans-unit>
       <trans-unit id="Uploaded" xml:space="preserve">
@@ -7087,7 +7043,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="Use the app with one hand." xml:space="preserve">
         <source>Use the app with one hand.</source>
-        <target>Utiliser l'application d'une main.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="User profile" xml:space="preserve">
@@ -7157,7 +7112,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="Video will be received when your contact completes uploading it." xml:space="preserve">
         <source>Video will be received when your contact completes uploading it.</source>
-        <target>La vidéo ne sera reçue que lorsque votre contact aura fini la mettre en ligne.</target>
+        <target>La vidéo ne sera reçue que lorsque votre contact aura fini de la transférer.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Video will be received when your contact is online, please wait or check later!" xml:space="preserve">
@@ -7449,7 +7404,6 @@ Répéter la demande d'adhésion ?</target>
       </trans-unit>
       <trans-unit id="You can change it in Appearance settings." xml:space="preserve">
         <source>You can change it in Appearance settings.</source>
-        <target>Vous pouvez choisir de le modifier dans les paramètres d'apparence.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can create it later" xml:space="preserve">
@@ -7489,7 +7443,6 @@ Répéter la demande d'adhésion ?</target>
       </trans-unit>
       <trans-unit id="You can send messages to %@ from Archived contacts." xml:space="preserve">
         <source>You can send messages to %@ from Archived contacts.</source>
-        <target>Vous pouvez envoyer des messages à %@ à partir des contacts archivés.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can set lock screen notification preview via settings." xml:space="preserve">
@@ -7519,7 +7472,6 @@ Répéter la demande d'adhésion ?</target>
       </trans-unit>
       <trans-unit id="You can still view conversation with %@ in the list of chats." xml:space="preserve">
         <source>You can still view conversation with %@ in the list of chats.</source>
-        <target>Vous pouvez toujours voir la conversation avec %@ dans la liste des discussions.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can turn on SimpleX Lock via Settings." xml:space="preserve">
@@ -7586,12 +7538,10 @@ Répéter la demande de connexion ?</target>
       </trans-unit>
       <trans-unit id="You may migrate the exported database." xml:space="preserve">
         <source>You may migrate the exported database.</source>
-        <target>Vous pouvez migrer la base de données exportée.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You may save the exported archive." xml:space="preserve">
         <source>You may save the exported archive.</source>
-        <target>Vous pouvez enregistrer l'archive exportée.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." xml:space="preserve">
@@ -7601,7 +7551,6 @@ Répéter la demande de connexion ?</target>
       </trans-unit>
       <trans-unit id="You need to allow your contact to call to be able to call them." xml:space="preserve">
         <source>You need to allow your contact to call to be able to call them.</source>
-        <target>Vous devez autoriser votre contact à appeler pour pouvoir l'appeler.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You need to allow your contact to send voice messages to be able to send them." xml:space="preserve">
@@ -7913,7 +7862,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </trans-unit>
       <trans-unit id="call" xml:space="preserve">
         <source>call</source>
-        <target>appeler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="call error" xml:space="preserve">
@@ -8288,7 +8236,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </trans-unit>
       <trans-unit id="invite" xml:space="preserve">
         <source>invite</source>
-        <target>inviter</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="invited" xml:space="preserve">
@@ -8348,7 +8295,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </trans-unit>
       <trans-unit id="message" xml:space="preserve">
         <source>message</source>
-        <target>message</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="message received" xml:space="preserve">
@@ -8383,7 +8329,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </trans-unit>
       <trans-unit id="mute" xml:space="preserve">
         <source>mute</source>
-        <target>muet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="never" xml:space="preserve">
@@ -8520,7 +8465,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </trans-unit>
       <trans-unit id="search" xml:space="preserve">
         <source>search</source>
-        <target>rechercher</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="sec" xml:space="preserve">
@@ -8609,7 +8553,6 @@ dernier message reçu : %2$@</target>
       </trans-unit>
       <trans-unit id="unmute" xml:space="preserve">
         <source>unmute</source>
-        <target>démuter</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="unprotected" xml:space="preserve">
@@ -8659,7 +8602,6 @@ dernier message reçu : %2$@</target>
       </trans-unit>
       <trans-unit id="video" xml:space="preserve">
         <source>video</source>
-        <target>vidéo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="video call (not e2e encrypted)" xml:space="preserve">
@@ -9002,12 +8944,10 @@ dernier message reçu : %2$@</target>
       </trans-unit>
       <trans-unit id="Sending a message takes longer than expected." xml:space="preserve">
         <source>Sending a message takes longer than expected.</source>
-        <target>L'envoi d'un message prend plus de temps que prévu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending message…" xml:space="preserve">
         <source>Sending message…</source>
-        <target>Envoi du message…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share" xml:space="preserve">
@@ -9017,7 +8957,6 @@ dernier message reçu : %2$@</target>
       </trans-unit>
       <trans-unit id="Slow network?" xml:space="preserve">
         <source>Slow network?</source>
-        <target>Réseau lent ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unknown database error: %@" xml:space="preserve">
@@ -9032,7 +8971,6 @@ dernier message reçu : %2$@</target>
       </trans-unit>
       <trans-unit id="Wait" xml:space="preserve">
         <source>Wait</source>
-        <target>Attendez</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">

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

@@ -219,12 +219,12 @@
       </trans-unit>
       <trans-unit id="%lld messages blocked" xml:space="preserve">
         <source>%lld messages blocked</source>
-        <target>%lld üzenet letiltva</target>
+        <target>%lld üzenet blokkolva</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld messages blocked by admin" xml:space="preserve">
         <source>%lld messages blocked by admin</source>
-        <target>%lld üzenet letiltva az admin által</target>
+        <target>%lld üzenet blokkolva az admin által</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="%lld messages marked deleted" xml:space="preserve">
@@ -1042,7 +1042,7 @@
       </trans-unit>
       <trans-unit id="Bad message hash" xml:space="preserve">
         <source>Bad message hash</source>
-        <target>Hibás az üzenet ellenőrzőösszege</target>
+        <target>Téves üzenet hash</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
@@ -1067,7 +1067,7 @@
       </trans-unit>
       <trans-unit id="Block" xml:space="preserve">
         <source>Block</source>
-        <target>Letiltás</target>
+        <target>Blokkolás</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Block for all" xml:space="preserve">
@@ -1077,12 +1077,12 @@
       </trans-unit>
       <trans-unit id="Block group members" xml:space="preserve">
         <source>Block group members</source>
-        <target>Csoporttagok letiltása</target>
+        <target>Csoporttagok blokkolása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Block member" xml:space="preserve">
         <source>Block member</source>
-        <target>Tag letiltása</target>
+        <target>Tag blokkolása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Block member for all?" xml:space="preserve">
@@ -1092,7 +1092,7 @@
       </trans-unit>
       <trans-unit id="Block member?" xml:space="preserve">
         <source>Block member?</source>
-        <target>Tag letiltása?</target>
+        <target>Tag blokkolása?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Blocked by admin" xml:space="preserve">
@@ -2131,7 +2131,7 @@ Ez az egyszer használatos hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delete member message?" xml:space="preserve">
         <source>Delete member message?</source>
-        <target>Csoporttag üzenetének törlése?</target>
+        <target>Csoporttag üzenet törlése?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete message?" xml:space="preserve">
@@ -2221,7 +2221,7 @@ Ez az egyszer használatos hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Delivery receipts!" xml:space="preserve">
         <source>Delivery receipts!</source>
-        <target>Üzenet kézbesítési jelentések!</target>
+        <target>Kézbesítési igazolások!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Description" xml:space="preserve">
@@ -2681,12 +2681,12 @@ Ez az egyszer használatos hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Enter welcome message…" xml:space="preserve">
         <source>Enter welcome message…</source>
-        <target>Üdvözlő üzenet megadása…</target>
+        <target>Üdvözlő üzenetet megadása…</target>
         <note>placeholder</note>
       </trans-unit>
       <trans-unit id="Enter welcome message… (optional)" xml:space="preserve">
         <source>Enter welcome message… (optional)</source>
-        <target>Üdvözlő üzenet megadása… (opcionális)</target>
+        <target>Üdvözlő üzenetet megadása… (opcionális)</target>
         <note>placeholder</note>
       </trans-unit>
       <trans-unit id="Enter your name…" xml:space="preserve">
@@ -2961,7 +2961,7 @@ Ez az egyszer használatos hivatkozása!</target>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
-        <target>Hiba a kapcsolat szinkronizálása közben</target>
+        <target>Hiba a kapcsolat szinkronizálása során</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error updating group link" xml:space="preserve">
@@ -3541,7 +3541,7 @@ Hiba: %2$@</target>
       </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
-        <target>Ha nem tud személyesen találkozni, mutassa meg a QR-kódot egy videohívás közben, vagy ossza meg a hivatkozást.</target>
+        <target>Ha nem tud személyesen találkozni, mutassa meg a QR-kódot egy videohívás során, vagy ossza meg a hivatkozást.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="If you enter this passcode when opening the app, all app data will be irreversibly removed!" xml:space="preserve">
@@ -4131,7 +4131,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Message delivery receipts!" xml:space="preserve">
         <source>Message delivery receipts!</source>
-        <target>Üzenet kézbesítési jelentések!</target>
+        <target>Üzenetkézbesítési bizonylatok!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message delivery warning" xml:space="preserve">
@@ -4176,7 +4176,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
       </trans-unit>
       <trans-unit id="Message reception" xml:space="preserve">
         <source>Message reception</source>
-        <target>Üzenet kézbesítési jelentés</target>
+        <target>Üzenetjelentés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message servers" xml:space="preserve">
@@ -5105,7 +5105,7 @@ Hiba: %@</target>
         <source>Protect your IP address from the messaging relays chosen by your contacts.
 Enable in *Network &amp; servers* settings.</source>
         <target>Védje IP-címét az ismerősei által kiválasztott üzenetküldő átjátszókkal szemben.
-Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
+Engedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
@@ -5971,7 +5971,7 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
       </trans-unit>
       <trans-unit id="Server test failed!" xml:space="preserve">
         <source>Server test failed!</source>
-        <target>Sikertelen kiszolgáló teszt!</target>
+        <target>Sikertelen kiszolgáló-teszt!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Server type" xml:space="preserve">
@@ -6271,12 +6271,12 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
       </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
-        <target>Néhány nem végzetes hiba történt az importálás közben – további részletekért a csevegési konzolban olvashat.</target>
+        <target>Néhány nem végzetes hiba történt az importálás során – további részletekért a csevegési konzolban olvashat.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import:" xml:space="preserve">
         <source>Some non-fatal errors occurred during import:</source>
-        <target>Néhány nem végzetes hiba történt az importálás közben:</target>
+        <target>Néhány nem végzetes hiba történt az importálás során:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Somebody" xml:space="preserve">
@@ -6563,7 +6563,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The created archive is available via app Settings / Database / Old database archive." xml:space="preserve">
         <source>The created archive is available via app Settings / Database / Old database archive.</source>
-        <target>A létrehozott archívum a Beállítások / Adatbázis / Régi adatbázis-archívum menüben érhető el.</target>
+        <target>A létrehozott archívum a Beállítások / Adatbázis / Régi adatbázis-archívum menüpontban érhető el.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The encryption is working and the new encryption agreement is not required. It may result in connection errors!" xml:space="preserve">
@@ -6573,7 +6573,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The hash of the previous message is different." xml:space="preserve">
         <source>The hash of the previous message is different.</source>
-        <target>Az előző üzenet ellenőrzőösszege különbözik.</target>
+        <target>Az előző üzenet hash-e más.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The message will be deleted for all members." xml:space="preserve">
@@ -6603,7 +6603,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
       </trans-unit>
       <trans-unit id="The old database was not removed during the migration, it can be deleted." xml:space="preserve">
         <source>The old database was not removed during the migration, it can be deleted.</source>
-        <target>A régi adatbázis nem került eltávolításra az átköltöztetés közben, így törölhető.</target>
+        <target>A régi adatbázis nem került eltávolításra az átköltöztetés során, így törölhető.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The profile is only shared with your contacts." xml:space="preserve">
@@ -7464,7 +7464,7 @@ Csatlakozási kérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
         <source>You can enable them later via app Privacy &amp; Security settings.</source>
-        <target>Később engedélyezheti őket az alkalmazás „Adatvédelem és biztonság” menüben.</target>
+        <target>Később engedélyezheti őket az alkalmazás Adatvédelem és biztonság menüpontban.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can give another try." xml:space="preserve">
@@ -7514,7 +7514,7 @@ Csatlakozási kérés megismétlése?</target>
       </trans-unit>
       <trans-unit id="You can start chat via app Settings / Database or by restarting the app" xml:space="preserve">
         <source>You can start chat via app Settings / Database or by restarting the app</source>
-        <target>A csevegést az alkalmazás Beállítások / Adatbázis menüben vagy az alkalmazás újraindításával indíthatja el</target>
+        <target>A csevegést az alkalmazás Beállítások / Adatbázis menü segítségével vagy az alkalmazás újraindításával indíthatja el</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can still view conversation with %@ in the list of chats." xml:space="preserve">
@@ -7888,17 +7888,17 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
       </trans-unit>
       <trans-unit id="bad message hash" xml:space="preserve">
         <source>bad message hash</source>
-        <target>hibás az üzenet ellenőrzőösszege</target>
+        <target>téves üzenet hash</target>
         <note>integrity error chat item</note>
       </trans-unit>
       <trans-unit id="blocked" xml:space="preserve">
         <source>blocked</source>
-        <target>letiltva</target>
+        <target>blokkolva</target>
         <note>marked deleted chat item preview text</note>
       </trans-unit>
       <trans-unit id="blocked %@" xml:space="preserve">
         <source>blocked %@</source>
-        <target>letiltotta %@-t</target>
+        <target>letiltotta őt: %@</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="blocked by admin" xml:space="preserve">
@@ -8490,7 +8490,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
       </trans-unit>
       <trans-unit id="removed %@" xml:space="preserve">
         <source>removed %@</source>
-        <target>eltávolította őt: %@</target>
+        <target>%@ eltávolítva</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="removed contact address" xml:space="preserve">
@@ -8589,7 +8589,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="unblocked %@" xml:space="preserve">
         <source>unblocked %@</source>
-        <target>feloldotta %@ letiltását</target>
+        <target>%@ feloldva</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="unknown" xml:space="preserve">
@@ -8714,7 +8714,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="you blocked %@" xml:space="preserve">
         <source>you blocked %@</source>
-        <target>ön letiltotta %@-t</target>
+        <target>blokkolta őt: %@</target>
         <note>snd group event chat item</note>
       </trans-unit>
       <trans-unit id="you changed address" xml:space="preserve">
@@ -8759,7 +8759,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="you unblocked %@" xml:space="preserve">
         <source>you unblocked %@</source>
-        <target>ön feloldotta %@ letiltását</target>
+        <target>feloldotta %@ blokkolását</target>
         <note>snd group event chat item</note>
       </trans-unit>
       <trans-unit id="you: " xml:space="preserve">
@@ -9042,7 +9042,7 @@ utoljára fogadott üzenet: %2$@</target>
       </trans-unit>
       <trans-unit id="You can allow sharing in Privacy &amp; Security / SimpleX Lock settings." xml:space="preserve">
         <source>You can allow sharing in Privacy &amp; Security / SimpleX Lock settings.</source>
-        <target>A megosztást az Adatvédelem és biztonság / SimpleX zár menüben engedélyezheti.</target>
+        <target>A megosztást az Adatvédelem és biztonság / SimpleX zár menüpontban engedélyezheti.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
     </body>

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

@@ -1617,7 +1617,7 @@ Questo è il tuo link una tantum!</target>
       </trans-unit>
       <trans-unit id="Connection and servers status." xml:space="preserve">
         <source>Connection and servers status.</source>
-        <target>Stato della connessione e dei server.</target>
+        <target>Stato di connessione e server.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connection error" xml:space="preserve">
@@ -6780,7 +6780,7 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
       </trans-unit>
       <trans-unit id="Toggle chat list:" xml:space="preserve">
         <source>Toggle chat list:</source>
-        <target>Cambia l'elenco delle chat:</target>
+        <target>Cambia elenco chat:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Toggle incognito when connecting." xml:space="preserve">

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

@@ -3906,7 +3906,7 @@ Dit is jouw link voor groep %@!</target>
       </trans-unit>
       <trans-unit id="Keep conversation" xml:space="preserve">
         <source>Keep conversation</source>
-        <target>Behoud het gesprek</target>
+        <target>Blijf in gesprek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
@@ -5431,7 +5431,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Reset all hints" xml:space="preserve">
         <source>Reset all hints</source>
-        <target>Alle hints resetten</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reset all statistics" xml:space="preserve">
@@ -6091,7 +6090,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Share from other apps." xml:space="preserve">
         <source>Share from other apps.</source>
-        <target>Delen vanuit andere apps.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share link" xml:space="preserve">
@@ -6780,7 +6778,6 @@ U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingesc
       </trans-unit>
       <trans-unit id="Toggle chat list:" xml:space="preserve">
         <source>Toggle chat list:</source>
-        <target>Chatlijst wisselen:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
@@ -6790,7 +6787,6 @@ U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingesc
       </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
-        <target>De transparantie van de werkbalk</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Total" xml:space="preserve">
@@ -7449,7 +7445,6 @@ Deelnameverzoek herhalen?</target>
       </trans-unit>
       <trans-unit id="You can change it in Appearance settings." xml:space="preserve">
         <source>You can change it in Appearance settings.</source>
-        <target>U kunt dit wijzigen in de instellingen onder uiterlijk.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can create it later" xml:space="preserve">

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

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

apps/ios/SimpleX Localizations/pt-BR.xcloc/Localized Contents/pt-BR.xliff

@@ -5234,274 +5234,6 @@ Isso pode acontecer por causa de algum bug ou quando a conexão está comprometi
         <target state="translated">%1$@ em %2$@:</target>
         <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
       </trans-unit>
-      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
-        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
-        <target state="translated">Permitir que seus contatos deletem mensagens enviadas de maneira irreversível. (24 horas)</target>
-      </trans-unit>
-      <trans-unit id="%@ downloaded" xml:space="preserve" approved="no">
-        <source>%@ downloaded</source>
-        <target state="translated">baixado</target>
-      </trans-unit>
-      <trans-unit id="%@ uploaded" xml:space="preserve" approved="no">
-        <source>%@ uploaded</source>
-        <target state="translated">transferido</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">Um novo perfil aleatório será compartilhado.</target>
-      </trans-unit>
-      <trans-unit id="Camera not available" xml:space="preserve" approved="no">
-        <source>Camera not available</source>
-        <target state="translated">Câmera indisponível</target>
-      </trans-unit>
-      <trans-unit id="Admins can block a member for all." xml:space="preserve" approved="no">
-        <source>Admins can block a member for all.</source>
-        <target state="translated">Administradores podem bloquear um membro para todos.</target>
-      </trans-unit>
-      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
-        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
-        <target state="translated">Permitir que mensagens enviadas sejam deletadas de maneira irreversível. (24 horas)</target>
-      </trans-unit>
-      <trans-unit id="Apply" xml:space="preserve" approved="no">
-        <source>Apply</source>
-        <target state="translated">Aplicar</target>
-      </trans-unit>
-      <trans-unit id="Accent" xml:space="preserve" approved="no">
-        <source>Accent</source>
-        <target state="translated">Esquema</target>
-      </trans-unit>
-      <trans-unit id="Accept connection request?" xml:space="preserve" approved="no">
-        <source>Accept connection request?</source>
-        <target state="translated">Aceitar solicitação de conexão?</target>
-      </trans-unit>
-      <trans-unit id="Active connections" xml:space="preserve" approved="no">
-        <source>Active connections</source>
-        <target state="translated">Conexões ativas</target>
-      </trans-unit>
-      <trans-unit id="Add contact" xml:space="preserve" approved="no">
-        <source>Add contact</source>
-        <target state="translated">Adicionar contato</target>
-      </trans-unit>
-      <trans-unit id="Additional accent" xml:space="preserve" approved="no">
-        <source>Additional accent</source>
-        <target state="translated">Esquema adicional</target>
-      </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve" approved="no">
-        <source>All new messages from %@ will be hidden!</source>
-        <target state="translated">Todas as novas mensagens de %@ serão ocultas!</target>
-      </trans-unit>
-      <trans-unit id="All profiles" xml:space="preserve" approved="no">
-        <source>All profiles</source>
-        <target state="translated">Todos perfis</target>
-      </trans-unit>
-      <trans-unit id="Allow calls?" xml:space="preserve" approved="no">
-        <source>Allow calls?</source>
-        <target state="translated">Permitir chamadas?</target>
-      </trans-unit>
-      <trans-unit id="Archive contacts to chat later." xml:space="preserve" approved="no">
-        <source>Archive contacts to chat later.</source>
-        <target state="translated">Arquivar contatos para conversar depois.</target>
-      </trans-unit>
-      <trans-unit id="Blur media" xml:space="preserve" approved="no">
-        <source>Blur media</source>
-        <target state="translated">Censurar mídia</target>
-      </trans-unit>
-      <trans-unit id="Calls prohibited!" xml:space="preserve" approved="no">
-        <source>Calls prohibited!</source>
-        <target state="translated">Chamadas proibidas!</target>
-      </trans-unit>
-      <trans-unit id="Can't call contact" xml:space="preserve" approved="no">
-        <source>Can't call contact</source>
-        <target state="translated">Não foi possível ligar para o contato</target>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve" approved="no">
-        <source>%lld messages marked deleted</source>
-        <target state="translated">mensagens deletadas</target>
-      </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve" approved="no">
-        <source>0 sec</source>
-        <target state="translated">0 seg</target>
-      </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve" approved="no">
-        <source>%lld messages blocked</source>
-        <target state="translated">mensagens bloqueadas</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">mensagens bloqueadas pelo administrador</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">**Nota**: usar o mesmo banco de dados em dois dispositivos irá quebrar a desencriptação das mensagens de suas conexões como uma medida de segurança.</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">- entrega de mensagens mais estável.
-- grupos melhorados.
-- e muito mais!</target>
-      </trans-unit>
-      <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
-        <source>All messages will be deleted - this cannot be undone!</source>
-        <target state="translated">Todas as mensagens serão deletadas - isto não pode ser desfeito!</target>
-      </trans-unit>
-      <trans-unit id="Allow to send files and media." xml:space="preserve" approved="no">
-        <source>Allow to send files and media.</source>
-        <target state="translated">Permitir o envio de arquivos e mídia.</target>
-      </trans-unit>
-      <trans-unit id="Allow to send SimpleX links." xml:space="preserve" approved="no">
-        <source>Allow to send SimpleX links.</source>
-        <target state="translated">Permitir envio de links SimpleX.</target>
-      </trans-unit>
-      <trans-unit id="Block for all" xml:space="preserve" approved="no">
-        <source>Block for all</source>
-        <target state="translated">Bloquear para todos</target>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve" approved="no">
-        <source>Block member</source>
-        <target state="translated">Bloquear membro</target>
-      </trans-unit>
-      <trans-unit id="Blocked by admin" xml:space="preserve" approved="no">
-        <source>Blocked by admin</source>
-        <target state="translated">Bloqueado por um administrador</target>
-      </trans-unit>
-      <trans-unit id="Block group members" xml:space="preserve" approved="no">
-        <source>Block group members</source>
-        <target state="translated">Bloquear membros de grupo</target>
-      </trans-unit>
-      <trans-unit id="Block member for all?" xml:space="preserve" approved="no">
-        <source>Block member for all?</source>
-        <target state="translated">Bloquear membro para todos?</target>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve" approved="no">
-        <source>Block member?</source>
-        <target state="translated">Bloquear membro?</target>
-      </trans-unit>
-      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
-        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
-        <target state="translated">Você e seu contato podem apagar mensagens enviadas de maneira irreversível. (24 horas)</target>
-      </trans-unit>
-      <trans-unit id="Can't call member" xml:space="preserve" approved="no">
-        <source>Can't call member</source>
-        <target state="translated">Não foi possível ligar para este membro</target>
-      </trans-unit>
-      <trans-unit id="Can't message member" xml:space="preserve" approved="no">
-        <source>Can't message member</source>
-        <target state="translated">Não foi possível enviar mensagem para este membro</target>
-      </trans-unit>
-      <trans-unit id="Cancel migration" xml:space="preserve" approved="no">
-        <source>Cancel migration</source>
-        <target state="translated">Cancelar migração</target>
-      </trans-unit>
-      <trans-unit id="Abort" xml:space="preserve" approved="no">
-        <source>Abort</source>
-        <target state="translated">Abortar</target>
-      </trans-unit>
-      <trans-unit id="Abort changing address" xml:space="preserve" approved="no">
-        <source>Abort changing address</source>
-        <target state="translated">Abortar troca de endereço</target>
-      </trans-unit>
-      <trans-unit id="Abort changing address?" xml:space="preserve" approved="no">
-        <source>Abort changing address?</source>
-        <target state="translated">Abortar troca de endereço?</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">- notificar contatos apagados de maneira opcional.
-- nome de perfil com espaços.
-- e muito mais!</target>
-      </trans-unit>
-      <trans-unit id="Allow sharing" xml:space="preserve" approved="no">
-        <source>Allow sharing</source>
-        <target state="translated">Permitir compartilhamento</target>
-      </trans-unit>
-      <trans-unit id="Block" xml:space="preserve" approved="no">
-        <source>Block</source>
-        <target state="translated">Bloquear</target>
-      </trans-unit>
-      <trans-unit id="Additional accent 2" xml:space="preserve" approved="no">
-        <source>Additional accent 2</source>
-        <target state="translated">Esquema adicional 2</target>
-      </trans-unit>
-      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve" approved="no">
-        <source>Address change will be aborted. Old receiving address will be used.</source>
-        <target state="translated">Alteração de endereço será abortada. O endereço antigo será utilizado.</target>
-      </trans-unit>
-      <trans-unit id="Advanced settings" xml:space="preserve" approved="no">
-        <source>Advanced settings</source>
-        <target state="translated">Configurações avançadas</target>
-      </trans-unit>
-      <trans-unit id="All data is private to your device." xml:space="preserve" approved="no">
-        <source>All data is private to your device.</source>
-        <target state="translated">Toda informação é privada em seu dispositivo.</target>
-      </trans-unit>
-      <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve" approved="no">
-        <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
-        <target state="translated">Todos os seus contatos, conversas e arquivos serão encriptados e enviados em pedaços para nós XFTP.</target>
-      </trans-unit>
-      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve" approved="no">
-        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
-        <target state="translated">Permitir deletar mensagens de maneira irreversível apenas se seu contato permitir para você. (24 horas)</target>
-      </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve" approved="no">
-        <source>Already connecting!</source>
-        <target state="translated">Já está conectando!</target>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve" approved="no">
-        <source>Already joining the group!</source>
-        <target state="translated">Já está entrando no grupo!</target>
-      </trans-unit>
-      <trans-unit id="Always use private routing." xml:space="preserve" approved="no">
-        <source>Always use private routing.</source>
-        <target state="translated">Sempre use rotas privadas.</target>
-      </trans-unit>
-      <trans-unit id="Apply to" xml:space="preserve" approved="no">
-        <source>Apply to</source>
-        <target state="translated">Aplicar em</target>
-      </trans-unit>
-      <trans-unit id="Archiving database" xml:space="preserve" approved="no">
-        <source>Archiving database</source>
-        <target state="translated">Arquivando banco de dados</target>
-      </trans-unit>
-      <trans-unit id="Black" xml:space="preserve" approved="no">
-        <source>Black</source>
-        <target state="translated">Preto</target>
-      </trans-unit>
-      <trans-unit id="Cannot forward message" xml:space="preserve" approved="no">
-        <source>Cannot forward message</source>
-        <target state="translated">Não é possível encaminhar mensagem</target>
-      </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve" approved="no">
-        <source>(new)</source>
-        <target state="translated">(novo)</target>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve" approved="no">
-        <source>(this device v%@)</source>
-        <target state="translated">este dispositivo</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">**Adicionar contato**: criar um novo link de convite ou conectar via um link que você recebeu.</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">**Criar grupo**: criar um novo grupo.</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">**Aviso**: o arquivo será removido.</target>
-      </trans-unit>
-      <trans-unit id="A few more things" xml:space="preserve" approved="no">
-        <source>A few more things</source>
-        <target state="translated">E mais algumas coisas</target>
-      </trans-unit>
-      <trans-unit id="Archived contacts" xml:space="preserve" approved="no">
-        <source>Archived contacts</source>
-        <target state="translated">Contatos arquivados</target>
-      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="pt-BR" datatype="plaintext">

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

@@ -947,7 +947,6 @@
       </trans-unit>
       <trans-unit id="Archive contacts to chat later." xml:space="preserve">
         <source>Archive contacts to chat later.</source>
-        <target>Архивируйте контакты чтобы продолжить переписку.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Archived contacts" xml:space="preserve">
@@ -1057,7 +1056,6 @@
       </trans-unit>
       <trans-unit id="Better networking" xml:space="preserve">
         <source>Better networking</source>
-        <target>Улучшенные сетевые функции</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
@@ -1102,7 +1100,6 @@
       </trans-unit>
       <trans-unit id="Blur for better privacy." xml:space="preserve">
         <source>Blur for better privacy.</source>
-        <target>Размыть для конфиденциальности.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Blur media" xml:space="preserve">
@@ -1328,7 +1325,6 @@
       </trans-unit>
       <trans-unit id="Chat list" xml:space="preserve">
         <source>Chat list</source>
-        <target>Список чатов</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chat migrated!" xml:space="preserve">
@@ -1418,7 +1414,6 @@
       </trans-unit>
       <trans-unit id="Color chats with the new themes." xml:space="preserve">
         <source>Color chats with the new themes.</source>
-        <target>Добавьте цвета к чатам в настройках.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Color mode" xml:space="preserve">
@@ -1523,7 +1518,6 @@
       </trans-unit>
       <trans-unit id="Connect to your friends faster." xml:space="preserve">
         <source>Connect to your friends faster.</source>
-        <target>Соединяйтесь с друзьями быстрее.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect to yourself?" xml:space="preserve">
@@ -2176,7 +2170,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Delete up to 20 messages at once." xml:space="preserve">
         <source>Delete up to 20 messages at once.</source>
-        <target>Удаляйте до 20 сообщений за раз.</target>
+        <target>Удаляйте до 20 сообщений одновременно.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete user profile?" xml:space="preserve">
@@ -4396,7 +4390,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New chat experience 🎉" xml:space="preserve">
         <source>New chat experience 🎉</source>
-        <target>Новый интерфейс 🎉</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New contact request" xml:space="preserve">
@@ -4431,7 +4424,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="New media options" xml:space="preserve">
         <source>New media options</source>
-        <target>Новые медиа-опции</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="New member role" xml:space="preserve">
@@ -4844,7 +4836,6 @@ Requires compatible VPN.</source>
       </trans-unit>
       <trans-unit id="Play from the chat list." xml:space="preserve">
         <source>Play from the chat list.</source>
-        <target>Открыть из списка чатов.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable calls." xml:space="preserve">
@@ -4988,7 +4979,7 @@ Error: %@</source>
       </trans-unit>
       <trans-unit id="Private message routing 🚀" xml:space="preserve">
         <source>Private message routing 🚀</source>
-        <target>Конфиденциальная доставка 🚀</target>
+        <target>Конфиденциальная доставка сообщений 🚀</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Private notes" xml:space="preserve">
@@ -5431,7 +5422,6 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Reset all hints" xml:space="preserve">
         <source>Reset all hints</source>
-        <target>Сбросить все подсказки</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reset all statistics" xml:space="preserve">
@@ -6091,7 +6081,6 @@ Enable in *Network &amp; servers* settings.</source>
       </trans-unit>
       <trans-unit id="Share from other apps." xml:space="preserve">
         <source>Share from other apps.</source>
-        <target>Поделитесь из других приложений.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share link" xml:space="preserve">
@@ -6780,7 +6769,6 @@ You will be prompted to complete authentication before this feature is enabled.<
       </trans-unit>
       <trans-unit id="Toggle chat list:" xml:space="preserve">
         <source>Toggle chat list:</source>
-        <target>Переключите список чатов:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
@@ -6790,7 +6778,6 @@ You will be prompted to complete authentication before this feature is enabled.<
       </trans-unit>
       <trans-unit id="Toolbar opacity" xml:space="preserve">
         <source>Toolbar opacity</source>
-        <target>Прозрачность тулбара</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Total" xml:space="preserve">
@@ -7449,7 +7436,6 @@ Repeat join request?</source>
       </trans-unit>
       <trans-unit id="You can change it in Appearance settings." xml:space="preserve">
         <source>You can change it in Appearance settings.</source>
-        <target>Вы можете изменить это в настройках Интерфейса.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can create it later" xml:space="preserve">

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

@@ -314,7 +314,7 @@
       </trans-unit>
       <trans-unit id="About SimpleX Chat" xml:space="preserve" approved="no">
         <source>About SimpleX Chat</source>
-        <target state="translated">關於 SimpleX Chat</target>
+        <target state="translated">關於 SimpleX 對話</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent color" xml:space="preserve" approved="no">
@@ -445,7 +445,7 @@
       </trans-unit>
       <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve" approved="no">
         <source>Allow your contacts to send disappearing messages.</source>
-        <target state="translated">允許您的聯絡人傳送限時訊息。</target>
+        <target state="translated">允許你的聯絡人傳送自動銷毀的訊息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve" approved="no">
@@ -5898,230 +5898,6 @@ It can happen because of some bug or when the connection is compromised.</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="%@ uploaded" xml:space="preserve" approved="no">
-        <source>%@ uploaded</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="**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="Abort changing address" xml:space="preserve" approved="no">
-        <source>Abort changing address</source>
-        <target state="translated">中止更改地址</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="Camera not available" xml:space="preserve" approved="no">
-        <source>Camera not available</source>
-        <target state="translated">相機不可用</target>
-      </trans-unit>
-      <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
-        <source>All messages will be deleted - this cannot be undone!</source>
-        <target state="translated">所有訊息都將被刪除 - 這不能還原！</target>
-      </trans-unit>
-      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve" approved="no">
-        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
-        <target state="translated">只有你的聯絡人允許的情況下，才允許不可逆地將訊息刪除。(24小時)</target>
-      </trans-unit>
-      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
-        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
-        <target state="translated">允許將不可撤銷的訊息刪除。(24小時)</target>
-      </trans-unit>
-      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
-        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
-        <target state="translated">允許您的聯絡人不可復原地刪除已傳送的訊息。(24小時)</target>
-      </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve" approved="no">
-        <source>Bad desktop address</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="Add contact" xml:space="preserve" approved="no">
-        <source>Add contact</source>
-        <target state="translated">新增聯絡人</target>
-      </trans-unit>
-      <trans-unit id="Advanced settings" xml:space="preserve" approved="no">
-        <source>Advanced settings</source>
-        <target state="translated">進階設定</target>
-      </trans-unit>
-      <trans-unit id="Allow calls?" xml:space="preserve" approved="no">
-        <source>Allow calls?</source>
-        <target state="translated">允許通話？</target>
-      </trans-unit>
-      <trans-unit id="Allow to send files and media." xml:space="preserve" approved="no">
-        <source>Allow to send files and media.</source>
-        <target state="translated">允許傳送檔案和媒體。</target>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve" approved="no">
-        <source>Already joining the group!</source>
-        <target state="translated">已加入群組！</target>
-      </trans-unit>
-      <trans-unit id="App data migration" xml:space="preserve" approved="no">
-        <source>App data migration</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="Archive and upload" xml:space="preserve" approved="no">
-        <source>Archive and upload</source>
-        <target state="translated">儲存並上傳</target>
-      </trans-unit>
-      <trans-unit id="Block" xml:space="preserve" approved="no">
-        <source>Block</source>
-        <target state="translated">封鎖</target>
-      </trans-unit>
-      <trans-unit id="Block group members" xml:space="preserve" approved="no">
-        <source>Block group members</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="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve" approved="no">
-        <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
-        <target state="translated">保加利亞語、芬蘭語、泰語和烏克蘭語——感謝使用者們和[Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)！</target>
-      </trans-unit>
-      <trans-unit id="Can't call member" xml:space="preserve" approved="no">
-        <source>Can't call member</source>
-        <target state="translated">無法與成員通話</target>
-      </trans-unit>
-      <trans-unit id="Can't message member" xml:space="preserve" approved="no">
-        <source>Can't message member</source>
-        <target state="translated">無法傳送訊息給成員</target>
-      </trans-unit>
-      <trans-unit id="Cancel migration" xml:space="preserve" approved="no">
-        <source>Cancel migration</source>
-        <target state="translated">取消遷移</target>
-      </trans-unit>
-      <trans-unit id="Chat database exported" xml:space="preserve" approved="no">
-        <source>Chat database exported</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="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve" approved="no">
-        <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
-        <target state="translated">你的所有聯絡人、對話和文件將被安全加密並切塊上傳到設置的 XFTP 中繼。</target>
-      </trans-unit>
-      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve" approved="no">
-        <source>Address change will be aborted. Old receiving address will be used.</source>
-        <target state="translated">將取消地址更改。將使用舊聯絡地址。</target>
-      </trans-unit>
-      <trans-unit id="Archiving database" xml:space="preserve" approved="no">
-        <source>Archiving database</source>
-        <target state="translated">正在儲存資料庫</target>
-      </trans-unit>
-      <trans-unit id="Cellular" xml:space="preserve" approved="no">
-        <source>Cellular</source>
-        <target state="translated">行動網路</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="%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="Already connecting!" xml:space="preserve" approved="no">
-        <source>Already connecting!</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="(new)" xml:space="preserve" approved="no">
-        <source>(new)</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="A few more things" xml:space="preserve" approved="no">
-        <source>A few more things</source>
-        <target state="translated">其他</target>
-      </trans-unit>
-      <trans-unit id="Show last messages" xml:space="preserve" approved="no">
-        <source>Show last messages</source>
-        <target state="translated">顯示最新的訊息</target>
-      </trans-unit>
-      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve" approved="no">
-        <source>App encrypts new local files (except videos).</source>
-        <target state="translated">應用程式將為新的本機文件(影片除外)加密。</target>
-      </trans-unit>
-      <trans-unit id="Better groups" xml:space="preserve" approved="no">
-        <source>Better groups</source>
-        <target state="translated">更加的群組</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="Blocked by admin" xml:space="preserve" approved="no">
-        <source>Blocked by admin</source>
-        <target state="translated">由管理員封鎖</target>
-      </trans-unit>
-      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
-        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
-        <target state="translated">您與您的聯絡人都可以不可復原地删除已傳送的訊息。(24小時)</target>
-      </trans-unit>
-      <trans-unit id="Encrypt local files" xml:space="preserve" approved="no">
-        <source>Encrypt local files</source>
-        <target state="translated">加密本機檔案</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="- 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="Abort changing address?" xml:space="preserve" approved="no">
-        <source>Abort changing address?</source>
-        <target state="translated">中止更改地址？</target>
-      </trans-unit>
-      <trans-unit id="Allow to send SimpleX links." xml:space="preserve" approved="no">
-        <source>Allow to send SimpleX links.</source>
-        <target state="translated">允許傳送 SimpleX 連結。</target>
-      </trans-unit>
-      <trans-unit id="Background" xml:space="preserve" approved="no">
-        <source>Background</source>
-        <target state="translated">後台</target>
-      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="zh-Hant" datatype="plaintext">

apps/ios/SimpleX NSE/NotificationService.swift

@@ -339,9 +339,7 @@ class NotificationService: UNNotificationServiceExtension {
                 CXProvider.reportNewIncomingVoIPPushPayload([
                     "displayName": invitation.contact.displayName,
                     "contactId": invitation.contact.id,
-                    "callUUID": invitation.callUUID ?? "",
-                    "media": invitation.callType.media.rawValue,
-                    "callTs": invitation.callTs.timeIntervalSince1970
+                    "media": invitation.callType.media.rawValue
                 ]) { error in
                     logger.debug("reportNewIncomingVoIPPushPayload result: \(error)")
                     deliver(error == nil ? nil : createCallInvitationNtf(invitation))

apps/ios/SimpleX SE/ShareView.swift

@@ -132,7 +132,7 @@ struct ShareView: View {
         switch content {
         case let .image(preview, _): imagePreview(preview)
         case let .movie(preview, _, _): imagePreview(preview)
-        case let .url(preview): linkPreview(preview)
+        case let .url(linkPreview): imagePreview(linkPreview.image)
         case let .data(cryptoFile):
             previewArea {
                 Image(systemName: "doc.fill")
@@ -160,29 +160,6 @@ struct ShareView: View {
         }
     }
 
-    @ViewBuilder private func linkPreview(_ linkPreview: LinkPreview) -> some View {
-        previewArea {
-            HStack(alignment: .center, spacing: 8) {
-                if let uiImage = UIImage(base64Encoded: linkPreview.image) {
-                    Image(uiImage: uiImage)
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .frame(maxWidth: 80, maxHeight: 60)
-                }
-                VStack(alignment: .center, spacing: 4) {
-                    Text(linkPreview.title)
-                        .lineLimit(1)
-                    Text(linkPreview.uri.absoluteString)
-                        .font(.caption)
-                        .lineLimit(1)
-                        .foregroundColor(.secondary)
-                }
-                .padding(.vertical, 5)
-                .frame(maxWidth: .infinity, minHeight: 60)
-            }
-        }
-    }
-
     @ViewBuilder private func previewArea<V: View>(@ViewBuilder content: @escaping () -> V) -> some View {
         HStack(alignment: .center, spacing: 8) {
             content()

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

@@ -82,27 +82,15 @@
 /* No comment provided by engineer. */
 "Selected chat preferences prohibit this message." = "Les paramètres de chat sélectionnés ne permettent pas l'envoi de ce message.";
 
-/* No comment provided by engineer. */
-"Sending a message takes longer than expected." = "L'envoi d'un message prend plus de temps que prévu.";
-
-/* No comment provided by engineer. */
-"Sending message…" = "Envoi du message…";
-
 /* No comment provided by engineer. */
 "Share" = "Partager";
 
-/* No comment provided by engineer. */
-"Slow network?" = "Réseau lent ?";
-
 /* No comment provided by engineer. */
 "Unknown database error: %@" = "Erreur inconnue de la base de données : %@";
 
 /* No comment provided by engineer. */
 "Unsupported format" = "Format non pris en charge";
 
-/* No comment provided by engineer. */
-"Wait" = "Attendez";
-
 /* No comment provided by engineer. */
 "Wrong database passphrase" = "Mauvaise phrase secrète pour la base de données";
 

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

@@ -107,5 +107,5 @@
 "Wrong database passphrase" = "Hibás adatbázis jelmondat";
 
 /* No comment provided by engineer. */
-"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "A megosztást az Adatvédelem és biztonság / SimpleX zár menüben engedélyezheti.";
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "A megosztást az Adatvédelem és biztonság / SimpleX zár menüpontban engedélyezheti.";
 

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

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

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

@@ -1,111 +1,7 @@
-/* No comment provided by engineer. */
-"%@" = "%@";
-
-/* No comment provided by engineer. */
-"App is locked!" = "Aplikacja zablokowana!";
-
-/* No comment provided by engineer. */
-"Cancel" = "Anuluj";
-
-/* No comment provided by engineer. */
-"Cannot access keychain to save database password" = "Nie można uzyskać dostępu do pęku kluczy aby zapisać hasło do bazy danych";
-
-/* No comment provided by engineer. */
-"Cannot forward message" = "Nie można przekazać wiadomości";
-
-/* No comment provided by engineer. */
-"Comment" = "Komentarz";
-
-/* No comment provided by engineer. */
-"Currently maximum supported file size is %@." = "Obecnie maksymalny obsługiwany rozmiar pliku to %@.";
-
-/* No comment provided by engineer. */
-"Database downgrade required" = "Wymagane obniżenie wersji bazy danych";
-
-/* No comment provided by engineer. */
-"Database encrypted!" = "Baza danych zaszyfrowana!";
-
-/* No comment provided by engineer. */
-"Database error" = "Błąd bazy danych";
-
-/* No comment provided by engineer. */
-"Database passphrase is different from saved in the keychain." = "Hasło bazy danych jest inne niż zapisane w pęku kluczy.";
-
-/* No comment provided by engineer. */
-"Database passphrase is required to open chat." = "Hasło do bazy danych jest wymagane do otwarcia czatu.";
-
-/* No comment provided by engineer. */
-"Database upgrade required" = "Wymagana aktualizacja bazy danych";
-
-/* No comment provided by engineer. */
-"Error preparing file" = "Błąd przygotowania pliku";
-
-/* No comment provided by engineer. */
-"Error preparing message" = "Błąd przygotowania wiadomości";
-
-/* No comment provided by engineer. */
-"Error: %@" = "Błąd: %@";
-
-/* No comment provided by engineer. */
-"File error" = "Błąd pliku";
-
-/* No comment provided by engineer. */
-"Incompatible database version" = "Niekompatybilna wersja bazy danych";
-
-/* No comment provided by engineer. */
-"Invalid migration confirmation" = "Nieprawidłowe potwierdzenie migracji";
-
-/* No comment provided by engineer. */
-"Keychain error" = "Błąd pęku kluczy";
-
-/* No comment provided by engineer. */
-"Large file!" = "Duży plik!";
-
-/* No comment provided by engineer. */
-"No active profile" = "Brak aktywnego profilu";
-
-/* No comment provided by engineer. */
-"Ok" = "Ok";
-
-/* No comment provided by engineer. */
-"Open the app to downgrade the database." = "Otwórz aplikację aby obniżyć wersję bazy danych.";
-
-/* No comment provided by engineer. */
-"Open the app to upgrade the database." = "Otwórz aplikację aby zaktualizować bazę danych.";
-
-/* No comment provided by engineer. */
-"Passphrase" = "Hasło";
-
-/* No comment provided by engineer. */
-"Please create a profile in the SimpleX app" = "Proszę utworzyć profil w aplikacji SimpleX";
-
-/* No comment provided by engineer. */
-"Selected chat preferences prohibit this message." = "Wybrane preferencje czatu zabraniają tej wiadomości.";
-
-/* No comment provided by engineer. */
-"Sending a message takes longer than expected." = "Wysłanie wiadomości trwa dłużej niż oczekiwano.";
-
-/* No comment provided by engineer. */
-"Sending message…" = "Wysyłanie wiadomości…";
-
-/* No comment provided by engineer. */
-"Share" = "Udostępnij";
-
-/* No comment provided by engineer. */
-"Slow network?" = "Wolna sieć?";
-
-/* No comment provided by engineer. */
-"Unknown database error: %@" = "Nieznany błąd bazy danych: %@";
-
-/* No comment provided by engineer. */
-"Unsupported format" = "Niewspierany format";
-
-/* No comment provided by engineer. */
-"Wait" = "Czekaj";
-
-/* No comment provided by engineer. */
-"Wrong database passphrase" = "Nieprawidłowe hasło bazy danych";
-
-/* No comment provided by engineer. */
-"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Możesz zezwolić na udostępnianie w ustawieniach Prywatność i bezpieczeństwo / Blokada SimpleX.";
+/* 
+  Localizable.strings
+  SimpleX
 
+  Created by EP on 30/07/2024.
+  Copyright © 2024 SimpleX Chat. All rights reserved.
+*/

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

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

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

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

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -135,6 +135,7 @@
 		5CE4407927ADB701007B033A /* EmojiItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE4407827ADB701007B033A /* EmojiItemView.swift */; };
 		5CEACCE327DE9246000BD591 /* ComposeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCE227DE9246000BD591 /* ComposeView.swift */; };
 		5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEACCEC27DEA495000BD591 /* MsgContentView.swift */; };
+		5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */; };
 		5CEBD7482A5F115D00665FE2 /* SetDeliveryReceiptsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */; };
 		5CF937202B24DE8C00E1D781 /* SharedFileSubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */; };
 		5CF937232B2503D000E1D781 /* NSESubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF937212B25034A00E1D781 /* NSESubscriber.swift */; };
@@ -177,8 +178,6 @@
 		64E972072881BB22008DBC02 /* CIGroupInvitationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */; };
 		64EEB0F72C353F1C00972D62 /* ServersSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64EEB0F62C353F1C00972D62 /* ServersSummaryView.swift */; };
 		64F1CC3B28B39D8600CD1FB1 /* IncognitoHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */; };
-		8C01E9C12C8EFC33008A4B0A /* objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C01E9C02C8EFC33008A4B0A /* objc.m */; };
-		8C01E9C22C8EFF8F008A4B0A /* objc.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C01E9BF2C8EFBB6008A4B0A /* objc.h */; };
 		8C69FE7D2B8C7D2700267E38 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C69FE7C2B8C7D2700267E38 /* AppSettings.swift */; };
 		8C74C3E52C1B900600039E77 /* ThemeTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7E3CE32C0DEAC400BFF63A /* ThemeTypes.swift */; };
 		8C74C3E72C1B901900039E77 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C852B072C1086D100BA61E8 /* Color.swift */; };
@@ -216,15 +215,15 @@
 		D77B92DC2952372200A5A1CC /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = D77B92DB2952372200A5A1CC /* SwiftyGif */; };
 		D7F0E33929964E7E0068AF69 /* LZString in Frameworks */ = {isa = PBXBuildFile; productRef = D7F0E33829964E7E0068AF69 /* LZString */; };
 		E51CC1E62C62085600DB91FE /* OneHandUICard.swift in Sources */ = {isa = PBXBuildFile; fileRef = E51CC1E52C62085600DB91FE /* OneHandUICard.swift */; };
-		E5CC47842CA31C3A00551ACF /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5CC477F2CA31C3900551ACF /* libgmpxx.a */; };
-		E5CC47852CA31C3A00551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5CC47802CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a */; };
-		E5CC47862CA31C3A00551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5CC47812CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a */; };
-		E5CC47872CA31C3A00551ACF /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5CC47822CA31C3A00551ACF /* libgmp.a */; };
-		E5CC47882CA31C3A00551ACF /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5CC47832CA31C3A00551ACF /* libffi.a */; };
 		E5DCF8DB2C56FAC1007928CC /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		E5DCF9712C590272007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF96F2C590272007928CC /* Localizable.strings */; };
 		E5DCF9842C5902CE007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9822C5902CE007928CC /* Localizable.strings */; };
 		E5DCF9982C5906FF007928CC /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9962C5906FF007928CC /* InfoPlist.strings */; };
+		E5E2183F2C655B410013B4C6 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E2183A2C655B410013B4C6 /* libgmp.a */; };
+		E5E218402C655B410013B4C6 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E2183B2C655B410013B4C6 /* libgmpxx.a */; };
+		E5E218412C655B410013B4C6 /* libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E2183C2C655B410013B4C6 /* libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8.a */; };
+		E5E218422C655B410013B4C6 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E2183D2C655B410013B4C6 /* libffi.a */; };
+		E5E218432C655B410013B4C6 /* libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E2183E2C655B410013B4C6 /* libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8-ghc9.6.3.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -475,6 +474,7 @@
 		5CE6C7B42AAB1527007F345C /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CEACCE227DE9246000BD591 /* ComposeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeView.swift; sourceTree = "<group>"; };
 		5CEACCEC27DEA495000BD591 /* MsgContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MsgContentView.swift; sourceTree = "<group>"; };
+		5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardPadding.swift; sourceTree = "<group>"; };
 		5CEBD7472A5F115D00665FE2 /* SetDeliveryReceiptsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetDeliveryReceiptsView.swift; sourceTree = "<group>"; };
 		5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedFileSubscriber.swift; sourceTree = "<group>"; };
 		5CF937212B25034A00E1D781 /* NSESubscriber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSESubscriber.swift; sourceTree = "<group>"; };
@@ -518,8 +518,6 @@
 		64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIGroupInvitationView.swift; sourceTree = "<group>"; };
 		64EEB0F62C353F1C00972D62 /* ServersSummaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServersSummaryView.swift; sourceTree = "<group>"; };
 		64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoHelp.swift; sourceTree = "<group>"; };
-		8C01E9BF2C8EFBB6008A4B0A /* objc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = objc.h; sourceTree = "<group>"; };
-		8C01E9C02C8EFC33008A4B0A /* objc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = objc.m; sourceTree = "<group>"; };
 		8C69FE7C2B8C7D2700267E38 /* AppSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = "<group>"; };
 		8C74C3EB2C1B92A900039E77 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
 		8C74C3ED2C1B942300039E77 /* ChatWallpaper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatWallpaper.swift; sourceTree = "<group>"; };
@@ -554,11 +552,6 @@
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
 		D7AA2C3429A936B400737B40 /* MediaEncryption.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = MediaEncryption.playground; path = Shared/MediaEncryption.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		E51CC1E52C62085600DB91FE /* OneHandUICard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneHandUICard.swift; sourceTree = "<group>"; };
-		E5CC477F2CA31C3900551ACF /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		E5CC47802CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a"; sourceTree = "<group>"; };
-		E5CC47812CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a"; sourceTree = "<group>"; };
-		E5CC47822CA31C3A00551ACF /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		E5CC47832CA31C3A00551ACF /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		E5DCF9702C590272007928CC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9722C590274007928CC /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9732C590275007928CC /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -611,6 +604,11 @@
 		E5DCF9A62C590731007928CC /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E5DCF9A72C590732007928CC /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E5DCF9A82C590732007928CC /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		E5E2183A2C655B410013B4C6 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		E5E2183B2C655B410013B4C6 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		E5E2183C2C655B410013B4C6 /* libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8.a"; sourceTree = "<group>"; };
+		E5E2183D2C655B410013B4C6 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		E5E2183E2C655B410013B4C6 /* libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8-ghc9.6.3.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -649,12 +647,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E5CC47852CA31C3A00551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a in Frameworks */,
-				E5CC47872CA31C3A00551ACF /* libgmp.a in Frameworks */,
-				E5CC47842CA31C3A00551ACF /* libgmpxx.a in Frameworks */,
-				E5CC47882CA31C3A00551ACF /* libffi.a in Frameworks */,
+				E5E218412C655B410013B4C6 /* libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8.a in Frameworks */,
+				E5E218432C655B410013B4C6 /* libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8-ghc9.6.3.a in Frameworks */,
+				E5E218402C655B410013B4C6 /* libgmpxx.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				E5CC47862CA31C3A00551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a in Frameworks */,
+				E5E218422C655B410013B4C6 /* libffi.a in Frameworks */,
+				E5E2183F2C655B410013B4C6 /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
 				CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */,
 			);
@@ -733,11 +731,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				E5CC47832CA31C3A00551ACF /* libffi.a */,
-				E5CC47822CA31C3A00551ACF /* libgmp.a */,
-				E5CC477F2CA31C3900551ACF /* libgmpxx.a */,
-				E5CC47812CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP-ghc9.6.3.a */,
-				E5CC47802CA31C3900551ACF /* libHSsimplex-chat-6.0.5.0-3qcee2iGFVOIynW0cRTIaP.a */,
+				E5E2183D2C655B410013B4C6 /* libffi.a */,
+				E5E2183A2C655B410013B4C6 /* libgmp.a */,
+				E5E2183B2C655B410013B4C6 /* libgmpxx.a */,
+				E5E2183E2C655B410013B4C6 /* libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8-ghc9.6.3.a */,
+				E5E2183C2C655B410013B4C6 /* libHSsimplex-chat-6.0.0.5-LgHyBNgR6mx4TwahlxfNH8.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -788,6 +786,7 @@
 				18415DAAAD1ADBEDB0EDA852 /* VideoPlayerView.swift */,
 				64466DCB29FFE3E800E3D48D /* MailView.swift */,
 				64C3B0202A0D359700E19930 /* CustomTimePicker.swift */,
+				5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */,
 				8C7F8F0D2C19C0C100D16888 /* ViewModifiers.swift */,
 				8C74C3ED2C1B942300039E77 /* ChatWallpaper.swift */,
 				8C9BC2642C240D5100875A27 /* ThemeModeEditor.swift */,
@@ -980,8 +979,6 @@
 				5CE2BA96284537A800EC33A6 /* dummy.m */,
 				5CD67B8D2B0E858A00C510B1 /* hs_init.h */,
 				5CD67B8E2B0E858A00C510B1 /* hs_init.c */,
-				8C01E9BF2C8EFBB6008A4B0A /* objc.h */,
-				8C01E9C02C8EFC33008A4B0A /* objc.m */,
 			);
 			path = SimpleXChat;
 			sourceTree = "<group>";
@@ -1119,7 +1116,6 @@
 			files = (
 				5CE2BA77284530BF00EC33A6 /* SimpleXChat.h in Headers */,
 				5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */,
-				8C01E9C22C8EFF8F008A4B0A /* objc.h in Headers */,
 				5CE2BA952845354B00EC33A6 /* SimpleX.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1439,6 +1435,7 @@
 				646BB38E283FDB6D001CE359 /* LocalAuthenticationUtils.swift in Sources */,
 				8C74C3EA2C1B90AF00039E77 /* ThemeManager.swift in Sources */,
 				5C7505A227B65FDB00BE3227 /* CIMetaView.swift in Sources */,
+				5CEBD7462A5C0A8F00665FE2 /* KeyboardPadding.swift in Sources */,
 				5C35CFC827B2782E00FB6C6D /* BGManager.swift in Sources */,
 				5CB634B129E5EFEA0066AD6B /* PasscodeView.swift in Sources */,
 				8C69FE7D2B8C7D2700267E38 /* AppSettings.swift in Sources */,
@@ -1546,7 +1543,6 @@
 				8C74C3E72C1B901900039E77 /* Color.swift in Sources */,
 				5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */,
 				5CE2BA91284533A300EC33A6 /* Notifications.swift in Sources */,
-				8C01E9C12C8EFC33008A4B0A /* objc.m in Sources */,
 				5CE2BA79284530CC00EC33A6 /* SimpleXChat.docc in Sources */,
 				5CE2BA90284533A300EC33A6 /* JSON.swift in Sources */,
 				5CE2BA8B284533A300EC33A6 /* ChatTypes.swift in Sources */,
@@ -1887,7 +1883,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 239;
+				CURRENT_PROJECT_VERSION = 231;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1912,7 +1908,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 6.0.5;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1936,7 +1932,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 239;
+				CURRENT_PROJECT_VERSION = 231;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1961,7 +1957,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.5;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1977,11 +1973,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 239;
+				CURRENT_PROJECT_VERSION = 231;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.0.5;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1997,11 +1993,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 239;
+				CURRENT_PROJECT_VERSION = 231;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.0.5;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2022,7 +2018,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 239;
+				CURRENT_PROJECT_VERSION = 231;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -2037,7 +2033,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.5;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2059,7 +2055,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 239;
+				CURRENT_PROJECT_VERSION = 231;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -2074,7 +2070,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.5;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2096,7 +2092,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 239;
+				CURRENT_PROJECT_VERSION = 231;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2122,7 +2118,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.5;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2147,7 +2143,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 239;
+				CURRENT_PROJECT_VERSION = 231;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2173,7 +2169,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.5;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2198,7 +2194,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 239;
+				CURRENT_PROJECT_VERSION = 231;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2213,7 +2209,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.0.5;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2232,7 +2228,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 239;
+				CURRENT_PROJECT_VERSION = 231;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2247,7 +2243,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.0.5;
+				MARKETING_VERSION = 6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2324,7 +2320,7 @@
 			repositoryURL = "https://github.com/twostraws/CodeScanner";
 			requirement = {
 				kind = exactVersion;
-				version = 2.5.0;
+				version = 2.1.1;
 			};
 		};
 		8C73C1162C21E17B00892670 /* XCRemoteSwiftPackageReference "Yams" */ = {

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

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

apps/ios/SimpleXChat/APITypes.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import SwiftUI
-import Network
 
 public let jsonDecoder = getJSONDecoder()
 public let jsonEncoder = getJSONEncoder()
@@ -538,7 +537,7 @@ public enum ChatResponse: Decodable, Error {
     case networkConfig(networkConfig: NetCfg)
     case contactInfo(user: UserRef, contact: Contact, connectionStats_: ConnectionStats?, customUserProfile: Profile?)
     case groupMemberInfo(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats_: ConnectionStats?)
-    case queueInfo(user: UserRef, rcvMsgInfo: RcvMsgInfo?, queueInfo: ServerQueueInfo)
+    case queueInfo(user: UserRef, rcvMsgInfo: RcvMsgInfo?, queueInfo: QueueInfo)
     case contactSwitchStarted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
     case groupMemberSwitchStarted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
     case contactSwitchAborted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
@@ -1095,12 +1094,12 @@ public enum GroupLinkPlan: Decodable, Hashable {
     case known(groupInfo: GroupInfo)
 }
 
-struct NewUser: Encodable {
+struct NewUser: Encodable, Hashable {
     var profile: Profile?
     var pastTimestamp: Bool
 }
 
-public enum ChatPagination {
+public enum ChatPagination: Hashable {
     case last(count: Int)
     case after(chatItemId: Int64, count: Int)
     case before(chatItemId: Int64, count: Int)
@@ -1316,7 +1315,7 @@ public struct ServerAddress: Decodable {
     )
 }
 
-public struct NetCfg: Codable, Equatable {
+public struct NetCfg: Codable, Equatable, Hashable {
     public var socksProxy: String? = nil
     var socksMode: SocksMode = .always
     public var hostMode: HostMode = .publicHost
@@ -1370,18 +1369,18 @@ public struct NetCfg: Codable, Equatable {
     public var enableKeepAlive: Bool { tcpKeepAlive != nil }
 }
 
-public enum HostMode: String, Codable {
+public enum HostMode: String, Codable, Hashable {
     case onionViaSocks
     case onionHost = "onion"
     case publicHost = "public"
 }
 
-public enum SocksMode: String, Codable {
+public enum SocksMode: String, Codable, Hashable {
     case always = "always"
     case onion = "onion"
 }
 
-public enum SMPProxyMode: String, Codable, SelectableItem {
+public enum SMPProxyMode: String, Codable, Hashable, SelectableItem {
     case always = "always"
     case unknown = "unknown"
     case unprotected = "unprotected"
@@ -1401,7 +1400,7 @@ public enum SMPProxyMode: String, Codable, SelectableItem {
     public static let values: [SMPProxyMode] = [.always, .unknown, .unprotected, .never]
 }
 
-public enum SMPProxyFallback: String, Codable, SelectableItem {
+public enum SMPProxyFallback: String, Codable, Hashable, SelectableItem {
     case allow = "allow"
     case allowProtected = "allowProtected"
     case prohibit = "prohibit"
@@ -1419,7 +1418,7 @@ public enum SMPProxyFallback: String, Codable, SelectableItem {
     public static let values: [SMPProxyFallback] = [.allow, .allowProtected, .prohibit]
 }
 
-public enum OnionHosts: String, Identifiable {
+public enum OnionHosts: String, Identifiable, Hashable {
     case no
     case prefer
     case require
@@ -1453,7 +1452,7 @@ public enum OnionHosts: String, Identifiable {
     public static let values: [OnionHosts] = [.no, .prefer, .require]
 }
 
-public enum TransportSessionMode: String, Codable, Identifiable {
+public enum TransportSessionMode: String, Codable, Identifiable, Hashable {
     case user
     case entity
 
@@ -1469,7 +1468,7 @@ public enum TransportSessionMode: String, Codable, Identifiable {
     public static let values: [TransportSessionMode] = [.user, .entity]
 }
 
-public struct KeepAliveOpts: Codable, Equatable {
+public struct KeepAliveOpts: Codable, Equatable, Hashable {
     public var keepIdle: Int // seconds
     public var keepIntvl: Int // seconds
     public var keepCnt: Int // times
@@ -1477,64 +1476,7 @@ public struct KeepAliveOpts: Codable, Equatable {
     public static let defaults: KeepAliveOpts = KeepAliveOpts(keepIdle: 30, keepIntvl: 15, keepCnt: 4)
 }
 
-public struct NetworkProxy: Equatable, Codable {
-    public var host: String = ""
-    public var port: Int = 0
-    public var auth: NetworkProxyAuth = .username
-    public var username: String = ""
-    public var password: String = ""
-
-    public static var def: NetworkProxy {
-        NetworkProxy()
-    }
-    
-    public var valid: Bool {
-        let hostOk = switch NWEndpoint.Host(host) {
-        case .ipv4: true
-        case .ipv6: true
-        default: false
-        }
-        return hostOk &&
-                port > 0 && port <= 65535 &&
-                NetworkProxy.validCredential(username) && NetworkProxy.validCredential(password)
-    }
-    
-    public static func validCredential(_ s: String) -> Bool {
-        !s.contains(":") && !s.contains("@")
-    }
-
-    public func toProxyString() -> String? {
-        if !valid { return nil }
-        var res = ""
-        switch auth {
-        case .username:
-            let usernameTrimmed = username.trimmingCharacters(in: .whitespaces)
-            let passwordTrimmed = password.trimmingCharacters(in: .whitespaces)
-            if usernameTrimmed != "" || passwordTrimmed != "" {
-                res += usernameTrimmed + ":" + passwordTrimmed + "@"
-            } else {
-                res += "@"
-            }
-        case .isolate: ()
-        }
-        if host != "" {
-            if host.contains(":") {
-                res += "[\(host.trimmingCharacters(in: [" ", "[", "]"]))]"
-            } else {
-                res += host.trimmingCharacters(in: .whitespaces)
-            }
-        }
-        res += ":\(port)"
-        return res
-    }
-}
-
-public enum NetworkProxyAuth: String, Codable {
-    case username
-    case isolate
-}
-
-public enum NetworkStatus: Decodable, Equatable {
+public enum NetworkStatus: Decodable, Equatable, Hashable {
     case unknown
     case connected
     case disconnected
@@ -1572,7 +1514,7 @@ public enum NetworkStatus: Decodable, Equatable {
     }
 }
 
-public struct ConnNetworkStatus: Decodable {
+public struct ConnNetworkStatus: Decodable, Hashable {
     public var agentConnId: String
     public var networkStatus: NetworkStatus
 }
@@ -1597,7 +1539,7 @@ public enum MsgFilter: String, Codable, Hashable {
     case mentions
 }
 
-public struct UserMsgReceiptSettings: Codable {
+public struct UserMsgReceiptSettings: Codable, Hashable {
     public var enable: Bool
     public var clearOverrides: Bool
 
@@ -1646,7 +1588,7 @@ public enum SndSwitchStatus: String, Codable, Hashable {
     case sendingQTEST = "sending_qtest"
 }
 
-public enum QueueDirection: String, Decodable {
+public enum QueueDirection: String, Decodable, Hashable {
     case rcv
     case snd
 }
@@ -1701,12 +1643,12 @@ public struct AutoAccept: Codable, Hashable {
     }
 }
 
-public protocol SelectableItem: Identifiable, Equatable {
+public protocol SelectableItem: Hashable, Identifiable {
     var label: LocalizedStringKey { get }
     static var values: [Self] { get }
 }
 
-public struct DeviceToken: Decodable {
+public struct DeviceToken: Decodable, Hashable {
     var pushProvider: PushProvider
     var token: String
 
@@ -1720,12 +1662,12 @@ public struct DeviceToken: Decodable {
     }
 }
 
-public enum PushEnvironment: String {
+public enum PushEnvironment: String, Hashable {
     case development
     case production
 }
 
-public enum PushProvider: String, Decodable {
+public enum PushProvider: String, Decodable, Hashable {
     case apns_dev
     case apns_prod
 
@@ -1739,7 +1681,7 @@ public enum PushProvider: String, Decodable {
 
 // This notification mode is for app core, UI uses AppNotificationsMode.off to mean completely disable,
 // and .local for periodic background checks
-public enum NotificationsMode: String, Decodable, SelectableItem {
+public enum NotificationsMode: String, Decodable, SelectableItem, Hashable {
     case off = "OFF"
     case periodic = "PERIODIC"
     case instant = "INSTANT"
@@ -1757,7 +1699,7 @@ public enum NotificationsMode: String, Decodable, SelectableItem {
     public static var values: [NotificationsMode] = [.instant, .periodic, .off]
 }
 
-public enum NotificationPreviewMode: String, SelectableItem, Codable {
+public enum NotificationPreviewMode: String, SelectableItem, Codable, Hashable {
     case hidden
     case contact
     case message
@@ -1775,7 +1717,7 @@ public enum NotificationPreviewMode: String, SelectableItem, Codable {
     public static var values: [NotificationPreviewMode] = [.message, .contact, .hidden]
 }
 
-public struct RemoteCtrlInfo: Decodable {
+public struct RemoteCtrlInfo: Decodable, Hashable {
     public var remoteCtrlId: Int64
     public var ctrlDeviceName: String
     public var sessionState: RemoteCtrlSessionState?
@@ -1785,7 +1727,7 @@ public struct RemoteCtrlInfo: Decodable {
     }
 }
 
-public enum RemoteCtrlSessionState: Decodable {
+public enum RemoteCtrlSessionState: Decodable, Hashable {
     case starting
     case searching
     case connecting
@@ -1800,17 +1742,17 @@ public enum RemoteCtrlStopReason: Decodable {
     case disconnected
 }
 
-public struct CtrlAppInfo: Decodable {
+public struct CtrlAppInfo: Decodable, Hashable {
     public var appVersionRange: AppVersionRange
     public var deviceName: String
 }
 
-public struct AppVersionRange: Decodable {
+public struct AppVersionRange: Decodable, Hashable {
     public var minVersion: String
     public var maxVersion: String
 }
 
-public struct CoreVersionInfo: Decodable {
+public struct CoreVersionInfo: Decodable, Hashable {
     public var version: String
     public var simplexmqVersion: String
     public var simplexmqCommit: String
@@ -2148,22 +2090,20 @@ public enum RemoteCtrlError: Decodable, Hashable {
     case protocolError
 }
 
-public struct MigrationFileLinkData: Codable {
+public struct MigrationFileLinkData: Codable, Hashable {
     let networkConfig: NetworkConfig?
 
     public init(networkConfig: NetworkConfig) {
         self.networkConfig = networkConfig
     }
 
-    public struct NetworkConfig: Codable {
+    public struct NetworkConfig: Codable, Hashable {
         let socksProxy: String?
-        let networkProxy: NetworkProxy?
         let hostMode: HostMode?
         let requiredHostMode: Bool?
 
-        public init(socksProxy: String?, networkProxy: NetworkProxy?, hostMode: HostMode?, requiredHostMode: Bool?) {
+        public init(socksProxy: String?, hostMode: HostMode?, requiredHostMode: Bool?) {
             self.socksProxy = socksProxy
-            self.networkProxy = networkProxy
             self.hostMode = hostMode
             self.requiredHostMode = requiredHostMode
         }
@@ -2172,7 +2112,6 @@ public struct MigrationFileLinkData: Codable {
             return if let hostMode, let requiredHostMode {
                 NetworkConfig(
                     socksProxy: nil,
-                    networkProxy: nil,
                     hostMode: hostMode == .onionViaSocks ? .onionHost : hostMode,
                     requiredHostMode: requiredHostMode
                 )
@@ -2190,9 +2129,8 @@ public struct MigrationFileLinkData: Codable {
     }
 }
 
-public struct AppSettings: Codable, Equatable {
+public struct AppSettings: Codable, Equatable, Hashable {
     public var networkConfig: NetCfg? = nil
-    public var networkProxy: NetworkProxy? = nil
     public var privacyEncryptLocalFiles: Bool? = nil
     public var privacyAskToApproveRelays: Bool? = nil
     public var privacyAcceptImages: Bool? = nil
@@ -2224,7 +2162,6 @@ public struct AppSettings: Codable, Equatable {
         var empty = AppSettings()
         let def = AppSettings.defaults
         if networkConfig != def.networkConfig { empty.networkConfig = networkConfig }
-        if networkProxy != def.networkProxy { empty.networkProxy = networkProxy }
         if privacyEncryptLocalFiles != def.privacyEncryptLocalFiles { empty.privacyEncryptLocalFiles = privacyEncryptLocalFiles }
         if privacyAskToApproveRelays != def.privacyAskToApproveRelays { empty.privacyAskToApproveRelays = privacyAskToApproveRelays }
         if privacyAcceptImages != def.privacyAcceptImages { empty.privacyAcceptImages = privacyAcceptImages }
@@ -2257,7 +2194,6 @@ public struct AppSettings: Codable, Equatable {
     public static var defaults: AppSettings {
         AppSettings (
             networkConfig: NetCfg.defaults,
-            networkProxy: NetworkProxy.def,
             privacyEncryptLocalFiles: true,
             privacyAskToApproveRelays: true,
             privacyAcceptImages: true,
@@ -2288,7 +2224,7 @@ public struct AppSettings: Codable, Equatable {
     }
 }
 
-public enum AppSettingsNotificationMode: String, Codable {
+public enum AppSettingsNotificationMode: String, Codable, Hashable {
     case off
     case periodic
     case instant
@@ -2316,13 +2252,13 @@ public enum AppSettingsNotificationMode: String, Codable {
 //    case message
 //}
 
-public enum AppSettingsLockScreenCalls: String, Codable {
+public enum AppSettingsLockScreenCalls: String, Codable, Hashable {
     case disable
     case show
     case accept
 }
 
-public struct UserNetworkInfo: Codable, Equatable {
+public struct UserNetworkInfo: Codable, Equatable, Hashable {
     public let networkType: UserNetworkType
     public let online: Bool
 
@@ -2332,7 +2268,7 @@ public struct UserNetworkInfo: Codable, Equatable {
     }
 }
 
-public enum UserNetworkType: String, Codable {
+public enum UserNetworkType: String, Codable, Hashable {
     case none
     case cellular
     case wifi
@@ -2350,7 +2286,7 @@ public enum UserNetworkType: String, Codable {
     }
 }
 
-public struct RcvMsgInfo: Codable {
+public struct RcvMsgInfo: Codable, Hashable {
     var msgId: Int64
     var msgDeliveryId: Int64
     var msgDeliveryStatus: String
@@ -2358,16 +2294,7 @@ public struct RcvMsgInfo: Codable {
     var agentMsgMeta: String
 }
 
-public struct ServerQueueInfo: Codable {
-    var server: String
-    var rcvId: String
-    var sndId: String
-    var ntfId: String?
-    var status: String
-    var info: QueueInfo
-}
-
-public struct QueueInfo: Codable {
+public struct QueueInfo: Codable, Hashable {
     var qiSnd: Bool
     var qiNtf: Bool
     var qiSub: QSub?
@@ -2375,25 +2302,25 @@ public struct QueueInfo: Codable {
     var qiMsg: MsgInfo?
 }
 
-public struct QSub: Codable {
+public struct QSub: Codable, Hashable {
     var qSubThread: QSubThread
     var qDelivered: String?
 }
 
-public enum QSubThread: String, Codable {
+public enum QSubThread: String, Codable, Hashable {
     case noSub
     case subPending
     case subThread
     case prohibitSub
 }
 
-public struct MsgInfo: Codable {
+public struct MsgInfo: Codable, Hashable {
     var msgId: String
     var msgTs: Date
     var msgType: MsgType
 }
 
-public enum MsgType: String, Codable {
+public enum MsgType: String, Codable, Hashable {
     case message
     case quota
 }

apps/ios/SimpleXChat/AppGroup.swift

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

apps/ios/SimpleXChat/CallTypes.swift

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

apps/ios/SimpleXChat/ChatTypes.swift

@@ -1500,12 +1500,6 @@ public struct ChatData: Decodable, Identifiable, Hashable, ChatLike {
 
     public var id: ChatId { get { chatInfo.id } }
 
-    public init(chatInfo: ChatInfo, chatItems: [ChatItem], chatStats: ChatStats = ChatStats()) {
-        self.chatInfo = chatInfo
-        self.chatItems = chatItems
-        self.chatStats = chatStats
-    }
-    
     public static func invalidJSON(_ json: String) -> ChatData {
         ChatData(
             chatInfo: .invalidJSON(json: json),

apps/ios/SimpleXChat/SimpleX.h

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

apps/ios/SimpleXChat/objc.h

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

apps/ios/SimpleXChat/objc.m

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

apps/ios/de.lproj/Localizable.strings

@@ -314,13 +314,13 @@
 "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." = "**Für jeden Kontakt und jedes Gruppenmitglied** wird eine separate TCP-Verbindung genutzt.\n**Bitte beachten Sie**: Wenn Sie viele Verbindungen haben, kann der Batterieverbrauch und die Datennutzung wesentlich höher sein und einige Verbindungen können scheitern.";
 
 /* No comment provided by engineer. */
-"Abort" = "Beenden";
+"Abort" = "Abbrechen";
 
 /* No comment provided by engineer. */
-"Abort changing address" = "Wechsel der Empfängeradresse beenden";
+"Abort changing address" = "Wechsel der Empfängeradresse abbrechen";
 
 /* No comment provided by engineer. */
-"Abort changing address?" = "Wechsel der Empfängeradresse beenden?";
+"Abort changing address?" = "Wechsel der Empfängeradresse abbrechen?";
 
 /* No comment provided by engineer. */
 "About SimpleX" = "Über SimpleX";
@@ -401,7 +401,7 @@
 "Address" = "Adresse";
 
 /* No comment provided by engineer. */
-"Address change will be aborted. Old receiving address will be used." = "Der Wechsel der Empfängeradresse wird beendet. Die bisherige Adresse wird weiter verwendet.";
+"Address change will be aborted. Old receiving address will be used." = "Der Wechsel der Empfängeradresse wird abgebrochen. Die bisherige Adresse wird weiter verwendet.";
 
 /* member role */
 "admin" = "Admin";
@@ -677,7 +677,7 @@
 "Better messages" = "Verbesserungen bei Nachrichten";
 
 /* No comment provided by engineer. */
-"Better networking" = "Kontrollieren Sie Ihr Netzwerk";
+"Better networking" = "Bessere Vernetzung";
 
 /* No comment provided by engineer. */
 "Black" = "Schwarz";
@@ -1843,7 +1843,7 @@
 "Error" = "Fehler";
 
 /* No comment provided by engineer. */
-"Error aborting address change" = "Fehler beim Beenden des Adresswechsels";
+"Error aborting address change" = "Fehler beim Abbrechen des Adresswechsels";
 
 /* No comment provided by engineer. */
 "Error accepting contact request" = "Fehler beim Annehmen der Kontaktanfrage";

apps/ios/es.lproj/Localizable.strings

@@ -356,10 +356,10 @@
 "accepted call" = "llamada aceptada";
 
 /* No comment provided by engineer. */
-"Acknowledged" = "Confirmaciones";
+"Acknowledged" = "Recibido";
 
 /* No comment provided by engineer. */
-"Acknowledgement errors" = "Errores de confirmación";
+"Acknowledgement errors" = "Errores de reconocimiento";
 
 /* No comment provided by engineer. */
 "Active connections" = "Conexiones activas";
@@ -437,7 +437,7 @@
 "All data is erased when it is entered." = "Al introducirlo todos los datos son eliminados.";
 
 /* No comment provided by engineer. */
-"All data is private to your device." = "Todos los datos son privados y están en tu dispositivo.";
+"All data is private to your device." = "Todos los datos son privados para tu dispositivo.";
 
 /* No comment provided by engineer. */
 "All group members will remain connected." = "Todos los miembros del grupo permanecerán conectados.";
@@ -506,7 +506,7 @@
 "Allow to send files and media." = "Se permite enviar archivos y multimedia.";
 
 /* No comment provided by engineer. */
-"Allow to send SimpleX links." = "Se permite enviar enlaces SimpleX.";
+"Allow to send SimpleX links." = "Permitir enviar enlaces SimpleX.";
 
 /* No comment provided by engineer. */
 "Allow to send voice messages." = "Permites enviar mensajes de voz.";
@@ -596,7 +596,7 @@
 "Archive and upload" = "Archivar y subir";
 
 /* No comment provided by engineer. */
-"Archive contacts to chat later." = "Archiva contactos para charlar más tarde.";
+"Archive contacts to chat later." = "Archivar contactos para charlar más tarde.";
 
 /* No comment provided by engineer. */
 "Archived contacts" = "Contactos archivados";
@@ -713,7 +713,7 @@
 "Blocked by admin" = "Bloqueado por administrador";
 
 /* No comment provided by engineer. */
-"Blur for better privacy." = "Difumina para mayor privacidad.";
+"Blur for better privacy." = "Difuminar para más privacidad.";
 
 /* No comment provided by engineer. */
 "Blur media" = "Difuminar multimedia";
@@ -861,7 +861,7 @@
 "Chat console" = "Consola de Chat";
 
 /* No comment provided by engineer. */
-"Chat database" = "Base de datos de SimpleX";
+"Chat database" = "Base de datos del chat";
 
 /* No comment provided by engineer. */
 "Chat database deleted" = "Base de datos eliminada";
@@ -873,13 +873,13 @@
 "Chat database imported" = "Base de datos importada";
 
 /* No comment provided by engineer. */
-"Chat is running" = "SimpleX está en ejecución";
+"Chat is running" = "Chat está en ejecución";
 
 /* No comment provided by engineer. */
-"Chat is stopped" = "SimpleX está parado";
+"Chat is stopped" = "Chat está parado";
 
 /* No comment provided by engineer. */
-"Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "SimpleX está parado. Si has usado esta base de datos en otro dispositivo, debes transferirla de vuelta antes de iniciar SimpleX.";
+"Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "Chat parado. Si has usado esta base de datos en otro dispositivo, debes transferirla de vuelta antes de iniciar Chat.";
 
 /* No comment provided by engineer. */
 "Chat list" = "Lista de chats";
@@ -954,7 +954,7 @@
 "complete" = "completado";
 
 /* No comment provided by engineer. */
-"Completed" = "Completadas";
+"Completed" = "Completado";
 
 /* No comment provided by engineer. */
 "Configure ICE servers" = "Configure servidores ICE";
@@ -987,7 +987,7 @@
 "Confirm password" = "Confirmar contraseña";
 
 /* No comment provided by engineer. */
-"Confirm that you remember database passphrase to migrate it." = "Para migrar confirma que recuerdas la frase de contraseña de la base de datos.";
+"Confirm that you remember database passphrase to migrate it." = "Confirma que recuerdas la frase de contraseña de la base de datos para migrarla.";
 
 /* No comment provided by engineer. */
 "Confirm upload" = "Confirmar subida";
@@ -1035,7 +1035,7 @@
 "connected" = "conectado";
 
 /* No comment provided by engineer. */
-"Connected" = "Conectadas";
+"Connected" = "Conectado";
 
 /* No comment provided by engineer. */
 "Connected desktop" = "Ordenador conectado";
@@ -1089,7 +1089,7 @@
 "Connection" = "Conexión";
 
 /* No comment provided by engineer. */
-"Connection and servers status." = "Estado de tu conexión y servidores.";
+"Connection and servers status." = "Estado de conexión y servidores.";
 
 /* No comment provided by engineer. */
 "Connection error" = "Error conexión";
@@ -1221,7 +1221,7 @@
 "Create your profile" = "Crea tu perfil";
 
 /* No comment provided by engineer. */
-"Created" = "Creadas";
+"Created" = "Creado";
 
 /* No comment provided by engineer. */
 "Created at" = "Creado";
@@ -1471,7 +1471,7 @@
 "deleted" = "eliminado";
 
 /* No comment provided by engineer. */
-"Deleted" = "Eliminadas";
+"Deleted" = "Eliminado";
 
 /* No comment provided by engineer. */
 "Deleted at" = "Eliminado";
@@ -1486,7 +1486,7 @@
 "deleted group" = "grupo eliminado";
 
 /* No comment provided by engineer. */
-"Deletion errors" = "Errores de eliminación";
+"Deletion errors" = "Errores de borrado";
 
 /* No comment provided by engineer. */
 "Delivery" = "Entrega";
@@ -1606,7 +1606,7 @@
 "Do it later" = "Hacer más tarde";
 
 /* No comment provided by engineer. */
-"Do not send history to new members." = "No se envía el historial a los miembros nuevos.";
+"Do not send history to new members." = "No enviar historial a miembros nuevos.";
 
 /* No comment provided by engineer. */
 "Do NOT send messages directly, even if your or destination server does not support private routing." = "NO enviar mensajes directamente incluso si tu servidor o el de destino no soportan enrutamiento privado.";
@@ -1993,7 +1993,7 @@
 "Error starting chat" = "Error al iniciar Chat";
 
 /* No comment provided by engineer. */
-"Error stopping chat" = "Error al parar SimpleX";
+"Error stopping chat" = "Error al parar Chat";
 
 /* No comment provided by engineer. */
 "Error switching profile!" = "¡Error al cambiar perfil!";
@@ -2048,7 +2048,7 @@
 "Expand" = "Expandir";
 
 /* No comment provided by engineer. */
-"expired" = "expirados";
+"expired" = "expirado";
 
 /* No comment provided by engineer. */
 "Export database" = "Exportar base de datos";
@@ -2417,7 +2417,7 @@
 "Improved server configuration" = "Configuración del servidor mejorada";
 
 /* No comment provided by engineer. */
-"In order to continue, chat should be stopped." = "Para continuar, SimpleX debe estar parado.";
+"In order to continue, chat should be stopped." = "Para continuar, Chat debe estar parado.";
 
 /* No comment provided by engineer. */
 "In reply to" = "En respuesta a";
@@ -2795,7 +2795,7 @@
 "Message forwarded" = "Mensaje reenviado";
 
 /* item status description */
-"Message may be delivered later if member becomes active." = "El mensaje podría ser entregado más tarde si el miembro vuelve a estar activo.";
+"Message may be delivered later if member becomes active." = "El mensaje puede ser entregado más tarde si el miembro vuelve a estar activo.";
 
 /* No comment provided by engineer. */
 "Message queue info" = "Información cola de mensajes";
@@ -3023,7 +3023,7 @@
 "No device token!" = "¡Sin dispositivo token!";
 
 /* item status description */
-"No direct connection yet, message is forwarded by admin." = "Aún no hay conexión directa con este miembro, el mensaje es reenviado por el administrador.";
+"No direct connection yet, message is forwarded by admin." = "Aún no hay conexión directa, el mensaje es reenviado por el administrador.";
 
 /* No comment provided by engineer. */
 "no e2e encryption" = "sin cifrar";
@@ -3253,7 +3253,7 @@
 "peer-to-peer" = "p2p";
 
 /* No comment provided by engineer. */
-"Pending" = "Pendientes";
+"Pending" = "Pendiente";
 
 /* No comment provided by engineer. */
 "People can connect to you only via the links you share." = "Las personas pueden conectarse contigo solo mediante los enlaces que compartes.";
@@ -3415,7 +3415,7 @@
 "Prohibit sending files and media." = "No permitir el envío de archivos y multimedia.";
 
 /* No comment provided by engineer. */
-"Prohibit sending SimpleX links." = "No se permite enviar enlaces SimpleX.";
+"Prohibit sending SimpleX links." = "No permitir el envío de enlaces SimpleX.";
 
 /* No comment provided by engineer. */
 "Prohibit sending voice messages." = "No se permiten mensajes de voz.";
@@ -3439,7 +3439,7 @@
 "Protocol timeout per KB" = "Timeout protocolo por KB";
 
 /* No comment provided by engineer. */
-"Proxied" = "Como proxy";
+"Proxied" = "Con proxy";
 
 /* No comment provided by engineer. */
 "Proxied servers" = "Servidores con proxy";
@@ -3517,7 +3517,7 @@
 "Received reply" = "Respuesta recibida";
 
 /* No comment provided by engineer. */
-"Received total" = "Total recibidos";
+"Received total" = "Total recibido";
 
 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "La dirección de recepción pasará a otro servidor. El cambio se completará cuando el remitente esté en línea.";
@@ -3653,7 +3653,7 @@
 "Reset all hints" = "Reiniciar todas las pistas";
 
 /* No comment provided by engineer. */
-"Reset all statistics" = "Restablecer todas las estadísticas";
+"Reset all statistics" = "Restablecer estadísticas";
 
 /* No comment provided by engineer. */
 "Reset all statistics?" = "¿Restablecer todas las estadísticas?";
@@ -3707,7 +3707,7 @@
 "Role" = "Rol";
 
 /* No comment provided by engineer. */
-"Run chat" = "Ejecutar SimpleX";
+"Run chat" = "Ejecutar chat";
 
 /* No comment provided by engineer. */
 "Safely receive files" = "Recibe archivos de forma segura";
@@ -3833,7 +3833,7 @@
 "Secure queue" = "Cola segura";
 
 /* No comment provided by engineer. */
-"Secured" = "Aseguradas";
+"Secured" = "Seguro";
 
 /* No comment provided by engineer. */
 "Security assessment" = "Evaluación de la seguridad";
@@ -3917,7 +3917,7 @@
 "Send them from gallery or custom keyboards." = "Envíalos desde la galería o desde teclados personalizados.";
 
 /* No comment provided by engineer. */
-"Send up to 100 last messages to new members." = "Se envían hasta 100 mensajes más recientes a los miembros nuevos.";
+"Send up to 100 last messages to new members." = "Enviar hasta 100 últimos mensajes a los miembros nuevos.";
 
 /* No comment provided by engineer. */
 "Sender cancelled file transfer." = "El remitente ha cancelado la transferencia de archivos.";
@@ -3956,7 +3956,7 @@
 "Sent at: %@" = "Enviado: %@";
 
 /* No comment provided by engineer. */
-"Sent directly" = "Directamente";
+"Sent directly" = "Enviado directamente";
 
 /* notification */
 "Sent file event" = "Evento de archivo enviado";
@@ -3974,10 +3974,10 @@
 "Sent reply" = "Respuesta enviada";
 
 /* No comment provided by engineer. */
-"Sent total" = "Total enviados";
+"Sent total" = "Total enviado";
 
 /* No comment provided by engineer. */
-"Sent via proxy" = "Mediante proxy";
+"Sent via proxy" = "Enviado mediante proxy";
 
 /* No comment provided by engineer. */
 "Server address" = "Dirección del servidor";
@@ -4106,7 +4106,7 @@
 "Show message status" = "Estado del mensaje";
 
 /* No comment provided by engineer. */
-"Show percentage" = "Mostrar porcentajes";
+"Show percentage" = "Mostrar porcentaje";
 
 /* No comment provided by engineer. */
 "Show preview" = "Mostrar vista previa";
@@ -4223,13 +4223,13 @@
 "Stop" = "Parar";
 
 /* No comment provided by engineer. */
-"Stop chat" = "Parar SimpleX";
+"Stop chat" = "Parar chat";
 
 /* No comment provided by engineer. */
-"Stop chat to enable database actions" = "Para habilitar las acciones sobre la base de datos, debes parar SimpleX";
+"Stop chat to enable database actions" = "Para habilitar las acciones sobre la base de datos, debes parar Chat";
 
 /* No comment provided by engineer. */
-"Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." = "Para poder exportar, importar o eliminar la base de datos primero debes parar SimpleX. Mientras tanto no podrás recibir ni enviar mensajes.";
+"Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." = "Para poder exportar, importar o eliminar la base de datos primero debes parar Chat. Mientras tanto no podrás recibir ni enviar mensajes.";
 
 /* No comment provided by engineer. */
 "Stop chat?" = "¿Parar Chat?";
@@ -4352,7 +4352,7 @@
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "La aplicación puede notificarte cuando recibas mensajes o solicitudes de contacto: por favor, abre la configuración para activarlo.";
 
 /* No comment provided by engineer. */
-"The app will ask to confirm downloads from unknown file servers (except .onion)." = "La aplicación pedirá que confirmes las descargas desde servidores de archivos desconocidos (excepto si son .onion).";
+"The app will ask to confirm downloads from unknown file servers (except .onion)." = "La aplicación pedirá que confirmes las descargas desde servidores de archivos desconocidos (excepto .onion).";
 
 /* No comment provided by engineer. */
 "The attempt to change database passphrase was not completed." = "El intento de cambiar la contraseña de la base de datos no se ha completado.";
@@ -4418,7 +4418,7 @@
 "These settings are for your current profile **%@**." = "Esta configuración afecta a tu perfil actual **%@**.";
 
 /* No comment provided by engineer. */
-"They can be overridden in contact and group settings." = "Se puede modificar desde la configuración particular de cada grupo y contacto.";
+"They can be overridden in contact and group settings." = "Se pueden anular en la configuración de contactos.";
 
 /* No comment provided by engineer. */
 "This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." = "Esta acción es irreversible. Se eliminarán todos los archivos y multimedia recibidos y enviados. Las imágenes de baja resolución permanecerán.";
@@ -4709,7 +4709,7 @@
 "Use the app while in the call." = "Usar la aplicación durante la llamada.";
 
 /* No comment provided by engineer. */
-"Use the app with one hand." = "Usa la aplicación con una sola mano.";
+"Use the app with one hand." = "Usa la aplicación con una mano.";
 
 /* No comment provided by engineer. */
 "User profile" = "Perfil de usuario";
@@ -4979,7 +4979,7 @@
 "You can accept calls from lock screen, without device and app authentication." = "Puede aceptar llamadas desde la pantalla de bloqueo, sin autenticación de dispositivos y aplicaciones.";
 
 /* No comment provided by engineer. */
-"You can change it in Appearance settings." = "Puedes cambiar la posición de la barra desde el menú Apariencia.";
+"You can change it in Appearance settings." = "Puede cambiarlo desde el menú Apariencia.";
 
 /* No comment provided by engineer. */
 "You can create it later" = "Puedes crearla más tarde";

apps/ios/fr.lproj/Localizable.strings

@@ -314,7 +314,7 @@
 "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." = "Une connexion TCP distincte sera utilisée **pour chaque contact et membre de groupe**.\n**Veuillez noter** : si vous avez de nombreuses connexions, votre consommation de batterie et de réseau peut être nettement plus élevée et certaines liaisons peuvent échouer.";
 
 /* No comment provided by engineer. */
-"Abort" = "Abandonner";
+"Abort" = "Annuler";
 
 /* No comment provided by engineer. */
 "Abort changing address" = "Annuler le changement d'adresse";
@@ -472,9 +472,6 @@
 /* No comment provided by engineer. */
 "Allow calls only if your contact allows them." = "Autoriser les appels que si votre contact les autorise.";
 
-/* No comment provided by engineer. */
-"Allow calls?" = "Autoriser les appels ?";
-
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Autorise les messages éphémères seulement si votre contact vous l’autorise.";
 
@@ -593,13 +590,7 @@
 "Apply to" = "Appliquer à";
 
 /* No comment provided by engineer. */
-"Archive and upload" = "Archiver et téléverser";
-
-/* No comment provided by engineer. */
-"Archive contacts to chat later." = "Archiver les contacts pour discuter plus tard.";
-
-/* No comment provided by engineer. */
-"Archived contacts" = "Contacts archivés";
+"Archive and upload" = "Archiver et transférer";
 
 /* No comment provided by engineer. */
 "Archiving database" = "Archivage de la base de données";
@@ -676,9 +667,6 @@
 /* No comment provided by engineer. */
 "Better messages" = "Meilleurs messages";
 
-/* No comment provided by engineer. */
-"Better networking" = "Meilleure gestion de réseau";
-
 /* No comment provided by engineer. */
 "Black" = "Noir";
 
@@ -712,9 +700,6 @@
 /* No comment provided by engineer. */
 "Blocked by admin" = "Bloqué par l'administrateur";
 
-/* No comment provided by engineer. */
-"Blur for better privacy." = "Rendez les images floues et protégez-les contre les regards indiscrets.";
-
 /* No comment provided by engineer. */
 "Blur media" = "Flouter les médias";
 
@@ -742,9 +727,6 @@
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Par profil de chat (par défaut) ou [par connexion](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
-/* No comment provided by engineer. */
-"call" = "appeler";
-
 /* No comment provided by engineer. */
 "Call already ended!" = "Appel déjà terminé !";
 
@@ -760,27 +742,15 @@
 /* No comment provided by engineer. */
 "Calls" = "Appels";
 
-/* No comment provided by engineer. */
-"Calls prohibited!" = "Les appels ne sont pas autorisés !";
-
 /* No comment provided by engineer. */
 "Camera not available" = "Caméra non disponible";
 
-/* No comment provided by engineer. */
-"Can't call contact" = "Impossible d'appeler le contact";
-
-/* No comment provided by engineer. */
-"Can't call member" = "Impossible d'appeler le membre";
-
 /* No comment provided by engineer. */
 "Can't invite contact!" = "Impossible d'inviter le contact !";
 
 /* No comment provided by engineer. */
 "Can't invite contacts!" = "Impossible d'inviter les contacts !";
 
-/* No comment provided by engineer. */
-"Can't message member" = "Impossible d'envoyer un message à ce membre";
-
 /* No comment provided by engineer. */
 "Cancel" = "Annuler";
 
@@ -866,9 +836,6 @@
 /* No comment provided by engineer. */
 "Chat database deleted" = "Base de données du chat supprimée";
 
-/* No comment provided by engineer. */
-"Chat database exported" = "Exportation de la base de données des discussions";
-
 /* No comment provided by engineer. */
 "Chat database imported" = "Base de données du chat importée";
 
@@ -881,9 +848,6 @@
 /* No comment provided by engineer. */
 "Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "Le chat est arrêté. Si vous avez déjà utilisé cette base de données sur un autre appareil, vous devez la transférer à nouveau avant de démarrer le chat.";
 
-/* No comment provided by engineer. */
-"Chat list" = "Liste de discussion";
-
 /* No comment provided by engineer. */
 "Chat migrated!" = "Messagerie transférée !";
 
@@ -935,9 +899,6 @@
 /* No comment provided by engineer. */
 "Clear verification" = "Retirer la vérification";
 
-/* No comment provided by engineer. */
-"Color chats with the new themes." = "Colorez vos discussions avec les nouveaux thèmes.";
-
 /* No comment provided by engineer. */
 "Color mode" = "Mode de couleur";
 
@@ -954,7 +915,7 @@
 "complete" = "complet";
 
 /* No comment provided by engineer. */
-"Completed" = "Complétées";
+"Completed" = "Complété";
 
 /* No comment provided by engineer. */
 "Configure ICE servers" = "Configurer les serveurs ICE";
@@ -965,9 +926,6 @@
 /* No comment provided by engineer. */
 "Confirm" = "Confirmer";
 
-/* No comment provided by engineer. */
-"Confirm contact deletion?" = "Confirmer la suppression du contact ?";
-
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Confirmer la mise à niveau de la base de données";
 
@@ -1007,9 +965,6 @@
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "se connecter aux developpeurs de SimpleX Chat.";
 
-/* No comment provided by engineer. */
-"Connect to your friends faster." = "Connectez-vous à vos amis plus rapidement.";
-
 /* No comment provided by engineer. */
 "Connect to yourself?" = "Se connecter à soi-même ?";
 
@@ -1076,9 +1031,6 @@
 /* No comment provided by engineer. */
 "Connecting server… (error: %@)" = "Connexion au serveur… (erreur : %@)";
 
-/* No comment provided by engineer. */
-"Connecting to contact, please wait or check later!" = "Connexion au contact, veuillez patienter ou vérifier plus tard !";
-
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Connexion au bureau";
 
@@ -1088,9 +1040,6 @@
 /* No comment provided by engineer. */
 "Connection" = "Connexion";
 
-/* No comment provided by engineer. */
-"Connection and servers status." = "État de la connexion et des serveurs.";
-
 /* No comment provided by engineer. */
 "Connection error" = "Erreur de connexion";
 
@@ -1130,9 +1079,6 @@
 /* No comment provided by engineer. */
 "Contact already exists" = "Contact déjà existant";
 
-/* No comment provided by engineer. */
-"Contact deleted!" = "Contact supprimé !";
-
 /* No comment provided by engineer. */
 "contact has e2e encryption" = "Ce contact a le chiffrement de bout en bout";
 
@@ -1145,18 +1091,12 @@
 /* notification */
 "Contact is connected" = "Le contact est connecté";
 
-/* No comment provided by engineer. */
-"Contact is deleted." = "Le contact est supprimé.";
-
 /* No comment provided by engineer. */
 "Contact name" = "Nom du contact";
 
 /* No comment provided by engineer. */
 "Contact preferences" = "Préférences de contact";
 
-/* No comment provided by engineer. */
-"Contact will be deleted - this cannot be undone!" = "Le contact sera supprimé - il n'est pas possible de revenir en arrière !";
-
 /* No comment provided by engineer. */
 "Contacts" = "Contacts";
 
@@ -1166,9 +1106,6 @@
 /* No comment provided by engineer. */
 "Continue" = "Continuer";
 
-/* No comment provided by engineer. */
-"Conversation deleted!" = "Conversation supprimée !";
-
 /* No comment provided by engineer. */
 "Copy" = "Copier";
 
@@ -1221,7 +1158,7 @@
 "Create your profile" = "Créez votre profil";
 
 /* No comment provided by engineer. */
-"Created" = "Créées";
+"Created" = "Créé";
 
 /* No comment provided by engineer. */
 "Created at" = "Créé à";
@@ -1392,9 +1329,6 @@
 /* No comment provided by engineer. */
 "Delete contact" = "Supprimer le contact";
 
-/* No comment provided by engineer. */
-"Delete contact?" = "Supprimer le contact ?";
-
 /* No comment provided by engineer. */
 "Delete database" = "Supprimer la base de données";
 
@@ -1458,20 +1392,14 @@
 /* server test step */
 "Delete queue" = "Supprimer la file d'attente";
 
-/* No comment provided by engineer. */
-"Delete up to 20 messages at once." = "Supprimez jusqu'à 20 messages à la fois.";
-
 /* No comment provided by engineer. */
 "Delete user profile?" = "Supprimer le profil utilisateur ?";
 
-/* No comment provided by engineer. */
-"Delete without notification" = "Supprimer sans notification";
-
 /* deleted chat item */
 "deleted" = "supprimé";
 
 /* No comment provided by engineer. */
-"Deleted" = "Supprimées";
+"Deleted" = "Supprimé";
 
 /* No comment provided by engineer. */
 "Deleted at" = "Supprimé à";
@@ -1527,9 +1455,6 @@
 /* No comment provided by engineer. */
 "Develop" = "Développer";
 
-/* No comment provided by engineer. */
-"Developer options" = "Options pour les développeurs";
-
 /* No comment provided by engineer. */
 "Developer tools" = "Outils du développeur";
 
@@ -2536,9 +2461,6 @@
 /* group name */
 "invitation to group %@" = "invitation au groupe %@";
 
-/* No comment provided by engineer. */
-"invite" = "inviter";
-
 /* No comment provided by engineer. */
 "Invite friends" = "Inviter des amis";
 
@@ -2584,9 +2506,6 @@
 /* No comment provided by engineer. */
 "It can happen when:\n1. The messages expired in the sending client after 2 days or on the server after 30 days.\n2. Message decryption failed, because you or your contact used old database backup.\n3. The connection was compromised." = "Cela peut arriver quand :\n1. Les messages ont expiré dans le client expéditeur après 2 jours ou sur le serveur après 30 jours.\n2. Le déchiffrement du message a échoué, car vous ou votre contact avez utilisé une ancienne sauvegarde de base de données.\n3. La connexion a été compromise.";
 
-/* No comment provided by engineer. */
-"It protects your IP address and connections." = "Il protège votre adresse IP et vos connexions.";
-
 /* No comment provided by engineer. */
 "It seems like you are already connected via this link. If it is not the case, there was an error (%@)." = "Il semblerait que vous êtes déjà connecté via ce lien. Si ce n'est pas le cas, il y a eu une erreur (%@).";
 
@@ -2629,9 +2548,6 @@
 /* No comment provided by engineer. */
 "Keep" = "Conserver";
 
-/* No comment provided by engineer. */
-"Keep conversation" = "Garder la conversation";
-
 /* No comment provided by engineer. */
 "Keep the app open to use it from desktop" = "Garder l'application ouverte pour l'utiliser depuis le bureau";
 
@@ -2743,9 +2659,6 @@
 /* No comment provided by engineer. */
 "Max 30 seconds, received instantly." = "Max 30 secondes, réception immédiate.";
 
-/* No comment provided by engineer. */
-"Media & file servers" = "Serveurs de fichiers et de médias";
-
 /* blur media */
 "Medium" = "Modéré";
 
@@ -2776,9 +2689,6 @@
 /* No comment provided by engineer. */
 "Menus" = "Menus";
 
-/* No comment provided by engineer. */
-"message" = "message";
-
 /* item status text */
 "Message delivery error" = "Erreur de distribution du message";
 
@@ -2815,9 +2725,6 @@
 /* No comment provided by engineer. */
 "Message reception" = "Réception de message";
 
-/* No comment provided by engineer. */
-"Message servers" = "Serveurs de messages";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "La source du message reste privée.";
 
@@ -2926,9 +2833,6 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Différents profils de chat";
 
-/* No comment provided by engineer. */
-"mute" = "muet";
-
 /* swipe action */
 "Mute" = "Muet";
 
@@ -2962,9 +2866,6 @@
 /* No comment provided by engineer. */
 "New chat" = "Nouveau chat";
 
-/* No comment provided by engineer. */
-"New chat experience 🎉" = "Nouvelle expérience de discussion 🎉";
-
 /* notification */
 "New contact request" = "Nouvelle demande de contact";
 
@@ -2983,9 +2884,6 @@
 /* No comment provided by engineer. */
 "New in %@" = "Nouveautés de la %@";
 
-/* No comment provided by engineer. */
-"New media options" = "Nouvelles options de médias";
-
 /* No comment provided by engineer. */
 "New member role" = "Nouveau rôle";
 
@@ -3114,9 +3012,6 @@
 /* No comment provided by engineer. */
 "Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." = "Seuls les appareils clients stockent les profils des utilisateurs, les contacts, les groupes et les messages envoyés avec un **chiffrement de bout en bout à deux couches**.";
 
-/* No comment provided by engineer. */
-"Only delete conversation" = "Ne supprimer que la conversation";
-
 /* No comment provided by engineer. */
 "Only group owners can change group preferences." = "Seuls les propriétaires du groupe peuvent modifier les préférences du groupe.";
 
@@ -3273,12 +3168,6 @@
 /* No comment provided by engineer. */
 "PING interval" = "Intervalle de PING";
 
-/* No comment provided by engineer. */
-"Play from the chat list." = "Aperçu depuis la liste de conversation.";
-
-/* No comment provided by engineer. */
-"Please ask your contact to enable calls." = "Veuillez demander à votre contact d'autoriser les appels.";
-
 /* No comment provided by engineer. */
 "Please ask your contact to enable sending voice messages." = "Veuillez demander à votre contact de permettre l'envoi de messages vocaux.";
 
@@ -3459,9 +3348,6 @@
 /* No comment provided by engineer. */
 "Rate the app" = "Évaluer l'app";
 
-/* No comment provided by engineer. */
-"Reachable chat toolbar" = "Barre d'outils accessible";
-
 /* chat item menu */
 "React…" = "Réagissez…";
 
@@ -3649,9 +3535,6 @@
 /* No comment provided by engineer. */
 "Reset" = "Réinitialisation";
 
-/* No comment provided by engineer. */
-"Reset all hints" = "Rétablir tous les conseils";
-
 /* No comment provided by engineer. */
 "Reset all statistics" = "Réinitialiser toutes les statistiques";
 
@@ -3727,9 +3610,6 @@
 /* No comment provided by engineer. */
 "Save and notify group members" = "Enregistrer et en informer les membres du groupe";
 
-/* No comment provided by engineer. */
-"Save and reconnect" = "Sauvegarder et se reconnecter";
-
 /* No comment provided by engineer. */
 "Save and update group profile" = "Enregistrer et mettre à jour le profil du groupe";
 
@@ -3805,9 +3685,6 @@
 /* No comment provided by engineer. */
 "Scan server QR code" = "Scanner un code QR de serveur";
 
-/* No comment provided by engineer. */
-"search" = "rechercher";
-
 /* No comment provided by engineer. */
 "Search" = "Rechercher";
 
@@ -3833,7 +3710,7 @@
 "Secure queue" = "File d'attente sécurisée";
 
 /* No comment provided by engineer. */
-"Secured" = "Sécurisées";
+"Secured" = "Sécurisé";
 
 /* No comment provided by engineer. */
 "Security assessment" = "Évaluation de sécurité";
@@ -3887,14 +3764,11 @@
 "Send errors" = "Erreurs d'envoi";
 
 /* No comment provided by engineer. */
-"Send link previews" = "Aperçu des liens";
+"Send link previews" = "Envoi d'aperçus de liens";
 
 /* No comment provided by engineer. */
 "Send live message" = "Envoyer un message dynamique";
 
-/* No comment provided by engineer. */
-"Send message to enable calls." = "Envoyer un message pour activer les appels.";
-
 /* No comment provided by engineer. */
 "Send messages directly when IP address is protected and your or destination server does not support private routing." = "Envoyer les messages de manière directe lorsque l'adresse IP est protégée et que votre serveur ou le serveur de destination ne prend pas en charge le routage privé.";
 
@@ -3995,7 +3869,7 @@
 "Server requires authorization to create queues, check password" = "Le serveur requiert une autorisation pour créer des files d'attente, vérifiez le mot de passe";
 
 /* server test error */
-"Server requires authorization to upload, check password" = "Le serveur requiert une autorisation pour téléverser, vérifiez le mot de passe";
+"Server requires authorization to upload, check password" = "Le serveur requiert une autorisation pour uploader, vérifiez le mot de passe";
 
 /* No comment provided by engineer. */
 "Server test failed!" = "Échec du test du serveur !";
@@ -4075,9 +3949,6 @@
 /* No comment provided by engineer. */
 "Share address with contacts?" = "Partager l'adresse avec vos contacts ?";
 
-/* No comment provided by engineer. */
-"Share from other apps." = "Partager depuis d'autres applications.";
-
 /* No comment provided by engineer. */
 "Share link" = "Partager le lien";
 
@@ -4100,7 +3971,7 @@
 "Show developer options" = "Afficher les options pour les développeurs";
 
 /* No comment provided by engineer. */
-"Show last messages" = "Aperçu des derniers messages";
+"Show last messages" = "Voir les derniers messages";
 
 /* No comment provided by engineer. */
 "Show message status" = "Afficher le statut du message";
@@ -4109,7 +3980,7 @@
 "Show percentage" = "Afficher le pourcentage";
 
 /* No comment provided by engineer. */
-"Show preview" = "Aperçu affiché";
+"Show preview" = "Afficher l'aperçu";
 
 /* No comment provided by engineer. */
 "Show QR code" = "Afficher le code QR";
@@ -4183,15 +4054,9 @@
 /* blur media */
 "Soft" = "Léger";
 
-/* No comment provided by engineer. */
-"Some file(s) were not exported:" = "Certains fichiers n'ont pas été exportés :";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Des erreurs non fatales se sont produites lors de l'importation - vous pouvez consulter la console de chat pour plus de détails.";
 
-/* No comment provided by engineer. */
-"Some non-fatal errors occurred during import:" = "L'importation a entraîné des erreurs non fatales :";
-
 /* notification title */
 "Somebody" = "Quelqu'un";
 
@@ -4265,7 +4130,7 @@
 "Submit" = "Soumettre";
 
 /* No comment provided by engineer. */
-"Subscribed" = "Inscriptions";
+"Subscribed" = "Inscrit";
 
 /* No comment provided by engineer. */
 "Subscription errors" = "Erreurs d'inscription";
@@ -4306,9 +4171,6 @@
 /* No comment provided by engineer. */
 "Tap to scan" = "Appuyez pour scanner";
 
-/* No comment provided by engineer. */
-"TCP connection" = "Connexion TCP";
-
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Délai de connexion TCP";
 
@@ -4501,15 +4363,9 @@
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Pour vérifier le chiffrement de bout en bout avec votre contact, comparez (ou scannez) le code sur vos appareils.";
 
-/* No comment provided by engineer. */
-"Toggle chat list:" = "Afficher la liste des conversations :";
-
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Basculer en mode incognito lors de la connexion.";
 
-/* No comment provided by engineer. */
-"Toolbar opacity" = "Opacité de la barre d'outils";
-
 /* No comment provided by engineer. */
 "Total" = "Total";
 
@@ -4612,9 +4468,6 @@
 /* authentication reason */
 "Unlock app" = "Déverrouiller l'app";
 
-/* No comment provided by engineer. */
-"unmute" = "démuter";
-
 /* swipe action */
 "Unmute" = "Démute";
 
@@ -4636,9 +4489,6 @@
 /* No comment provided by engineer. */
 "Update network settings?" = "Mettre à jour les paramètres réseau ?";
 
-/* No comment provided by engineer. */
-"Update settings?" = "Mettre à jour les paramètres ?";
-
 /* rcv group event chat item */
 "updated group profile" = "mise à jour du profil de groupe";
 
@@ -4658,7 +4508,7 @@
 "Upload failed" = "Échec de l'envoi";
 
 /* server test step */
-"Upload file" = "Téléverser le fichier";
+"Upload file" = "Transférer le fichier";
 
 /* No comment provided by engineer. */
 "Uploaded" = "Téléversé";
@@ -4708,9 +4558,6 @@
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Utiliser l'application pendant l'appel.";
 
-/* No comment provided by engineer. */
-"Use the app with one hand." = "Utiliser l'application d'une main.";
-
 /* No comment provided by engineer. */
 "User profile" = "Profil d'utilisateur";
 
@@ -4765,9 +4612,6 @@
 /* No comment provided by engineer. */
 "Via secure quantum resistant protocol." = "Via un protocole sécurisé de cryptographie post-quantique.";
 
-/* No comment provided by engineer. */
-"video" = "vidéo";
-
 /* No comment provided by engineer. */
 "Video call" = "Appel vidéo";
 
@@ -4775,7 +4619,7 @@
 "video call (not e2e encrypted)" = "appel vidéo (sans chiffrement)";
 
 /* No comment provided by engineer. */
-"Video will be received when your contact completes uploading it." = "La vidéo ne sera reçue que lorsque votre contact aura fini la mettre en ligne.";
+"Video will be received when your contact completes uploading it." = "La vidéo ne sera reçue que lorsque votre contact aura fini de la transférer.";
 
 /* No comment provided by engineer. */
 "Video will be received when your contact is online, please wait or check later!" = "La vidéo ne sera reçue que lorsque votre contact sera en ligne. Veuillez patienter ou vérifier plus tard !";
@@ -4978,9 +4822,6 @@
 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "Vous pouvez accepter des appels à partir de l'écran de verrouillage, sans authentification de l'appareil ou de l'application.";
 
-/* No comment provided by engineer. */
-"You can change it in Appearance settings." = "Vous pouvez choisir de le modifier dans les paramètres d'apparence.";
-
 /* No comment provided by engineer. */
 "You can create it later" = "Vous pouvez la créer plus tard";
 
@@ -5002,9 +4843,6 @@
 /* notification body */
 "You can now chat with %@" = "Vous pouvez maintenant envoyer des messages à %@";
 
-/* No comment provided by engineer. */
-"You can send messages to %@ from Archived contacts." = "Vous pouvez envoyer des messages à %@ à partir des contacts archivés.";
-
 /* No comment provided by engineer. */
 "You can set lock screen notification preview via settings." = "Vous pouvez configurer l'aperçu des notifications sur l'écran de verrouillage via les paramètres.";
 
@@ -5020,9 +4858,6 @@
 /* No comment provided by engineer. */
 "You can start chat via app Settings / Database or by restarting the app" = "Vous pouvez lancer le chat via Paramètres / Base de données ou en redémarrant l'app";
 
-/* No comment provided by engineer. */
-"You can still view conversation with %@ in the list of chats." = "Vous pouvez toujours voir la conversation avec %@ dans la liste des discussions.";
-
 /* No comment provided by engineer. */
 "You can turn on SimpleX Lock via Settings." = "Vous pouvez activer SimpleX Lock dans les Paramètres.";
 
@@ -5074,18 +4909,9 @@
 /* snd group event chat item */
 "you left" = "vous avez quitté";
 
-/* No comment provided by engineer. */
-"You may migrate the exported database." = "Vous pouvez migrer la base de données exportée.";
-
-/* No comment provided by engineer. */
-"You may save the exported archive." = "Vous pouvez enregistrer l'archive exportée.";
-
 /* No comment provided by engineer. */
 "You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." = "Vous devez utiliser la version la plus récente de votre base de données de chat sur un seul appareil UNIQUEMENT, sinon vous risquez de ne plus recevoir les messages de certains contacts.";
 
-/* No comment provided by engineer. */
-"You need to allow your contact to call to be able to call them." = "Vous devez autoriser votre contact à appeler pour pouvoir l'appeler.";
-
 /* No comment provided by engineer. */
 "You need to allow your contact to send voice messages to be able to send them." = "Vous devez autoriser votre contact à envoyer des messages vocaux pour pouvoir en envoyer.";
 

apps/ios/hu.lproj/Localizable.strings

@@ -209,10 +209,10 @@
 "%lld members" = "%lld tag";
 
 /* No comment provided by engineer. */
-"%lld messages blocked" = "%lld üzenet letiltva";
+"%lld messages blocked" = "%lld üzenet blokkolva";
 
 /* No comment provided by engineer. */
-"%lld messages blocked by admin" = "%lld üzenet letiltva az admin által";
+"%lld messages blocked by admin" = "%lld üzenet blokkolva az admin által";
 
 /* No comment provided by engineer. */
 "%lld messages marked deleted" = "%lld törlésre megjelölt üzenet";
@@ -659,10 +659,10 @@
 "Bad desktop address" = "Hibás számítógép cím";
 
 /* integrity error chat item */
-"bad message hash" = "hibás az üzenet ellenőrzőösszege";
+"bad message hash" = "téves üzenet hash";
 
 /* No comment provided by engineer. */
-"Bad message hash" = "Hibás az üzenet ellenőrzőösszege";
+"Bad message hash" = "Téves üzenet hash";
 
 /* integrity error chat item */
 "bad message ID" = "téves üzenet ID";
@@ -683,28 +683,28 @@
 "Black" = "Fekete";
 
 /* No comment provided by engineer. */
-"Block" = "Letiltás";
+"Block" = "Blokkolás";
 
 /* No comment provided by engineer. */
 "Block for all" = "Letiltás mindenki számára";
 
 /* No comment provided by engineer. */
-"Block group members" = "Csoporttagok letiltása";
+"Block group members" = "Csoporttagok blokkolása";
 
 /* No comment provided by engineer. */
-"Block member" = "Tag letiltása";
+"Block member" = "Tag blokkolása";
 
 /* No comment provided by engineer. */
 "Block member for all?" = "Mindenki számára letiltja ezt a tagot?";
 
 /* No comment provided by engineer. */
-"Block member?" = "Tag letiltása?";
+"Block member?" = "Tag blokkolása?";
 
 /* marked deleted chat item preview text */
-"blocked" = "letiltva";
+"blocked" = "blokkolva";
 
 /* rcv group event chat item */
-"blocked %@" = "letiltotta %@-t";
+"blocked %@" = "letiltotta őt: %@";
 
 /* marked deleted chat item preview text */
 "blocked by admin" = "letiltva az admin által";
@@ -1432,7 +1432,7 @@
 "Delete link?" = "Hivatkozás törlése?";
 
 /* No comment provided by engineer. */
-"Delete member message?" = "Csoporttag üzenetének törlése?";
+"Delete member message?" = "Csoporttag üzenet törlése?";
 
 /* No comment provided by engineer. */
 "Delete message?" = "Üzenet törlése?";
@@ -1495,7 +1495,7 @@
 "Delivery receipts are disabled!" = "A kézbesítési jelentések ki vannak kapcsolva!";
 
 /* No comment provided by engineer. */
-"Delivery receipts!" = "Üzenet kézbesítési jelentések!";
+"Delivery receipts!" = "Kézbesítési igazolások!";
 
 /* No comment provided by engineer. */
 "Description" = "Leírás";
@@ -1828,10 +1828,10 @@
 "Enter this device name…" = "Eszköznév megadása…";
 
 /* placeholder */
-"Enter welcome message…" = "Üdvözlő üzenet megadása…";
+"Enter welcome message…" = "Üdvözlő üzenetet megadása…";
 
 /* placeholder */
-"Enter welcome message… (optional)" = "Üdvözlő üzenet megadása… (opcionális)";
+"Enter welcome message… (optional)" = "Üdvözlő üzenetet megadása… (opcionális)";
 
 /* No comment provided by engineer. */
 "Enter your name…" = "Adjon meg egy nevet…";
@@ -1999,7 +1999,7 @@
 "Error switching profile!" = "Hiba a profil váltásakor!";
 
 /* No comment provided by engineer. */
-"Error synchronizing connection" = "Hiba a kapcsolat szinkronizálása közben";
+"Error synchronizing connection" = "Hiba a kapcsolat szinkronizálása során";
 
 /* No comment provided by engineer. */
 "Error updating group link" = "Hiba a csoport hivatkozás frissítésekor";
@@ -2363,7 +2363,7 @@
 "ICE servers (one per line)" = "ICE-kiszolgálók (soronként egy)";
 
 /* No comment provided by engineer. */
-"If you can't meet in person, show QR code in a video call, or share the link." = "Ha nem tud személyesen találkozni, mutassa meg a QR-kódot egy videohívás közben, vagy ossza meg a hivatkozást.";
+"If you can't meet in person, show QR code in a video call, or share the link." = "Ha nem tud személyesen találkozni, mutassa meg a QR-kódot egy videohívás során, vagy ossza meg a hivatkozást.";
 
 /* No comment provided by engineer. */
 "If you enter this passcode when opening the app, all app data will be irreversibly removed!" = "Ha az alkalmazás megnyitásakor megadja ezt a jelkódot, az összes alkalmazásadat véglegesen törlődik!";
@@ -2783,7 +2783,7 @@
 "Message delivery error" = "Üzenetkézbesítési hiba";
 
 /* No comment provided by engineer. */
-"Message delivery receipts!" = "Üzenet kézbesítési jelentések!";
+"Message delivery receipts!" = "Üzenetkézbesítési bizonylatok!";
 
 /* item status text */
 "Message delivery warning" = "Üzenet kézbesítési figyelmeztetés";
@@ -2813,7 +2813,7 @@
 "message received" = "üzenet érkezett";
 
 /* No comment provided by engineer. */
-"Message reception" = "Üzenet kézbesítési jelentés";
+"Message reception" = "Üzenetjelentés";
 
 /* No comment provided by engineer. */
 "Message servers" = "Üzenetkiszolgálók";
@@ -3430,7 +3430,7 @@
 "Protect your chat profiles with a password!" = "Csevegési profiljok védelme jelszóval!";
 
 /* No comment provided by engineer. */
-"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Védje IP-címét az ismerősei által kiválasztott üzenetküldő átjátszókkal szemben.\nEngedélyezze a Beállítások / Hálózat és kiszolgálók menüben.";
+"Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Védje IP-címét az ismerősei által kiválasztott üzenetküldő átjátszókkal szemben.\nEngedélyezze a beállításokban a *Hálózat és kiszolgálók* menüpontban.";
 
 /* No comment provided by engineer. */
 "Protocol timeout" = "Protokoll időtúllépés";
@@ -3605,7 +3605,7 @@
 "removed" = "eltávolítva";
 
 /* rcv group event chat item */
-"removed %@" = "eltávolította őt: %@";
+"removed %@" = "%@ eltávolítva";
 
 /* profile update event chat item */
 "removed contact address" = "törölt kapcsolattartási cím";
@@ -3998,7 +3998,7 @@
 "Server requires authorization to upload, check password" = "A kiszolgálónak engedélyre van szüksége a várólisták feltöltéséhez, ellenőrizze jelszavát";
 
 /* No comment provided by engineer. */
-"Server test failed!" = "Sikertelen kiszolgáló teszt!";
+"Server test failed!" = "Sikertelen kiszolgáló-teszt!";
 
 /* No comment provided by engineer. */
 "Server type" = "Kiszolgáló típusa";
@@ -4187,10 +4187,10 @@
 "Some file(s) were not exported:" = "Néhány fájl nem került exportálásra:";
 
 /* No comment provided by engineer. */
-"Some non-fatal errors occurred during import - you may see Chat console for more details." = "Néhány nem végzetes hiba történt az importálás közben – további részletekért a csevegési konzolban olvashat.";
+"Some non-fatal errors occurred during import - you may see Chat console for more details." = "Néhány nem végzetes hiba történt az importálás során – további részletekért a csevegési konzolban olvashat.";
 
 /* No comment provided by engineer. */
-"Some non-fatal errors occurred during import:" = "Néhány nem végzetes hiba történt az importálás közben:";
+"Some non-fatal errors occurred during import:" = "Néhány nem végzetes hiba történt az importálás során:";
 
 /* notification title */
 "Somebody" = "Valaki";
@@ -4367,13 +4367,13 @@
 "The contact you shared this link with will NOT be able to connect!" = "Ismerőse, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!";
 
 /* No comment provided by engineer. */
-"The created archive is available via app Settings / Database / Old database archive." = "A létrehozott archívum a Beállítások / Adatbázis / Régi adatbázis-archívum menüben érhető el.";
+"The created archive is available via app Settings / Database / Old database archive." = "A létrehozott archívum a Beállítások / Adatbázis / Régi adatbázis-archívum menüpontban érhető el.";
 
 /* No comment provided by engineer. */
 "The encryption is working and the new encryption agreement is not required. It may result in connection errors!" = "A titkosítás működik, és új titkosítási egyezményre nincs szükség. Ez kapcsolati hibákat eredményezhet!";
 
 /* No comment provided by engineer. */
-"The hash of the previous message is different." = "Az előző üzenet ellenőrzőösszege különbözik.";
+"The hash of the previous message is different." = "Az előző üzenet hash-e más.";
 
 /* No comment provided by engineer. */
 "The ID of the next message is incorrect (less or equal to the previous).\nIt can happen because of some bug or when the connection is compromised." = "A következő üzenet azonosítója hibás (kisebb vagy egyenlő az előzővel).\nEz valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.";
@@ -4394,7 +4394,7 @@
 "The next generation of private messaging" = "A privát üzenetküldés következő generációja";
 
 /* No comment provided by engineer. */
-"The old database was not removed during the migration, it can be deleted." = "A régi adatbázis nem került eltávolításra az átköltöztetés közben, így törölhető.";
+"The old database was not removed during the migration, it can be deleted." = "A régi adatbázis nem került eltávolításra az átköltöztetés során, így törölhető.";
 
 /* No comment provided by engineer. */
 "The profile is only shared with your contacts." = "Profilja csak az ismerőseivel kerül megosztásra.";
@@ -4553,7 +4553,7 @@
 "Unblock member?" = "Tag feloldása?";
 
 /* rcv group event chat item */
-"unblocked %@" = "feloldotta %@ letiltását";
+"unblocked %@" = "%@ feloldva";
 
 /* No comment provided by engineer. */
 "Unexpected migration state" = "Váratlan átköltöztetési állapot";
@@ -4973,7 +4973,7 @@
 "you are observer" = "megfigyelő szerep";
 
 /* snd group event chat item */
-"you blocked %@" = "ön letiltotta %@-t";
+"you blocked %@" = "blokkolta őt: %@";
 
 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "Hívásokat fogadhat a lezárási képernyőről, eszköz- és alkalmazáshitelesítés nélkül.";
@@ -4988,7 +4988,7 @@
 "You can enable later via Settings" = "Később engedélyezheti a Beállításokban";
 
 /* No comment provided by engineer. */
-"You can enable them later via app Privacy & Security settings." = "Később engedélyezheti őket az alkalmazás „Adatvédelem és biztonság” menüben.";
+"You can enable them later via app Privacy & Security settings." = "Később engedélyezheti őket az alkalmazás Adatvédelem és biztonság menüpontban.";
 
 /* No comment provided by engineer. */
 "You can give another try." = "Megpróbálhatja még egyszer.";
@@ -5018,7 +5018,7 @@
 "You can share your address as a link or QR code - anybody can connect to you." = "Megoszthatja a címét egy hivatkozásként vagy QR-kódként – így bárki kapcsolódhat önhöz.";
 
 /* No comment provided by engineer. */
-"You can start chat via app Settings / Database or by restarting the app" = "A csevegést az alkalmazás Beállítások / Adatbázis menüben vagy az alkalmazás újraindításával indíthatja el";
+"You can start chat via app Settings / Database or by restarting the app" = "A csevegést az alkalmazás Beállítások / Adatbázis menü segítségével vagy az alkalmazás újraindításával indíthatja el";
 
 /* No comment provided by engineer. */
 "You can still view conversation with %@ in the list of chats." = "A(z) %@ nevű ismerősével folytatott beszélgetéseit továbbra is megtekintheti a csevegések listájában.";
@@ -5105,7 +5105,7 @@
 "you shared one-time link incognito" = "egyszer használatos hivatkozást osztott meg inkognitóban";
 
 /* snd group event chat item */
-"you unblocked %@" = "ön feloldotta %@ letiltását";
+"you unblocked %@" = "feloldotta %@ blokkolását";
 
 /* No comment provided by engineer. */
 "You will be connected to group when the group host's device is online, please wait or check later!" = "Akkor lesz kapcsolódva a csoporthoz, amikor a csoport tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!";

apps/ios/it.lproj/Localizable.strings

@@ -1089,7 +1089,7 @@
 "Connection" = "Connessione";
 
 /* No comment provided by engineer. */
-"Connection and servers status." = "Stato della connessione e dei server.";
+"Connection and servers status." = "Stato di connessione e server.";
 
 /* No comment provided by engineer. */
 "Connection error" = "Errore di connessione";
@@ -4502,7 +4502,7 @@
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Per verificare la crittografia end-to-end con il tuo contatto, confrontate (o scansionate) il codice sui vostri dispositivi.";
 
 /* No comment provided by engineer. */
-"Toggle chat list:" = "Cambia l'elenco delle chat:";
+"Toggle chat list:" = "Cambia elenco chat:";
 
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Attiva/disattiva l'incognito quando ti colleghi.";

apps/ios/nl.lproj/Localizable.strings

@@ -2630,7 +2630,7 @@
 "Keep" = "Bewaar";
 
 /* No comment provided by engineer. */
-"Keep conversation" = "Behoud het gesprek";
+"Keep conversation" = "Blijf in gesprek";
 
 /* No comment provided by engineer. */
 "Keep the app open to use it from desktop" = "Houd de app geopend om deze vanaf de desktop te gebruiken";
@@ -3649,9 +3649,6 @@
 /* No comment provided by engineer. */
 "Reset" = "Resetten";
 
-/* No comment provided by engineer. */
-"Reset all hints" = "Alle hints resetten";
-
 /* No comment provided by engineer. */
 "Reset all statistics" = "Reset alle statistieken";
 
@@ -4075,9 +4072,6 @@
 /* No comment provided by engineer. */
 "Share address with contacts?" = "Adres delen met contacten?";
 
-/* No comment provided by engineer. */
-"Share from other apps." = "Delen vanuit andere apps.";
-
 /* No comment provided by engineer. */
 "Share link" = "Deel link";
 
@@ -4501,15 +4495,9 @@
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Vergelijk (of scan) de code op uw apparaten om end-to-end-codering met uw contact te verifiëren.";
 
-/* No comment provided by engineer. */
-"Toggle chat list:" = "Chatlijst wisselen:";
-
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Schakel incognito in tijdens het verbinden.";
 
-/* No comment provided by engineer. */
-"Toolbar opacity" = "De transparantie van de werkbalk";
-
 /* No comment provided by engineer. */
 "Total" = "Totaal";
 
@@ -4978,9 +4966,6 @@
 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "U kunt oproepen van het vergrendelingsscherm accepteren, zonder apparaat- en app-verificatie.";
 
-/* No comment provided by engineer. */
-"You can change it in Appearance settings." = "U kunt dit wijzigen in de instellingen onder uiterlijk.";
-
 /* No comment provided by engineer. */
 "You can create it later" = "U kan het later maken";
 

apps/ios/pl.lproj/Localizable.strings

@@ -472,9 +472,6 @@
 /* No comment provided by engineer. */
 "Allow calls only if your contact allows them." = "Zezwalaj na połączenia tylko wtedy, gdy Twój kontakt na to pozwala.";
 
-/* No comment provided by engineer. */
-"Allow calls?" = "Zezwolić na połączenia?";
-
 /* No comment provided by engineer. */
 "Allow disappearing messages only if your contact allows it to you." = "Zezwól na znikające wiadomości tylko wtedy, gdy Twój kontakt Ci na to pozwoli.";
 
@@ -496,9 +493,6 @@
 /* No comment provided by engineer. */
 "Allow sending disappearing messages." = "Zezwól na wysyłanie znikających wiadomości.";
 
-/* No comment provided by engineer. */
-"Allow sharing" = "Zezwól na udostępnianie";
-
 /* No comment provided by engineer. */
 "Allow to irreversibly delete sent messages. (24 hours)" = "Zezwól na nieodwracalne usunięcie wysłanych wiadomości. (24 godziny)";
 
@@ -595,12 +589,6 @@
 /* No comment provided by engineer. */
 "Archive and upload" = "Archiwizuj i prześlij";
 
-/* No comment provided by engineer. */
-"Archive contacts to chat later." = "Archiwizuj kontakty aby porozmawiać później.";
-
-/* No comment provided by engineer. */
-"Archived contacts" = "Zarchiwizowane kontakty";
-
 /* No comment provided by engineer. */
 "Archiving database" = "Archiwizowanie bazy danych";
 
@@ -676,9 +664,6 @@
 /* No comment provided by engineer. */
 "Better messages" = "Lepsze wiadomości";
 
-/* No comment provided by engineer. */
-"Better networking" = "Lepsze sieciowanie";
-
 /* No comment provided by engineer. */
 "Black" = "Czarny";
 
@@ -712,12 +697,6 @@
 /* No comment provided by engineer. */
 "Blocked by admin" = "Zablokowany przez admina";
 
-/* No comment provided by engineer. */
-"Blur for better privacy." = "Rozmycie dla lepszej prywatności.";
-
-/* No comment provided by engineer. */
-"Blur media" = "Rozmycie mediów";
-
 /* No comment provided by engineer. */
 "bold" = "pogrubiona";
 
@@ -742,9 +721,6 @@
 /* No comment provided by engineer. */
 "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." = "Według profilu czatu (domyślnie) lub [według połączenia](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";
 
-/* No comment provided by engineer. */
-"call" = "zadzwoń";
-
 /* No comment provided by engineer. */
 "Call already ended!" = "Połączenie już zakończone!";
 
@@ -760,27 +736,15 @@
 /* No comment provided by engineer. */
 "Calls" = "Połączenia";
 
-/* No comment provided by engineer. */
-"Calls prohibited!" = "Połączenia zakazane!";
-
 /* No comment provided by engineer. */
 "Camera not available" = "Kamera nie dostępna";
 
-/* No comment provided by engineer. */
-"Can't call contact" = "Nie można zadzwonić do kontaktu";
-
-/* No comment provided by engineer. */
-"Can't call member" = "Nie można zadzwonić do członka";
-
 /* No comment provided by engineer. */
 "Can't invite contact!" = "Nie można zaprosić kontaktu!";
 
 /* No comment provided by engineer. */
 "Can't invite contacts!" = "Nie można zaprosić kontaktów!";
 
-/* No comment provided by engineer. */
-"Can't message member" = "Nie można wysłać wiadomości do członka";
-
 /* No comment provided by engineer. */
 "Cancel" = "Anuluj";
 
@@ -866,9 +830,6 @@
 /* No comment provided by engineer. */
 "Chat database deleted" = "Baza danych czatu usunięta";
 
-/* No comment provided by engineer. */
-"Chat database exported" = "Wyeksportowano bazę danych czatu";
-
 /* No comment provided by engineer. */
 "Chat database imported" = "Zaimportowano bazę danych czatu";
 
@@ -881,9 +842,6 @@
 /* No comment provided by engineer. */
 "Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "Czat został zatrzymany. Jeśli korzystałeś już z tej bazy danych na innym urządzeniu, powinieneś przenieść ją z powrotem przed rozpoczęciem czatu.";
 
-/* No comment provided by engineer. */
-"Chat list" = "Lista czatów";
-
 /* No comment provided by engineer. */
 "Chat migrated!" = "Czat zmigrowany!";
 
@@ -935,9 +893,6 @@
 /* No comment provided by engineer. */
 "Clear verification" = "Wyczyść weryfikację";
 
-/* No comment provided by engineer. */
-"Color chats with the new themes." = "Koloruj czaty z nowymi motywami.";
-
 /* No comment provided by engineer. */
 "Color mode" = "Tryb koloru";
 
@@ -965,9 +920,6 @@
 /* No comment provided by engineer. */
 "Confirm" = "Potwierdź";
 
-/* No comment provided by engineer. */
-"Confirm contact deletion?" = "Potwierdzić usunięcie kontaktu?";
-
 /* No comment provided by engineer. */
 "Confirm database upgrades" = "Potwierdź aktualizacje bazy danych";
 
@@ -1007,9 +959,6 @@
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "połącz się z deweloperami SimpleX Chat.";
 
-/* No comment provided by engineer. */
-"Connect to your friends faster." = "Szybciej łącz się ze znajomymi.";
-
 /* No comment provided by engineer. */
 "Connect to yourself?" = "Połączyć się ze sobą?";
 
@@ -1076,9 +1025,6 @@
 /* No comment provided by engineer. */
 "Connecting server… (error: %@)" = "Łączenie z serwerem... (błąd: %@)";
 
-/* No comment provided by engineer. */
-"Connecting to contact, please wait or check later!" = "Łączenie z kontaktem, poczekaj lub sprawdź później!";
-
 /* No comment provided by engineer. */
 "Connecting to desktop" = "Łączenie z komputerem";
 
@@ -1088,9 +1034,6 @@
 /* No comment provided by engineer. */
 "Connection" = "Połączenie";
 
-/* No comment provided by engineer. */
-"Connection and servers status." = "Stan połączenia i serwerów.";
-
 /* No comment provided by engineer. */
 "Connection error" = "Błąd połączenia";
 
@@ -1100,9 +1043,6 @@
 /* chat list item title (it should not be shown */
 "connection established" = "połączenie ustanowione";
 
-/* No comment provided by engineer. */
-"Connection notifications" = "Powiadomienia o połączeniu";
-
 /* No comment provided by engineer. */
 "Connection request sent!" = "Prośba o połączenie wysłana!";
 
@@ -1130,9 +1070,6 @@
 /* No comment provided by engineer. */
 "Contact already exists" = "Kontakt już istnieje";
 
-/* No comment provided by engineer. */
-"Contact deleted!" = "Kontakt usunięty!";
-
 /* No comment provided by engineer. */
 "contact has e2e encryption" = "kontakt posiada szyfrowanie e2e";
 
@@ -1145,18 +1082,12 @@
 /* notification */
 "Contact is connected" = "Kontakt jest połączony";
 
-/* No comment provided by engineer. */
-"Contact is deleted." = "Kontakt jest usunięty.";
-
 /* No comment provided by engineer. */
 "Contact name" = "Nazwa kontaktu";
 
 /* No comment provided by engineer. */
 "Contact preferences" = "Preferencje kontaktu";
 
-/* No comment provided by engineer. */
-"Contact will be deleted - this cannot be undone!" = "Kontakt zostanie usunięty – nie można tego cofnąć!";
-
 /* No comment provided by engineer. */
 "Contacts" = "Kontakty";
 
@@ -1166,9 +1097,6 @@
 /* No comment provided by engineer. */
 "Continue" = "Kontynuuj";
 
-/* No comment provided by engineer. */
-"Conversation deleted!" = "Rozmowa usunięta!";
-
 /* No comment provided by engineer. */
 "Copy" = "Kopiuj";
 
@@ -1353,9 +1281,6 @@
    swipe action */
 "Delete" = "Usuń";
 
-/* No comment provided by engineer. */
-"Delete %lld messages of members?" = "Usunąć %lld wiadomości członków?";
-
 /* No comment provided by engineer. */
 "Delete %lld messages?" = "Usunąć %lld wiadomości?";
 
@@ -1392,9 +1317,6 @@
 /* No comment provided by engineer. */
 "Delete contact" = "Usuń kontakt";
 
-/* No comment provided by engineer. */
-"Delete contact?" = "Usunąć kontakt?";
-
 /* No comment provided by engineer. */
 "Delete database" = "Usuń bazę danych";
 
@@ -1458,15 +1380,9 @@
 /* server test step */
 "Delete queue" = "Usuń kolejkę";
 
-/* No comment provided by engineer. */
-"Delete up to 20 messages at once." = "Usuń do 20 wiadomości na raz.";
-
 /* No comment provided by engineer. */
 "Delete user profile?" = "Usunąć profil użytkownika?";
 
-/* No comment provided by engineer. */
-"Delete without notification" = "Usuń bez powiadomienia";
-
 /* deleted chat item */
 "deleted" = "usunięty";
 
@@ -1509,15 +1425,9 @@
 /* No comment provided by engineer. */
 "Desktop devices" = "Urządzenia komputerowe";
 
-/* No comment provided by engineer. */
-"Destination server address of %@ is incompatible with forwarding server %@ settings." = "Adres serwera docelowego %@ jest niekompatybilny z ustawieniami serwera przekazującego %@.";
-
 /* snd error text */
 "Destination server error: %@" = "Błąd docelowego serwera: %@";
 
-/* No comment provided by engineer. */
-"Destination server version of %@ is incompatible with forwarding server %@." = "Wersja serwera docelowego %@ jest niekompatybilna z serwerem przekierowującym %@.";
-
 /* No comment provided by engineer. */
 "Detailed statistics" = "Szczegółowe statystyki";
 
@@ -1527,9 +1437,6 @@
 /* No comment provided by engineer. */
 "Develop" = "Deweloperskie";
 
-/* No comment provided by engineer. */
-"Developer options" = "Opcje deweloperskie";
-
 /* No comment provided by engineer. */
 "Developer tools" = "Narzędzia deweloperskie";
 
@@ -1569,9 +1476,6 @@
 /* No comment provided by engineer. */
 "disabled" = "wyłączony";
 
-/* No comment provided by engineer. */
-"Disabled" = "Wyłączony";
-
 /* No comment provided by engineer. */
 "Disappearing message" = "Znikająca wiadomość";
 
@@ -1719,9 +1623,6 @@
 /* enabled status */
 "enabled" = "włączone";
 
-/* No comment provided by engineer. */
-"Enabled" = "Włączony";
-
 /* No comment provided by engineer. */
 "Enabled for" = "Włączony dla";
 
@@ -1863,9 +1764,6 @@
 /* No comment provided by engineer. */
 "Error changing setting" = "Błąd zmiany ustawienia";
 
-/* No comment provided by engineer. */
-"Error connecting to forwarding server %@. Please try later." = "Błąd połączenia z serwerem przekierowania %@. Spróbuj ponownie później.";
-
 /* No comment provided by engineer. */
 "Error creating address" = "Błąd tworzenia adresu";
 
@@ -2176,15 +2074,6 @@
 /* No comment provided by engineer. */
 "Forwarded from" = "Przekazane dalej od";
 
-/* No comment provided by engineer. */
-"Forwarding server %@ failed to connect to destination server %@. Please try later." = "Serwer przekazujący %@ nie mógł połączyć się z serwerem docelowym %@. Spróbuj ponownie później.";
-
-/* No comment provided by engineer. */
-"Forwarding server address is incompatible with network settings: %@." = "Adres serwera przekierowującego jest niekompatybilny z ustawieniami sieciowymi: %@.";
-
-/* No comment provided by engineer. */
-"Forwarding server version is incompatible with network settings: %@." = "Wersja serwera przekierowującego jest niekompatybilna z ustawieniami sieciowymi: %@.";
-
 /* snd error text */
 "Forwarding server: %@\nDestination server error: %@" = "Serwer przekazujący: %1$@\nBłąd serwera docelowego: %2$@";
 
@@ -2536,9 +2425,6 @@
 /* group name */
 "invitation to group %@" = "zaproszenie do grupy %@";
 
-/* No comment provided by engineer. */
-"invite" = "zaproś";
-
 /* No comment provided by engineer. */
 "Invite friends" = "Zaproś znajomych";
 
@@ -2584,9 +2470,6 @@
 /* No comment provided by engineer. */
 "It can happen when:\n1. The messages expired in the sending client after 2 days or on the server after 30 days.\n2. Message decryption failed, because you or your contact used old database backup.\n3. The connection was compromised." = "Może to nastąpić, gdy:\n1. Wiadomości wygasły w wysyłającym kliencie po 2 dniach lub na serwerze po 30 dniach.\n2. Odszyfrowanie wiadomości nie powiodło się, ponieważ Ty lub Twój kontakt użyliście starej kopii zapasowej bazy danych.\n3. Połączenie zostało skompromitowane.";
 
-/* No comment provided by engineer. */
-"It protects your IP address and connections." = "Chroni Twój adres IP i połączenia.";
-
 /* No comment provided by engineer. */
 "It seems like you are already connected via this link. If it is not the case, there was an error (%@)." = "Wygląda na to, że jesteś już połączony przez ten link. Jeśli tak nie jest, wystąpił błąd (%@).";
 
@@ -2629,9 +2512,6 @@
 /* No comment provided by engineer. */
 "Keep" = "Zachowaj";
 
-/* No comment provided by engineer. */
-"Keep conversation" = "Zachowaj rozmowę";
-
 /* No comment provided by engineer. */
 "Keep the app open to use it from desktop" = "Zostaw aplikację otwartą i używaj ją z komputera";
 
@@ -2743,12 +2623,6 @@
 /* No comment provided by engineer. */
 "Max 30 seconds, received instantly." = "Maksymalnie 30 sekund, odbierane natychmiast.";
 
-/* No comment provided by engineer. */
-"Media & file servers" = "Serwery mediów i plików";
-
-/* blur media */
-"Medium" = "Średni";
-
 /* member role */
 "member" = "członek";
 
@@ -2776,9 +2650,6 @@
 /* No comment provided by engineer. */
 "Menus" = "Menu";
 
-/* No comment provided by engineer. */
-"message" = "wiadomość";
-
 /* item status text */
 "Message delivery error" = "Błąd dostarczenia wiadomości";
 
@@ -2815,9 +2686,6 @@
 /* No comment provided by engineer. */
 "Message reception" = "Odebranie wiadomości";
 
-/* No comment provided by engineer. */
-"Message servers" = "Serwery wiadomości";
-
 /* No comment provided by engineer. */
 "Message source remains private." = "Źródło wiadomości pozostaje prywatne.";
 
@@ -2926,9 +2794,6 @@
 /* No comment provided by engineer. */
 "Multiple chat profiles" = "Wiele profili czatu";
 
-/* No comment provided by engineer. */
-"mute" = "wycisz";
-
 /* swipe action */
 "Mute" = "Wycisz";
 
@@ -2962,9 +2827,6 @@
 /* No comment provided by engineer. */
 "New chat" = "Nowy czat";
 
-/* No comment provided by engineer. */
-"New chat experience 🎉" = "Nowe możliwości czatu 🎉";
-
 /* notification */
 "New contact request" = "Nowa prośba o kontakt";
 
@@ -2983,9 +2845,6 @@
 /* No comment provided by engineer. */
 "New in %@" = "Nowość w %@";
 
-/* No comment provided by engineer. */
-"New media options" = "Nowe opcje mediów";
-
 /* No comment provided by engineer. */
 "New member role" = "Nowa rola członka";
 
@@ -3055,9 +2914,6 @@
 /* No comment provided by engineer. */
 "Not compatible!" = "Nie kompatybilny!";
 
-/* No comment provided by engineer. */
-"Nothing selected" = "Nic nie jest zaznaczone";
-
 /* No comment provided by engineer. */
 "Notifications" = "Powiadomienia";
 
@@ -3114,9 +2970,6 @@
 /* No comment provided by engineer. */
 "Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." = "Tylko urządzenia klienckie przechowują profile użytkowników, kontakty, grupy i wiadomości wysyłane za pomocą **2-warstwowego szyfrowania end-to-end**.";
 
-/* No comment provided by engineer. */
-"Only delete conversation" = "Usuń tylko rozmowę";
-
 /* No comment provided by engineer. */
 "Only group owners can change group preferences." = "Tylko właściciele grup mogą zmieniać preferencje grupy.";
 
@@ -3273,12 +3126,6 @@
 /* No comment provided by engineer. */
 "PING interval" = "Interwał PINGU";
 
-/* No comment provided by engineer. */
-"Play from the chat list." = "Odtwórz z listy czatów.";
-
-/* No comment provided by engineer. */
-"Please ask your contact to enable calls." = "Poproś kontakt o włącznie połączeń.";
-
 /* No comment provided by engineer. */
 "Please ask your contact to enable sending voice messages." = "Poproś Twój kontakt o włączenie wysyłania wiadomości głosowych.";
 
@@ -3459,9 +3306,6 @@
 /* No comment provided by engineer. */
 "Rate the app" = "Oceń aplikację";
 
-/* No comment provided by engineer. */
-"Reachable chat toolbar" = "Osiągalny pasek narzędzi czatu";
-
 /* chat item menu */
 "React…" = "Reaguj…";
 
@@ -3649,9 +3493,6 @@
 /* No comment provided by engineer. */
 "Reset" = "Resetuj";
 
-/* No comment provided by engineer. */
-"Reset all hints" = "Zresetuj wszystkie wskazówki";
-
 /* No comment provided by engineer. */
 "Reset all statistics" = "Resetuj wszystkie statystyki";
 
@@ -3727,9 +3568,6 @@
 /* No comment provided by engineer. */
 "Save and notify group members" = "Zapisz i powiadom członków grupy";
 
-/* No comment provided by engineer. */
-"Save and reconnect" = "Zapisz i połącz ponownie";
-
 /* No comment provided by engineer. */
 "Save and update group profile" = "Zapisz i zaktualizuj profil grupowy";
 
@@ -3805,9 +3643,6 @@
 /* No comment provided by engineer. */
 "Scan server QR code" = "Zeskanuj kod QR serwera";
 
-/* No comment provided by engineer. */
-"search" = "szukaj";
-
 /* No comment provided by engineer. */
 "Search" = "Szukaj";
 
@@ -3847,9 +3682,6 @@
 /* chat item action */
 "Select" = "Wybierz";
 
-/* No comment provided by engineer. */
-"Selected %lld" = "Zaznaczono %lld";
-
 /* No comment provided by engineer. */
 "Selected chat preferences prohibit this message." = "Wybrane preferencje czatu zabraniają tej wiadomości.";
 
@@ -3892,9 +3724,6 @@
 /* No comment provided by engineer. */
 "Send live message" = "Wyślij wiadomość na żywo";
 
-/* No comment provided by engineer. */
-"Send message to enable calls." = "Wyślij wiadomość aby włączyć połączenia.";
-
 /* No comment provided by engineer. */
 "Send messages directly when IP address is protected and your or destination server does not support private routing." = "Wysyłaj wiadomości bezpośrednio, gdy adres IP jest chroniony i Twój lub docelowy serwer nie obsługuje prywatnego trasowania.";
 
@@ -4075,18 +3904,12 @@
 /* No comment provided by engineer. */
 "Share address with contacts?" = "Udostępnić adres kontaktom?";
 
-/* No comment provided by engineer. */
-"Share from other apps." = "Udostępnij z innych aplikacji.";
-
 /* No comment provided by engineer. */
 "Share link" = "Udostępnij link";
 
 /* No comment provided by engineer. */
 "Share this 1-time invite link" = "Udostępnij ten jednorazowy link";
 
-/* No comment provided by engineer. */
-"Share to SimpleX" = "Udostępnij do SimpleX";
-
 /* No comment provided by engineer. */
 "Share with contacts" = "Udostępnij kontaktom";
 
@@ -4180,18 +4003,9 @@
 /* No comment provided by engineer. */
 "SMP server" = "Serwer SMP";
 
-/* blur media */
-"Soft" = "Łagodny";
-
-/* No comment provided by engineer. */
-"Some file(s) were not exported:" = "Niektóre plik(i) nie zostały wyeksportowane:";
-
 /* No comment provided by engineer. */
 "Some non-fatal errors occurred during import - you may see Chat console for more details." = "Podczas importu wystąpiły niekrytyczne błędy - więcej szczegółów można znaleźć w konsoli czatu.";
 
-/* No comment provided by engineer. */
-"Some non-fatal errors occurred during import:" = "Podczas importu wystąpiły niekrytyczne błędy:";
-
 /* notification title */
 "Somebody" = "Ktoś";
 
@@ -4258,9 +4072,6 @@
 /* No comment provided by engineer. */
 "strike" = "strajk";
 
-/* blur media */
-"Strong" = "Silne";
-
 /* No comment provided by engineer. */
 "Submit" = "Zatwierdź";
 
@@ -4306,9 +4117,6 @@
 /* No comment provided by engineer. */
 "Tap to scan" = "Dotknij, aby zeskanować";
 
-/* No comment provided by engineer. */
-"TCP connection" = "Połączenie TCP";
-
 /* No comment provided by engineer. */
 "TCP connection timeout" = "Limit czasu połączenia TCP";
 
@@ -4384,12 +4192,6 @@
 /* No comment provided by engineer. */
 "The message will be marked as moderated for all members." = "Wiadomość zostanie oznaczona jako moderowana dla wszystkich członków.";
 
-/* No comment provided by engineer. */
-"The messages will be deleted for all members." = "Wiadomości zostaną usunięte dla wszystkich członków.";
-
-/* No comment provided by engineer. */
-"The messages will be marked as moderated for all members." = "Wiadomości zostaną oznaczone jako moderowane dla wszystkich członków.";
-
 /* No comment provided by engineer. */
 "The next generation of private messaging" = "Następna generacja prywatnych wiadomości";
 
@@ -4501,15 +4303,9 @@
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Aby zweryfikować szyfrowanie end-to-end z Twoim kontaktem porównaj (lub zeskanuj) kod na waszych urządzeniach.";
 
-/* No comment provided by engineer. */
-"Toggle chat list:" = "Przełącz listę czatów:";
-
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Przełącz incognito przy połączeniu.";
 
-/* No comment provided by engineer. */
-"Toolbar opacity" = "Nieprzezroczystość paska narzędzi";
-
 /* No comment provided by engineer. */
 "Total" = "Łącznie";
 
@@ -4612,9 +4408,6 @@
 /* authentication reason */
 "Unlock app" = "Odblokuj aplikację";
 
-/* No comment provided by engineer. */
-"unmute" = "wyłącz wyciszenie";
-
 /* swipe action */
 "Unmute" = "Wyłącz wyciszenie";
 
@@ -4636,9 +4429,6 @@
 /* No comment provided by engineer. */
 "Update network settings?" = "Zaktualizować ustawienia sieci?";
 
-/* No comment provided by engineer. */
-"Update settings?" = "Zaktualizować ustawienia?";
-
 /* rcv group event chat item */
 "updated group profile" = "zaktualizowano profil grupy";
 
@@ -4708,9 +4498,6 @@
 /* No comment provided by engineer. */
 "Use the app while in the call." = "Używaj aplikacji podczas połączenia.";
 
-/* No comment provided by engineer. */
-"Use the app with one hand." = "Korzystaj z aplikacji jedną ręką.";
-
 /* No comment provided by engineer. */
 "User profile" = "Profil użytkownika";
 
@@ -4765,9 +4552,6 @@
 /* No comment provided by engineer. */
 "Via secure quantum resistant protocol." = "Dzięki bezpiecznemu protokołowi odpornego kwantowo.";
 
-/* No comment provided by engineer. */
-"video" = "wideo";
-
 /* No comment provided by engineer. */
 "Video call" = "Połączenie wideo";
 
@@ -4978,9 +4762,6 @@
 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "Możesz przyjmować połączenia z ekranu blokady, bez uwierzytelniania urządzenia i aplikacji.";
 
-/* No comment provided by engineer. */
-"You can change it in Appearance settings." = "Możesz to zmienić w ustawieniach wyglądu.";
-
 /* No comment provided by engineer. */
 "You can create it later" = "Możesz go utworzyć później";
 
@@ -5002,9 +4783,6 @@
 /* notification body */
 "You can now chat with %@" = "Możesz teraz wysyłać wiadomości do %@";
 
-/* No comment provided by engineer. */
-"You can send messages to %@ from Archived contacts." = "Możesz wysyłać wiadomości do %@ ze zarchiwizowanych kontaktów.";
-
 /* No comment provided by engineer. */
 "You can set lock screen notification preview via settings." = "Podgląd powiadomień na ekranie blokady można ustawić w ustawieniach.";
 
@@ -5020,9 +4798,6 @@
 /* No comment provided by engineer. */
 "You can start chat via app Settings / Database or by restarting the app" = "Możesz rozpocząć czat poprzez Ustawienia aplikacji / Baza danych lub poprzez ponowne uruchomienie aplikacji";
 
-/* No comment provided by engineer. */
-"You can still view conversation with %@ in the list of chats." = "Nadal możesz przeglądać rozmowę z %@ na liście czatów.";
-
 /* No comment provided by engineer. */
 "You can turn on SimpleX Lock via Settings." = "Możesz włączyć blokadę SimpleX poprzez Ustawienia.";
 
@@ -5074,18 +4849,9 @@
 /* snd group event chat item */
 "you left" = "wyszedłeś";
 
-/* No comment provided by engineer. */
-"You may migrate the exported database." = "Możesz zmigrować wyeksportowaną bazy danych.";
-
-/* No comment provided by engineer. */
-"You may save the exported archive." = "Możesz zapisać wyeksportowane archiwum.";
-
 /* No comment provided by engineer. */
 "You must use the most recent version of your chat database on one device ONLY, otherwise you may stop receiving the messages from some contacts." = "Musisz używać najnowszej wersji bazy danych czatu TYLKO na jednym urządzeniu, w przeciwnym razie możesz przestać otrzymywać wiadomości od niektórych kontaktów.";
 
-/* No comment provided by engineer. */
-"You need to allow your contact to call to be able to call them." = "Aby móc dzwonić, musisz zezwolić kontaktowi na połączenia.";
-
 /* No comment provided by engineer. */
 "You need to allow your contact to send voice messages to be able to send them." = "Musisz zezwolić Twojemu kontaktowi na wysyłanie wiadomości głosowych, aby móc je wysyłać.";
 

apps/ios/ru.lproj/Localizable.strings

@@ -595,9 +595,6 @@
 /* No comment provided by engineer. */
 "Archive and upload" = "Архивировать и загрузить";
 
-/* No comment provided by engineer. */
-"Archive contacts to chat later." = "Архивируйте контакты чтобы продолжить переписку.";
-
 /* No comment provided by engineer. */
 "Archived contacts" = "Архивированные контакты";
 
@@ -676,9 +673,6 @@
 /* No comment provided by engineer. */
 "Better messages" = "Улучшенные сообщения";
 
-/* No comment provided by engineer. */
-"Better networking" = "Улучшенные сетевые функции";
-
 /* No comment provided by engineer. */
 "Black" = "Черная";
 
@@ -712,9 +706,6 @@
 /* No comment provided by engineer. */
 "Blocked by admin" = "Заблокирован администратором";
 
-/* No comment provided by engineer. */
-"Blur for better privacy." = "Размыть для конфиденциальности.";
-
 /* No comment provided by engineer. */
 "Blur media" = "Размытие изображений";
 
@@ -881,9 +872,6 @@
 /* No comment provided by engineer. */
 "Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." = "Чат остановлен. Если вы уже использовали эту базу данных на другом устройстве, перенесите ее обратно до запуска чата.";
 
-/* No comment provided by engineer. */
-"Chat list" = "Список чатов";
-
 /* No comment provided by engineer. */
 "Chat migrated!" = "Чат мигрирован!";
 
@@ -935,9 +923,6 @@
 /* No comment provided by engineer. */
 "Clear verification" = "Сбросить подтверждение";
 
-/* No comment provided by engineer. */
-"Color chats with the new themes." = "Добавьте цвета к чатам в настройках.";
-
 /* No comment provided by engineer. */
 "Color mode" = "Режим цветов";
 
@@ -1007,9 +992,6 @@
 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "соединитесь с разработчиками.";
 
-/* No comment provided by engineer. */
-"Connect to your friends faster." = "Соединяйтесь с друзьями быстрее.";
-
 /* No comment provided by engineer. */
 "Connect to yourself?" = "Соединиться с самим собой?";
 
@@ -1459,7 +1441,7 @@
 "Delete queue" = "Удаление очереди";
 
 /* No comment provided by engineer. */
-"Delete up to 20 messages at once." = "Удаляйте до 20 сообщений за раз.";
+"Delete up to 20 messages at once." = "Удаляйте до 20 сообщений одновременно.";
 
 /* No comment provided by engineer. */
 "Delete user profile?" = "Удалить профиль пользователя?";
@@ -2962,9 +2944,6 @@
 /* No comment provided by engineer. */
 "New chat" = "Новый чат";
 
-/* No comment provided by engineer. */
-"New chat experience 🎉" = "Новый интерфейс 🎉";
-
 /* notification */
 "New contact request" = "Новый запрос на соединение";
 
@@ -2983,9 +2962,6 @@
 /* No comment provided by engineer. */
 "New in %@" = "Новое в %@";
 
-/* No comment provided by engineer. */
-"New media options" = "Новые медиа-опции";
-
 /* No comment provided by engineer. */
 "New member role" = "Роль члена группы";
 
@@ -3273,9 +3249,6 @@
 /* No comment provided by engineer. */
 "PING interval" = "Интервал PING";
 
-/* No comment provided by engineer. */
-"Play from the chat list." = "Открыть из списка чатов.";
-
 /* No comment provided by engineer. */
 "Please ask your contact to enable calls." = "Попросите Вашего контакта разрешить звонки.";
 
@@ -3358,7 +3331,7 @@
 "Private message routing" = "Конфиденциальная доставка сообщений";
 
 /* No comment provided by engineer. */
-"Private message routing 🚀" = "Конфиденциальная доставка 🚀";
+"Private message routing 🚀" = "Конфиденциальная доставка сообщений 🚀";
 
 /* name of notes to self */
 "Private notes" = "Личные заметки";
@@ -3649,9 +3622,6 @@
 /* No comment provided by engineer. */
 "Reset" = "Сбросить";
 
-/* No comment provided by engineer. */
-"Reset all hints" = "Сбросить все подсказки";
-
 /* No comment provided by engineer. */
 "Reset all statistics" = "Сбросить всю статистику";
 
@@ -4075,9 +4045,6 @@
 /* No comment provided by engineer. */
 "Share address with contacts?" = "Поделиться адресом с контактами?";
 
-/* No comment provided by engineer. */
-"Share from other apps." = "Поделитесь из других приложений.";
-
 /* No comment provided by engineer. */
 "Share link" = "Поделиться ссылкой";
 
@@ -4501,15 +4468,9 @@
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Чтобы подтвердить end-to-end шифрование с Вашим контактом сравните (или сканируйте) код безопасности на Ваших устройствах.";
 
-/* No comment provided by engineer. */
-"Toggle chat list:" = "Переключите список чатов:";
-
 /* No comment provided by engineer. */
 "Toggle incognito when connecting." = "Установите режим Инкогнито при соединении.";
 
-/* No comment provided by engineer. */
-"Toolbar opacity" = "Прозрачность тулбара";
-
 /* No comment provided by engineer. */
 "Total" = "Всего";
 
@@ -4978,9 +4939,6 @@
 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "Вы можете принимать звонки на экране блокировки, без аутентификации.";
 
-/* No comment provided by engineer. */
-"You can change it in Appearance settings." = "Вы можете изменить это в настройках Интерфейса.";
-
 /* No comment provided by engineer. */
 "You can create it later" = "Вы можете создать его позже";
 

apps/multiplatform/android/build.gradle.kts

@@ -15,7 +15,7 @@ android {
         namespace = "chat.simplex.app"
         minSdk = 26
         //noinspection OldTargetApi
-        targetSdk = 34
+        targetSdk = 33
         // !!!
         // skip version code after release to F-Droid, as it uses two version codes
         versionCode = (extra["android.version_code"] as String).toInt()
@@ -126,29 +126,29 @@ android {
 
 dependencies {
     implementation(project(":common"))
-    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.core:core-ktx:1.12.0")
     //implementation("androidx.compose.ui:ui:${rootProject.extra["compose.version"] as String}")
     //implementation("androidx.compose.material:material:$compose_version")
     //implementation("androidx.compose.ui:ui-tooling-preview:$compose_version")
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4")
-    implementation("androidx.lifecycle:lifecycle-process:2.8.4")
-    implementation("androidx.activity:activity-compose:1.9.1")
-    val workVersion = "2.9.1"
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+    implementation("androidx.lifecycle:lifecycle-process:2.7.0")
+    implementation("androidx.activity:activity-compose:1.8.2")
+    val workVersion = "2.9.0"
     implementation("androidx.work:work-runtime-ktx:$workVersion")
     implementation("androidx.work:work-multiprocess:$workVersion")
 
-    implementation("com.jakewharton:process-phoenix:3.0.0")
+    implementation("com.jakewharton:process-phoenix:2.2.0")
 
     //Camera Permission
-    implementation("com.google.accompanist:accompanist-permissions:0.34.0")
+    implementation("com.google.accompanist:accompanist-permissions:0.23.0")
 
     //implementation("androidx.compose.material:material-icons-extended:$compose_version")
     //implementation("androidx.compose.ui:ui-util:$compose_version")
 
     testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.2.1")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     //androidTestImplementation("androidx.compose.ui:ui-test-junit4:$compose_version")
     debugImplementation("androidx.compose.ui:ui-tooling:1.6.4")
 }

apps/multiplatform/android/src/main/AndroidManifest.xml

@@ -21,12 +21,6 @@
   <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
   <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
 
-  <!-- Requirements that allows to specify foreground service types -->
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
-
   <application
       android:name="SimplexApp"
       android:allowBackup="false"
@@ -139,9 +133,7 @@
         android:name=".SimplexService"
         android:enabled="true"
         android:exported="false"
-        android:stopWithTask="false"
-        android:foregroundServiceType="remoteMessaging"
-    />
+        android:stopWithTask="false"></service>
 
     <!-- SimplexService restart on reboot -->
 
@@ -149,9 +141,7 @@
         android:name=".CallService"
         android:enabled="true"
         android:exported="false"
-        android:stopWithTask="false"
-        android:foregroundServiceType="mediaPlayback|microphone|camera|remoteMessaging"
-    />
+        android:stopWithTask="false"/>
 
     <receiver
         android:name=".CallService$CallActionReceiver"

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

@@ -2,18 +2,17 @@ package chat.simplex.app
 
 import android.app.*
 import android.content.*
-import android.content.pm.ServiceInfo
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.*
 import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.core.app.NotificationCompat
-import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import chat.simplex.app.model.NtfManager.EndCallAction
 import chat.simplex.app.views.call.CallActivity
 import chat.simplex.common.model.NotificationPreviewMode
 import chat.simplex.common.platform.*
+import chat.simplex.common.views.call.CallState
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
 import kotlinx.datetime.Instant
@@ -35,7 +34,7 @@ class CallService: Service() {
     } else {
       Log.d(TAG, "null intent. Probably restarted by the system.")
     }
-    ServiceCompat.startForeground(this, CALL_SERVICE_ID, createNotificationIfNeeded(), foregroundServiceType())
+    startForeground(CALL_SERVICE_ID, serviceNotification)
     return START_STICKY
   }
 
@@ -43,7 +42,8 @@ class CallService: Service() {
     super.onCreate()
     Log.d(TAG, "Call service created")
     notificationManager = createNotificationChannel()
-    ServiceCompat.startForeground(this, CALL_SERVICE_ID, updateNotification(), foregroundServiceType())
+    updateNotification()
+    startForeground(CALL_SERVICE_ID, serviceNotification)
   }
 
   override fun onDestroy() {
@@ -69,14 +69,7 @@ class CallService: Service() {
     }
   }
 
-  private fun createNotificationIfNeeded(): Notification {
-    val ntf = serviceNotification
-    if (ntf != null) return ntf
-
-    return updateNotification()
-  }
-
-  fun updateNotification(): Notification {
+  fun updateNotification() {
     val call = chatModel.activeCall.value
     val previewMode = appPreferences.notificationPreviewMode.get()
     val title = if (previewMode == NotificationPreviewMode.HIDDEN.name)
@@ -90,31 +83,8 @@ class CallService: Service() {
     else
       base64ToBitmap(image).asAndroidBitmap()
 
-    val ntf = createNotification(title, text, largeIcon, call?.connectedAt)
-    serviceNotification = ntf
-    ServiceCompat.startForeground(this, CALL_SERVICE_ID, ntf, foregroundServiceType())
-    return ntf
-  }
-
-  private fun foregroundServiceType(): Int {
-    val call = chatModel.activeCall.value
-    return if (call == null) {
-      if (Build.VERSION.SDK_INT >= 34) {
-        ServiceInfo.FOREGROUND_SERVICE_TYPE_REMOTE_MESSAGING
-      } else {
-        0
-      }
-    } else if (Build.VERSION.SDK_INT >= 30) {
-      if (call.supportsVideo()) {
-        ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK or ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE or ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA
-      } else {
-        ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK or ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
-      }
-    } else if (Build.VERSION.SDK_INT >= 29) {
-      ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
-    } else {
-      0
-    }
+    serviceNotification = createNotification(title, text, largeIcon, call?.connectedAt)
+    startForeground(CALL_SERVICE_ID, serviceNotification)
   }
 
   private fun createNotificationChannel(): NotificationManager? {

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

@@ -19,7 +19,6 @@ import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.*
 import chat.simplex.common.platform.*
-import chat.simplex.res.MR
 import kotlinx.coroutines.*
 import java.lang.ref.WeakReference
 
@@ -54,7 +53,7 @@ class MainActivity: FragmentActivity() {
     SimplexApp.context.schedulePeriodicWakeUp()
   }
 
-  override fun onNewIntent(intent: Intent) {
+  override fun onNewIntent(intent: Intent?) {
     super.onNewIntent(intent)
     processIntent(intent)
     processExternalIntent(intent)
@@ -150,12 +149,7 @@ fun processIntent(intent: Intent?) {
     "android.intent.action.VIEW" -> {
       val uri = intent.data
       if (uri != null) {
-        val transformedUri = uri.toURIOrNull()
-        if (transformedUri != null) {
-          chatModel.appOpenUrl.value = null to transformedUri
-        } else {
-          AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error_parsing_uri_title), generalGetString(MR.strings.error_parsing_uri_desc))
-        }
+        chatModel.appOpenUrl.value = null to uri.toURI()
       }
     }
   }

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

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

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

@@ -7,6 +7,7 @@ import chat.simplex.common.platform.Log
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.os.*
+import android.view.View
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.graphics.Color
@@ -119,10 +120,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
            * */
           if (chatModel.chatRunning.value != false &&
             chatModel.controller.appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete &&
-            appPrefs.notificationsMode.get() == NotificationsMode.SERVICE &&
-            // New installation passes all checks above and tries to start the service which is not needed at all
-            // because preferred notification type is not yet chosen. So, check that the user has initialized db already
-            appPrefs.newDatabaseInitialized.get()
+            appPrefs.notificationsMode.get() == NotificationsMode.SERVICE
           ) {
             SimplexService.start()
           }
@@ -163,7 +161,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
       .addTag(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC)
       .build()
     Log.d(TAG, "ServiceStartWorker: Scheduling period work every ${SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES} minutes")
-    getWorkManagerInstance().enqueueUniquePeriodicWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC, workPolicy, work)
+    WorkManager.getInstance(context)?.enqueueUniquePeriodicWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC, workPolicy, work)
   }
 
   fun schedulePeriodicWakeUp() = CoroutineScope(Dispatchers.Default).launch {

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

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.app.*
 import android.content.*
 import android.content.pm.PackageManager
-import android.content.pm.ServiceInfo
 import android.net.Uri
 import android.os.*
 import android.os.SystemClock
@@ -16,10 +15,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.core.app.NotificationCompat
-import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import androidx.work.*
-import chat.simplex.app.model.NtfManager
 import chat.simplex.common.AppLock
 import chat.simplex.common.helpers.requiresIgnoringBattery
 import chat.simplex.common.model.ChatController
@@ -55,15 +52,18 @@ class SimplexService: Service() {
     } else {
       Log.d(TAG, "null intent. Probably restarted by the system.")
     }
-    ServiceCompat.startForeground(this, SIMPLEX_SERVICE_ID, createNotificationIfNeeded(), foregroundServiceType())
+    startForeground(SIMPLEX_SERVICE_ID, serviceNotification)
     return START_STICKY // to restart if killed
   }
 
   override fun onCreate() {
     super.onCreate()
     Log.d(TAG, "Simplex service created")
-    createNotificationIfNeeded()
-    ServiceCompat.startForeground(this, SIMPLEX_SERVICE_ID, createNotificationIfNeeded(), foregroundServiceType())
+    val title = generalGetString(MR.strings.simplex_service_notification_title)
+    val text = generalGetString(MR.strings.simplex_service_notification_text)
+    notificationManager = createNotificationChannel()
+    serviceNotification = createNotification(title, text)
+    startForeground(SIMPLEX_SERVICE_ID, serviceNotification)
     /**
      * The reason [stopAfterStart] exists is because when the service is not called [startForeground] yet, and
      * we call [stopSelf] on the same service, [ForegroundServiceDidNotStartInTimeException] will be thrown.
@@ -103,26 +103,6 @@ class SimplexService: Service() {
     super.onDestroy()
   }
 
-  private fun createNotificationIfNeeded(): Notification {
-    val ntf = serviceNotification
-    if (ntf != null) return ntf
-
-    val title = generalGetString(MR.strings.simplex_service_notification_title)
-    val text = generalGetString(MR.strings.simplex_service_notification_text)
-    notificationManager = createNotificationChannel()
-    val newNtf = createNotification(title, text)
-    serviceNotification = newNtf
-    return newNtf
-  }
-
-  private fun foregroundServiceType(): Int {
-    return if (Build.VERSION.SDK_INT >= 34) {
-      ServiceInfo.FOREGROUND_SERVICE_TYPE_REMOTE_MESSAGING
-    } else {
-      0
-    }
-  }
-
   private fun startService() {
     Log.d(TAG, "SimplexService startService")
     if (wakeLock != null || isCheckingNewMessages) return
@@ -292,7 +272,7 @@ class SimplexService: Service() {
 
     fun scheduleStart(context: Context) {
       Log.d(TAG, "Enqueuing work to start subscriber service")
-      val workManager = context.getWorkManagerInstance()
+      val workManager = WorkManager.getInstance(context)
       val startServiceRequest = OneTimeWorkRequest.Builder(ServiceStartWorker::class.java).build()
       workManager.enqueueUniqueWork(WORK_NAME_ONCE, ExistingWorkPolicy.KEEP, startServiceRequest) // Unique avoids races!
     }
@@ -312,10 +292,6 @@ class SimplexService: Service() {
     }
 
     private suspend fun serviceAction(action: Action) {
-      if (!NtfManager.areNotificationsEnabledInSystem()) {
-        Log.d(TAG, "SimplexService serviceAction: ${action.name}. Notifications are not enabled in OS yet, not starting service")
-        return
-      }
       Log.d(TAG, "SimplexService serviceAction: ${action.name}")
       withContext(Dispatchers.IO) {
         Intent(androidAppContext, SimplexService::class.java).also {

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

@@ -53,7 +53,7 @@ object NtfManager {
   private val msgNtfTimeoutMs = 30000L
 
   init {
-    if (areNotificationsEnabledInSystem()) createNtfChannelsMaybeShowAlert()
+    if (manager.areNotificationsEnabled()) createNtfChannelsMaybeShowAlert()
   }
 
   private fun callNotificationChannel(channelId: String, channelName: String): NotificationChannel {
@@ -287,8 +287,6 @@ object NtfManager {
     }
   }
 
-  fun areNotificationsEnabledInSystem() = manager.areNotificationsEnabled()
-
   /**
    * This function creates notifications channels. On Android 13+ calling it for the first time will trigger system alert,
    * The alert asks a user to allow or disallow to show notifications for the app. That's why it should be called only when the user

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

@@ -120,7 +120,6 @@ class CallActivity: ComponentActivity(), ServiceConnection {
     return grantedAudio && grantedCamera
   }
 
-  @Deprecated("Was deprecated in OS")
   override fun onBackPressed() {
     if (isOnLockScreenNow()) {
       super.onBackPressed()
@@ -140,7 +139,6 @@ class CallActivity: ComponentActivity(), ServiceConnection {
   }
 
   override fun onUserLeaveHint() {
-    super.onUserLeaveHint()
     // On Android 12+ PiP is enabled automatically when a user hides the app
     if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R && callSupportsVideo() && platform.androidPictureInPictureAllowed()) {
       enterPictureInPictureMode()
@@ -250,9 +248,6 @@ fun CallActivityView() {
         )
         if (permissionsState.allPermissionsGranted) {
           ActiveCallView()
-          LaunchedEffect(Unit) {
-            activity.startServiceAndBind()
-          }
         } else {
           CallPermissionsView(remember { m.activeCallViewIsCollapsed }.value, callSupportsVideo()) {
             withBGApi { chatModel.callManager.endCall(call) }
@@ -290,6 +285,11 @@ fun CallActivityView() {
       AlertManager.shared.showInView()
     }
   }
+  LaunchedEffect(call == null) {
+    if (call != null) {
+      activity.startServiceAndBind()
+    }
+  }
   LaunchedEffect(invitation, call, switchingCall, showCallView) {
     if (!switchingCall && invitation == null && (!showCallView || call == null)) {
       Log.d(TAG, "CallActivityView: finishing activity")
@@ -424,7 +424,6 @@ fun PreviewIncomingCallLockScreenAlert() {
     ) {
       IncomingCallLockScreenAlertLayout(
         invitation = RcvCallInvitation(
-          callUUID = "",
           remoteHostId = null,
           user = User.sampleData,
           contact = Contact.sampleData,

apps/multiplatform/android/src/main/res/values/colors.xml

@@ -2,5 +2,6 @@
 <resources>
   <color name="black">#FF000000</color>
   <color name="white">#FFFFFFFF</color>
+  <color name="highOrLowLight">#8b8786</color>
   <color name="window_background_dark">#121212</color>
 </resources>

apps/multiplatform/common/build.gradle.kts

@@ -61,8 +61,8 @@ kotlin {
     val androidMain by getting {
       kotlin.srcDir("build/generated/moko/androidMain/src")
       dependencies {
-        implementation("androidx.activity:activity-compose:1.9.1")
-        val workVersion = "2.9.1"
+        implementation("androidx.activity:activity-compose:1.8.2")
+        val workVersion = "2.9.0"
         implementation("androidx.work:work-runtime-ktx:$workVersion")
         implementation("com.google.accompanist:accompanist-insets:0.30.1")
 
@@ -78,36 +78,31 @@ kotlin {
         //Camera Permission
         implementation("com.google.accompanist:accompanist-permissions:0.34.0")
 
-        implementation("androidx.webkit:webkit:1.11.0")
+        implementation("androidx.webkit:webkit:1.10.0")
 
         // GIFs support
         implementation("io.coil-kt:coil-compose:2.6.0")
         implementation("io.coil-kt:coil-gif:2.6.0")
 
-        implementation("com.jakewharton:process-phoenix:3.0.0")
+        implementation("com.jakewharton:process-phoenix:2.2.0")
 
-        val cameraXVersion = "1.3.4"
+        val cameraXVersion = "1.3.2"
         implementation("androidx.camera:camera-core:${cameraXVersion}")
         implementation("androidx.camera:camera-camera2:${cameraXVersion}")
         implementation("androidx.camera:camera-lifecycle:${cameraXVersion}")
         implementation("androidx.camera:camera-view:${cameraXVersion}")
 
         // Calls lifecycle listener
-        implementation("androidx.lifecycle:lifecycle-process:2.8.4")
+        implementation("androidx.lifecycle:lifecycle-process:2.4.1")
       }
     }
     val desktopMain by getting {
       dependencies {
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.8.0")
-        implementation("com.github.Dansoftowner:jSystemThemeDetector:3.8") {
-          exclude("net.java.dev.jna")
-        }
-        // For jSystemThemeDetector only
-        implementation("net.java.dev.jna:jna-platform:5.14.0")
+        implementation("com.github.Dansoftowner:jSystemThemeDetector:3.8")
         implementation("com.sshtools:two-slices:0.9.0-SNAPSHOT")
         implementation("org.slf4j:slf4j-simple:2.0.12")
-        implementation("uk.co.caprica:vlcj:4.8.3")
-        implementation("net.java.dev.jna:jna:5.14.0")
+        implementation("uk.co.caprica:vlcj:4.8.2")
         implementation("com.github.NanoHttpd.nanohttpd:nanohttpd:efb2ebf85a")
         implementation("com.github.NanoHttpd.nanohttpd:nanohttpd-websocket:efb2ebf85a")
         implementation("com.squareup.okhttp3:okhttp:4.12.0")
@@ -124,8 +119,8 @@ android {
   defaultConfig {
     minSdk = 26
   }
-  testOptions.targetSdk = 34
-  lint.targetSdk = 34
+  testOptions.targetSdk = 33
+  lint.targetSdk = 33
   val isAndroid = gradle.startParameter.taskNames.find {
     val lower = it.lowercase()
     lower.contains("release") || lower.startsWith("assemble") || lower.startsWith("install")

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/helpers/Extensions.kt

@@ -18,6 +18,5 @@ val NotificationsMode.requiresIgnoringBattery
 lateinit var APPLICATION_ID: String
 
 fun Uri.toURI(): URI = URI(toString().replace("\n", ""))
-fun Uri.toURIOrNull(): URI? = try { toURI() } catch (e: Exception) { null }
 
 fun URI.toUri(): Uri = Uri.parse(toString())

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

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

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

@@ -15,14 +15,13 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.graphics.drawable.DrawableCompat
@@ -36,12 +35,11 @@ import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.ui.theme.CurrentColors
 import chat.simplex.common.views.chat.*
-import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.helpers.SharedContent
+import chat.simplex.common.views.helpers.generalGetString
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.filter
 import java.lang.reflect.Field
 import java.net.URI
 
@@ -54,7 +52,6 @@ actual fun PlatformTextField(
   showDeleteTextButton: MutableState<Boolean>,
   userIsObserver: Boolean,
   placeholder: String,
-  showVoiceButton: Boolean,
   onMessageChange: (String) -> Unit,
   onUpArrow: () -> Unit,
   onFilesPasted: (List<URI>) -> Unit,
@@ -85,15 +82,7 @@ actual fun PlatformTextField(
       freeFocus = true
     }
   }
-  LaunchedEffect(Unit) {
-    snapshotFlow { ModalManager.start.modalCount.value }
-      .filter { it > 0 }
-      .collect {
-        freeFocus = true
-      }
-  }
 
-  val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
   AndroidView(modifier = Modifier, factory = {
     val editText = @SuppressLint("AppCompatCustomView") object: EditText(it) {
       override fun setOnReceiveContentListener(
@@ -124,8 +113,7 @@ actual fun PlatformTextField(
     editText.setTextColor(textColor.toArgb())
     editText.textSize = textStyle.value.fontSize.value * appPrefs.fontScale.get()
     editText.background = ColorDrawable(Color.Transparent.toArgb())
-    editText.textDirection = if (isRtl) EditText.TEXT_DIRECTION_LOCALE else EditText.TEXT_DIRECTION_ANY_RTL
-    editText.setPaddingRelative(paddingStart, paddingTop, paddingEnd, paddingBottom)
+    editText.setPadding(paddingStart, paddingTop, paddingEnd, paddingBottom)
     editText.setText(cs.message)
     editText.hint = placeholder
     editText.setHintTextColor(hintColor.toArgb())

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

@@ -52,9 +52,6 @@ actual fun windowOrientation(): WindowOrientation = when (mainActivity.get()?.re
 @Composable
 actual fun windowWidth(): Dp = LocalConfiguration.current.screenWidthDp.dp
 
-@Composable
-actual fun windowHeight(): Dp = LocalConfiguration.current.screenHeightDp.dp
-
 actual fun desktopExpandWindowToWidth(width: Dp) {}
 
 actual fun isRtl(text: CharSequence): Boolean = BidiFormatter.getInstance().isRtl(text)

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

@@ -4,21 +4,14 @@ import androidx.compose.foundation.*
 import androidx.compose.foundation.gestures.FlingBehavior
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.dp
-import chat.simplex.common.views.helpers.*
-import kotlinx.coroutines.flow.filter
-import kotlin.math.absoluteValue
 
 @Composable
 actual fun LazyColumnWithScrollBar(
   modifier: Modifier,
-  state: LazyListState?,
+  state: LazyListState,
   contentPadding: PaddingValues,
   reverseLayout: Boolean,
   verticalArrangement: Arrangement.Vertical,
@@ -27,24 +20,7 @@ actual fun LazyColumnWithScrollBar(
   userScrollEnabled: Boolean,
   content: LazyListScope.() -> Unit
 ) {
-  val state = state ?: LocalAppBarHandler.current?.listState ?: rememberLazyListState()
-  val connection = LocalAppBarHandler.current?.connection
-  LaunchedEffect(Unit) {
-    snapshotFlow { state.firstVisibleItemScrollOffset }
-      .filter { state.firstVisibleItemIndex == 0 }
-      .collect { scrollPosition ->
-        val offset = connection?.appBarOffset
-        if (offset != null && (offset + scrollPosition).absoluteValue > 1) {
-          connection.appBarOffset = -scrollPosition.toFloat()
-//          Log.d(TAG, "Scrolling position changed from $offset to ${connection.appBarOffset}")
-        }
-      }
-  }
-  if (connection != null) {
-    LazyColumn(modifier.nestedScroll(connection), state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled, content)
-  } else {
-    LazyColumn(modifier, state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled, content)
-  }
+  LazyColumn(modifier, state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled, content)
 }
 
 @Composable
@@ -52,34 +28,8 @@ actual fun ColumnWithScrollBar(
   modifier: Modifier,
   verticalArrangement: Arrangement.Vertical,
   horizontalAlignment: Alignment.Horizontal,
-  state: ScrollState?,
-  maxIntrinsicSize: Boolean,
-  content: @Composable() (ColumnScope.() -> Unit)
+  state: ScrollState,
+  content: @Composable ColumnScope.() -> Unit
 ) {
-  val state = state ?: LocalAppBarHandler.current?.scrollState ?: rememberScrollState()
-  val connection = LocalAppBarHandler.current?.connection
-  LaunchedEffect(Unit) {
-    snapshotFlow { state.value }
-      .collect { scrollPosition ->
-        val offset = connection?.appBarOffset
-        if (offset != null && (offset + scrollPosition).absoluteValue > 1) {
-          connection.appBarOffset = -scrollPosition.toFloat()
-//          Log.d(TAG, "Scrolling position changed from $offset to ${connection.appBarOffset}")
-        }
-      }
-  }
-  if (connection != null) {
-      Column(
-        if (maxIntrinsicSize) {
-          modifier.nestedScroll(connection).verticalScroll(state).height(IntrinsicSize.Max)
-        } else {
-          modifier.nestedScroll(connection).verticalScroll(state)
-        }, verticalArrangement, horizontalAlignment, content)
-  } else {
-      Column(if (maxIntrinsicSize) {
-        modifier.verticalScroll(state).height(IntrinsicSize.Max)
-      } else {
-        modifier.verticalScroll(state)
-      }, verticalArrangement, horizontalAlignment, content)
-  }
+  Column(modifier.verticalScroll(rememberScrollState()), verticalArrangement, horizontalAlignment, content)
 }