core: group integrity status types (#3302 )

core: group DAG types (#3286 )
* core: group DAG types * fix tests * schema, more types --------- Co-authored-by: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
2024-12-17 17:20:21 +01:00 · 2023-11-02 20:07:14 +04:00 · 2023-11-01 17:27:34 +04:00
488 changed files with 9225 additions and 33290 deletions
@@ -9,7 +9,6 @@ on:
    tags:
      - "v*"
      - "!*-fdroid"
-      - "!*-armv7a"
  pull_request:

 jobs:
@@ -80,10 +79,10 @@ jobs:
        uses: actions/checkout@v3

      - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
        with:
-          ghc-version: "8.10.7"
-          cabal-version: "latest"
+          ghc-version: "9.6.2"
+          cabal-version: "3.10.1.0"

      - name: Cache dependencies
        uses: actions/cache@v3
@@ -189,7 +188,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
@@ -260,40 +259,13 @@ 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
-
-      - name: 'Setup MSYS2'
-        if: matrix.os == 'windows-latest'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: ucrt64
-          update: true
-          install: >-
-            git
-            perl
-            make
-          pacboy: >-
-            toolchain:p
-            cmake:p
-
+      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing

      - name: Windows build
        id: windows_build
        if: matrix.os == 'windows-latest'
-        shell: msys2 {0}
+        shell: bash
        run: |
-          export PATH=$PATH:/c/ghcup/bin
-          scripts/desktop/prepare-openssl-windows.sh
-          openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-1.1.1w | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
-          rm cabal.project.local 2>/dev/null || true
-          echo "ignore-project: False" >> cabal.project.local
-          echo "package direct-sqlcipher" >> cabal.project.local
-          echo "    flags: +openssl" >> cabal.project.local
-          echo "    extra-include-dirs: $openssl_windows_style_path\include" >> cabal.project.local
-          echo "    extra-lib-dirs: $openssl_windows_style_path" >> cabal.project.local
-
          rm -rf dist-newstyle/src/direct-sq*
          sed -i "s/, unix /--, unix /" simplex-chat.cabal
          cabal build --enable-tests
@@ -324,9 +296,10 @@ jobs:
      - name: Windows build desktop
        id: windows_desktop_build
        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        shell: msys2 {0}
+        env:
+          SIMPLEX_CI_REPO_URL: ${{ secrets.SIMPLEX_CI_REPO_URL }}
+        shell: bash
        run: |
-          export PATH=$PATH:/c/ghcup/bin
          scripts/desktop/build-lib-windows.sh
          cd apps/multiplatform
          ./gradlew packageMsi
@@ -8,11 +8,11 @@ RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/
    chmod +x /usr/bin/ghcup

 # Install ghc
-RUN ghcup install ghc 9.6.3
+RUN ghcup install ghc 9.6.2
 # Install cabal
 RUN ghcup install cabal 3.10.1.0
 # Set both as default
-RUN ghcup set ghc 9.6.3 && \
+RUN ghcup set ghc 9.6.2 && \
    ghcup set cabal 3.10.1.0

 COPY . /project
@@ -232,8 +232,6 @@ You can use SimpleX with your own servers and still communicate with people usin

 Recent and important updates:

-[Nov 25, 2023. SimpleX Chat v5.4 released: link mobile and desktop apps via quantum resistant protocol, and much better groups](./blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.md).
-
 [Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).

 [Jul 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
@@ -368,13 +366,13 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Message delivery confirmation (with sender opt-out per contact).
 - ✅ Desktop client.
 - ✅ Encryption of local files stored in the app.
- ✅ Using mobile profiles from the desktop app.
- 🏗 Improve experience for the new users.
- 🏗 Post-quantum resistant key exchange in double ratchet protocol.
- 🏗 Large groups, communities and public channels.
+- 🏗 Using mobile profiles from the desktop app.
 - Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
+- Post-quantum resistant key exchange in double ratchet protocol.
+- Large groups, communities and public channels.
 - Privacy & security slider - a simple way to set all settings at once.
 - Improve sending videos (including encryption of locally stored videos).
+- Improve experience for the new users.
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
@@ -42,7 +42,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
        let m = ChatModel.shared
        let deviceToken = DeviceToken(pushProvider: PushProvider(env: pushEnvironment), token: token)
        m.deviceToken = deviceToken
-        // savedToken is set in startChat, when it is started before this method is called
        if m.savedToken != nil {
            registerToken(token: deviceToken)
        }
@@ -81,7 +80,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                }
            } else if let checkMessages = ntfData["checkMessages"] as? Bool, checkMessages {
                logger.debug("AppDelegate: didReceiveRemoteNotification: checkMessages")
-                if m.ntfEnablePeriodic && allowBackgroundRefresh() && BGManager.shared.lastRanLongAgo {
+                if appStateGroupDefault.get().inactive && m.ntfEnablePeriodic {
                    receiveMessages(completionHandler)
                } else {
                    completionHandler(.noData)
@@ -121,10 +120,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {

        BGManager.shared.receiveMessages(complete)
    }
-
-    static func keepScreenOn(_ on: Bool) {
-        UIApplication.shared.isIdleTimerDisabled = on
-    }
 }

 class SceneDelegate: NSObject, ObservableObject, UIWindowSceneDelegate {
@@ -14,14 +14,11 @@ struct ContentView: View {
    @ObservedObject var alertManager = AlertManager.shared
    @ObservedObject var callController = CallController.shared
    @Environment(\.colorScheme) var colorScheme
-
-    var contentAccessAuthenticationExtended: Bool
-
-    @Environment(\.scenePhase) var scenePhase
-    @State private var automaticAuthenticationAttempted = false
-    @State private var canConnectViewCall = false
-    @State private var lastSuccessfulUnlock: TimeInterval? = nil
-
+    @Binding var doAuthenticate: Bool
+    @Binding var userAuthorized: Bool?
+    @Binding var canConnectCall: Bool
+    @Binding var lastSuccessfulUnlock: TimeInterval?
+    @Binding var showInitializationView: Bool
    @AppStorage(DEFAULT_SHOW_LA_NOTICE) private var prefShowLANotice = false
    @AppStorage(DEFAULT_LA_NOTICE_SHOWN) private var prefLANoticeShown = false
    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -43,19 +40,9 @@ struct ContentView: View {
        }
    }

-    private var accessAuthenticated: Bool {
-        chatModel.contentViewAccessAuthenticated || contentAccessAuthenticationExtended
-    }
-
    var body: some View {
        ZStack {
-            // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
-            // i.e. with separate branches like this settings are closed: `if prefPerformLA { ... contentView() ... } else { contentView() }
-            if !prefPerformLA || accessAuthenticated {
-                contentView()
-            } else {
-                lockButton()
-            }
+            contentView()
            if chatModel.showCallView, let call = chatModel.activeCall {
                callView(call)
            }
@@ -63,7 +50,6 @@ struct ContentView: View {
                LocalAuthView(authRequest: la)
            } else if showSetPasscode {
                SetAppPasscodeView {
-                    chatModel.contentViewAccessAuthenticated = true
                    prefPerformLA = true
                    showSetPasscode = false
                    privacyLocalAuthModeDefault.set(.passcode)
@@ -74,9 +60,13 @@ struct ContentView: View {
                    alertManager.showAlert(laPasscodeNotSetAlert())
                }
            }
-            if chatModel.chatDbStatus == nil {
-                initializationView()
-            }
+        }
+        .onAppear {
+            if prefPerformLA { requestNtfAuthorization() }
+            initAuthenticate()
+        }
+        .onChange(of: doAuthenticate) { _ in
+            initAuthenticate()
        }
        .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
        .sheet(isPresented: $showSettings) {
@@ -86,44 +76,14 @@ struct ContentView: View {
            Button("System authentication") { initialEnableLA() }
            Button("Passcode entry") { showSetPasscode = true }
        }
-        .onChange(of: scenePhase) { phase in
-            logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
-            switch (phase) {
-            case .background:
-                // also see .onChange(of: scenePhase) in SimpleXApp: on entering background
-                // it remembers enteredBackgroundAuthenticated and sets chatModel.contentViewAccessAuthenticated to false
-                automaticAuthenticationAttempted = false
-                canConnectViewCall = false
-            case .active:
-                canConnectViewCall = !prefPerformLA || contentAccessAuthenticationExtended || unlockedRecently()
-                
-                // condition `!chatModel.contentViewAccessAuthenticated` is required for when authentication is enabled in settings or on initial notice
-                if prefPerformLA && !chatModel.contentViewAccessAuthenticated {
-                    if AppChatState.shared.value != .stopped {
-                        if contentAccessAuthenticationExtended {
-                            chatModel.contentViewAccessAuthenticated = true
-                        } else {
-                            if !automaticAuthenticationAttempted {
-                                automaticAuthenticationAttempted = true
-                                // authenticate if call kit call is not in progress
-                                if !(CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil) {
-                                    authenticateContentViewAccess()
-                                }
-                            }
-                        }
-                    } else {
-                        // when app is stopped automatic authentication is not attempted
-                        chatModel.contentViewAccessAuthenticated = contentAccessAuthenticationExtended
-                    }
-                }
-            default:
-                break
-            }
-        }
    }

    @ViewBuilder private func contentView() -> some View {
-        if let status = chatModel.chatDbStatus, status != .ok {
+        if prefPerformLA && userAuthorized != true {
+            lockButton()
+        } else if chatModel.chatDbStatus == nil && showInitializationView {
+            initializationView()
+        } else if let status = chatModel.chatDbStatus, status != .ok {
            DatabaseErrorView(status: status)
        } else if !chatModel.v3DBMigration.startChat {
            MigrateToAppGroupView()
@@ -146,11 +106,11 @@ struct ContentView: View {
        if CallController.useCallKit() {
            ActiveCallView(call: call, canConnectCall: Binding.constant(true))
                .onDisappear {
-                    if prefPerformLA && !accessAuthenticated { authenticateContentViewAccess() }
+                    if userAuthorized == false && doAuthenticate { runAuthenticate() }
                }
        } else {
-            ActiveCallView(call: call, canConnectCall: $canConnectViewCall)
-            if prefPerformLA && !accessAuthenticated {
+            ActiveCallView(call: call, canConnectCall: $canConnectCall)
+            if prefPerformLA && userAuthorized != true {
                Rectangle()
                    .fill(colorScheme == .dark ? .black : .white)
                    .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -160,27 +120,22 @@ struct ContentView: View {
    }

    private func lockButton() -> some View {
-        Button(action: authenticateContentViewAccess) { Label("Unlock", systemImage: "lock") }
+        Button(action: runAuthenticate) { Label("Unlock", systemImage: "lock") }
    }

    private func initializationView() -> some View {
        VStack {
            ProgressView().scaleEffect(2)
-            Text("Opening app…")
+            Text("Opening database…")
                .padding()
        }
-        .frame(maxWidth: .infinity, maxHeight: .infinity )
-        .background(
-            Rectangle()
-                .fill(.background)
-        ) 
    }

    private func mainView() -> some View {
        ZStack(alignment: .top) {
            ChatListView(showSettings: $showSettings).privacySensitive(protectScreen)
            .onAppear {
-                requestNtfAuthorization()
+                if !prefPerformLA { requestNtfAuthorization() }
                // Local Authentication notice is to be shown on next start after onboarding is complete
                if (!prefLANoticeShown && prefShowLANotice && !chatModel.chats.isEmpty) {
                    prefLANoticeShown = true
@@ -232,37 +187,48 @@ struct ContentView: View {
        }
    }

-    private func unlockedRecently() -> Bool {
-        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
-            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
-        } else {
-            return false
+    private func initAuthenticate() {
+        logger.debug("initAuthenticate")
+        if CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil {
+            userAuthorized = false
+        } else if doAuthenticate {
+            runAuthenticate()
        }
    }

-    private func authenticateContentViewAccess() {
-        logger.debug("DEBUGGING: authenticateContentViewAccess")
-        dismissAllSheets(animated: false) {
-            logger.debug("DEBUGGING: authenticateContentViewAccess, in dismissAllSheets callback")
-            chatModel.chatId = nil
+    private func runAuthenticate() {
+        logger.debug("DEBUGGING: runAuthenticate")
+        if !prefPerformLA {
+            userAuthorized = true
+        } else {
+            logger.debug("DEBUGGING: before dismissAllSheets")
+            dismissAllSheets(animated: false) {
+                logger.debug("DEBUGGING: in dismissAllSheets callback")
+                chatModel.chatId = nil
+                justAuthenticate()
+            }
+        }
+    }

-            authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
-                logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
-                switch (laResult) {
-                case .success:
-                    chatModel.contentViewAccessAuthenticated = true
-                    canConnectViewCall = true
-                    lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
-                case .failed:
-                    chatModel.contentViewAccessAuthenticated = false
-                    if privacyLocalAuthModeDefault.get() == .passcode {
-                        AlertManager.shared.showAlert(laFailedAlert())
-                    }
-                case .unavailable:
-                    prefPerformLA = false
-                    canConnectViewCall = true
-                    AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
+    private func justAuthenticate() {
+        userAuthorized = false
+        let laMode = privacyLocalAuthModeDefault.get()
+        authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
+            logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
+            switch (laResult) {
+            case .success:
+                userAuthorized = true
+                canConnectCall = true
+                lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
+            case .failed:
+                if laMode == .passcode {
+                    AlertManager.shared.showAlert(laFailedAlert())
                }
+            case .unavailable:
+                userAuthorized = true
+                prefPerformLA = false
+                canConnectCall = true
+                AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
            }
        }
    }
@@ -293,7 +259,6 @@ struct ContentView: View {
        authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
            switch laResult {
            case .success:
-                chatModel.contentViewAccessAuthenticated = true
                prefPerformLA = true
                alertManager.showAlert(laTurnedOnAlert())
            case .failed:
@@ -46,7 +46,6 @@ class AudioRecorder {
            audioRecorder?.record(forDuration: MAX_VOICE_MESSAGE_LENGTH)

            await MainActor.run {
-                AppDelegate.keepScreenOn(true)
                recordingTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
                    guard let time = self.audioRecorder?.currentTime else { return }
                    self.onTimer?(time)
@@ -58,10 +57,6 @@ class AudioRecorder {
            }
            return nil
        } catch let error {
-            await MainActor.run {
-                AppDelegate.keepScreenOn(false)
-            }
-            try? av.setCategory(AVAudioSession.Category.soloAmbient)
            logger.error("AudioRecorder startAudioRecording error \(error.localizedDescription)")
            return .error(error.localizedDescription)
        }
@@ -76,8 +71,6 @@ class AudioRecorder {
            timer.invalidate()
        }
        recordingTimer = nil
-        AppDelegate.keepScreenOn(false)
-        try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
    }

    private func checkPermission() async -> Bool {
@@ -128,19 +121,14 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {

        playbackTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
            if self.audioPlayer?.isPlaying ?? false {
-                AppDelegate.keepScreenOn(true)
                guard let time = self.audioPlayer?.currentTime else { return }
                self.onTimer?(time)
-                AudioPlayer.changeAudioSession(true)
-            } else {
-                AudioPlayer.changeAudioSession(false)
            }
        }
    }

    func pause() {
        audioPlayer?.pause()
-        AppDelegate.keepScreenOn(false)
    }

    func play() {
@@ -161,8 +149,6 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
    func stop() {
        if let player = audioPlayer {
            player.stop()
-            AppDelegate.keepScreenOn(false)
-            AudioPlayer.changeAudioSession(false)
        }
        audioPlayer = nil
        if let timer = playbackTimer {
@@ -171,24 +157,6 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
        playbackTimer = nil
    }

-    static func changeAudioSession(_ playback: Bool) {
-        // When there is a audio recording, setting any other category will disable sound
-        if AVAudioSession.sharedInstance().category == .playAndRecord {
-            return
-        }
-        if playback {
-            if AVAudioSession.sharedInstance().category != .playback {
-                logger.log("AudioSession: playback")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: .duckOthers)
-            }
-        } else {
-            if AVAudioSession.sharedInstance().category != .soloAmbient {
-                logger.log("AudioSession: soloAmbient")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
-            }
-        }
-    }
-
    func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
        stop()
        self.onFinishPlayback?()
@@ -15,13 +15,7 @@ private let receiveTaskId = "chat.simplex.app.receive"
 // TCP timeout + 2 sec
 private let waitForMessages: TimeInterval = 6

-// This is the smallest interval between refreshes, and also target interval in "off" mode
-private let bgRefreshInterval: TimeInterval = 600 // 10 minutes
-
-// This intervals are used for background refresh in instant and periodic modes
-private let periodicBgRefreshInterval: TimeInterval = 1200 // 20 minutes
-
-private let maxBgRefreshInterval: TimeInterval = 2400 // 40 minutes
+private let bgRefreshInterval: TimeInterval = 450

 private let maxTimerCount = 9

@@ -39,14 +33,14 @@ class BGManager {
        }
    }

-    func schedule(interval: TimeInterval? = nil) {
+    func schedule() {
        if !ChatModel.shared.ntfEnableLocal {
            logger.debug("BGManager.schedule: disabled")
            return
        }
        logger.debug("BGManager.schedule")
        let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
-        request.earliestBeginDate = Date(timeIntervalSinceNow: interval ?? runInterval)
+        request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
        do {
            try BGTaskScheduler.shared.submit(request)
        } catch {
@@ -54,34 +48,20 @@ class BGManager {
        }
    }

-    var runInterval: TimeInterval {
-        switch ChatModel.shared.notificationMode {
-        case .instant: maxBgRefreshInterval
-        case .periodic: periodicBgRefreshInterval
-        case .off: bgRefreshInterval
-        }
-    }
-
-    var lastRanLongAgo: Bool {
-        Date.now.timeIntervalSince(chatLastBackgroundRunGroupDefault.get()) > runInterval
-    }
-
    private func handleRefresh(_ task: BGAppRefreshTask) {
        if !ChatModel.shared.ntfEnableLocal {
            logger.debug("BGManager.handleRefresh: disabled")
            return
        }
        logger.debug("BGManager.handleRefresh")
-        let shouldRun_ = lastRanLongAgo
-        if allowBackgroundRefresh() && shouldRun_ {
-            schedule()
+        schedule()
+        if appStateGroupDefault.get().inactive {
            let completeRefresh = completionHandler {
                task.setTaskCompleted(success: true)
            }
            task.expirationHandler = { completeRefresh("expirationHandler") }
            receiveMessages(completeRefresh)
        } else {
-            schedule(interval: shouldRun_ ? bgRefreshInterval : runInterval)
            logger.debug("BGManager.completionHandler: already active, not started")
            task.setTaskCompleted(success: true)
        }
@@ -110,22 +90,20 @@ class BGManager {
        }
        self.completed = false
        DispatchQueue.main.async {
-            chatLastBackgroundRunGroupDefault.set(Date.now)
            let m = ChatModel.shared
            if (!m.chatInitialized) {
-                setAppState(.bgRefresh)
                do {
                    try initializeChat(start: true)
                } catch let error {
                    fatalError("Failed to start or load chats: \(responseError(error))")
                }
            }
-            activateChat(appState: .bgRefresh)
            if m.currentUser == nil {
                completeReceiving("no current user")
                return
            }
            logger.debug("BGManager.receiveMessages: starting chat")
+            activateChat(appState: .bgRefresh)
            let cr = ChatReceiver()
            self.chatReceiver = cr
            cr.start()
@@ -54,8 +54,6 @@ final class ChatModel: ObservableObject {
    @Published var chatDbChanged = false
    @Published var chatDbEncrypted: Bool?
    @Published var chatDbStatus: DBMigrationResult?
-    // local authentication
-    @Published var contentViewAccessAuthenticated: Bool = false
    @Published var laRequest: LocalAuthRequest?
    // list of chat "previews"
    @Published var chats: [Chat] = []
@@ -85,10 +83,8 @@ final class ChatModel: ObservableObject {
    // current WebRTC call
    @Published var callInvitations: Dictionary<ChatId, RcvCallInvitation> = [:]
    @Published var activeCall: Call?
-    let callCommand: WebRTCCommandProcessor = WebRTCCommandProcessor()
+    @Published var callCommand: WCallCommand?
    @Published var showCallView = false
-    // remote desktop
-    @Published var remoteCtrlSession: RemoteCtrlSession?
    // currently showing QR code
    @Published var connReqInv: String?
    // audio recording and playback
@@ -106,14 +102,12 @@ final class ChatModel: ObservableObject {

    static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }

-    let ntfEnableLocal = true
-
-    var ntfEnablePeriodic: Bool {
-        notificationMode != .off
+    var ntfEnableLocal: Bool {
+        notificationMode == .off || ntfEnableLocalGroupDefault.get()
    }

-    var activeRemoteCtrl: Bool {
-        remoteCtrlSession?.active ?? false
+    var ntfEnablePeriodic: Bool {
+        notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
    }

    func getUser(_ userId: Int64) -> User? {
@@ -200,7 +194,7 @@ final class ChatModel: ObservableObject {

    func updateContactConnectionStats(_ contact: Contact, _ connectionStats: ConnectionStats) {
        var updatedConn = contact.activeConn
-        updatedConn?.connectionStats = connectionStats
+        updatedConn.connectionStats = connectionStats
        var updatedContact = contact
        updatedContact.activeConn = updatedConn
        updateContact(updatedContact)
@@ -267,20 +261,7 @@ final class ChatModel: ObservableObject {
    func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
        // update previews
        if let i = getChatIndex(cInfo.id) {
-            chats[i].chatItems = switch cInfo {
-            case .group:
-                if let currentPreviewItem = chats[i].chatItems.first {
-                    if cItem.meta.itemTs >= currentPreviewItem.meta.itemTs {
-                        [cItem]
-                    } else {
-                        [currentPreviewItem]
-                    }
-                } else {
-                    [cItem]
-                }
-            default:
-                [cItem]
-            }
+            chats[i].chatItems = [cItem]
            if case .rcvNew = cItem.meta.itemStatus {
                chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
                increaseUnreadCounter(user: currentUser!)
@@ -690,17 +671,11 @@ final class ChatModel: ObservableObject {
    }

    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] = status
-        }
+        networkStatuses[contact.activeConn.agentConnId] = status
    }

    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] ?? .unknown
-        } else {
-            .unknown
-        }
+        networkStatuses[contact.activeConn.agentConnId] ?? .unknown
    }
 }

@@ -781,38 +756,3 @@ final class GMember: ObservableObject, Identifiable {
    var viewId: String { get { "\(wrapped.id) \(created.timeIntervalSince1970)" } }
    static let sampleData = GMember(GroupMember.sampleData)
 }
-
-struct RemoteCtrlSession {
-    var ctrlAppInfo: CtrlAppInfo?
-    var appVersion: String
-    var sessionState: UIRemoteCtrlSessionState
-
-    func updateState(_ state: UIRemoteCtrlSessionState) -> RemoteCtrlSession {
-        RemoteCtrlSession(ctrlAppInfo: ctrlAppInfo, appVersion: appVersion, sessionState: state)
-    }
-
-    var active: Bool {
-        if case .connected = sessionState { true } else { false }
-    }
-
-    var discovery: Bool {
-        if case .searching = sessionState { true } else { false }
-    }
-
-    var sessionCode: String? {
-        switch sessionState {
-        case let .pendingConfirmation(_, sessionCode): sessionCode
-        case let .connected(_, sessionCode): sessionCode
-        default: nil
-        }
-    }
-}
-
-enum UIRemoteCtrlSessionState {
-    case starting
-    case searching
-    case found(remoteCtrl: RemoteCtrlInfo, compatible: Bool)
-    case connecting(remoteCtrl_: RemoteCtrlInfo?)
-    case pendingConfirmation(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
-    case connected(remoteCtrl: RemoteCtrlInfo, sessionCode: String)
-}
@@ -195,18 +195,18 @@ func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
    }
 }

-func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
-    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
+func generateNewFileName(_ prefix: String, _ ext: String) -> String {
+    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)")
 }

-private func uniqueCombine(_ fileName: String, fullPath: Bool = false) -> String {
+private func uniqueCombine(_ fileName: String) -> String {
    func tryCombine(_ fileName: String, _ n: Int) -> String {
        let ns = fileName as NSString
        let name = ns.deletingPathExtension
        let ext = ns.pathExtension
        let suffix = (n == 0) ? "" : "_\(n)"
        let f = "\(name)\(suffix).\(ext)"
-        return (FileManager.default.fileExists(atPath: fullPath ? f : getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
+        return (FileManager.default.fileExists(atPath: getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
    }
    return tryCombine(fileName, 0)
 }
@@ -1,83 +0,0 @@
-//
-//  NSESubscriber.swift
-//  SimpleXChat
-//
-//  Created by Evgeny on 09/12/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SimpleXChat
-
-private var nseSubscribers: [UUID:NSESubscriber] = [:]
-
-// timeout for active notification service extension going into "suspending" state.
-// If in two seconds the state does not change, we assume that it was not running and proceed with app activation/answering call.
-private let SUSPENDING_TIMEOUT: TimeInterval = 2
-
-// timeout should be larger than SUSPENDING_TIMEOUT
-func waitNSESuspended(timeout: TimeInterval, suspended: @escaping (Bool) -> Void) {
-    if timeout <= SUSPENDING_TIMEOUT {
-        logger.warning("waitNSESuspended: small timeout \(timeout), using \(SUSPENDING_TIMEOUT + 1)")
-    }
-    var state = nseStateGroupDefault.get()
-    if case .suspended = state {
-        DispatchQueue.main.async { suspended(true) }
-        return
-    }
-    let id = UUID()
-    var suspendedCalled = false
-    checkTimeout()
-    nseSubscribers[id] = nseMessageSubscriber { msg in
-        if case let .state(newState) = msg {
-            state = newState
-            logger.debug("waitNSESuspended state: \(state.rawValue)")
-            if case .suspended = newState {
-                notifySuspended(true)
-            }
-        }
-    }
-    return
-
-    func notifySuspended(_ ok: Bool) {
-        logger.debug("waitNSESuspended notifySuspended: \(ok)")
-        if !suspendedCalled {
-            logger.debug("waitNSESuspended notifySuspended: calling suspended(\(ok))")
-            suspendedCalled = true
-            nseSubscribers.removeValue(forKey: id)
-            DispatchQueue.main.async { suspended(ok) }
-        }
-    }
-
-    func checkTimeout() {
-        if !suspending() {
-            checkSuspendingTimeout()
-        } else if state == .suspending {
-            checkSuspendedTimeout()
-        }
-    }
-
-    func suspending() -> Bool {
-        suspendedCalled || state == .suspended || state == .suspending
-    }
-
-    func checkSuspendingTimeout() {
-        DispatchQueue.global().asyncAfter(deadline: .now() + SUSPENDING_TIMEOUT) {
-            logger.debug("waitNSESuspended check suspending timeout")
-            if !suspending() {
-                notifySuspended(false)
-            } else if state != .suspended {
-                checkSuspendedTimeout()
-            }
-        }
-    }
-
-    func checkSuspendedTimeout() {
-        DispatchQueue.global().asyncAfter(deadline: .now() + min(timeout - SUSPENDING_TIMEOUT, 1)) {
-            logger.debug("waitNSESuspended check suspended timeout")
-            if state != .suspended {
-                notifySuspended(false)
-            }
-        }
-    }
-}
@@ -211,7 +211,7 @@ func apiDeleteUser(_ userId: Int64, _ delSMPQueues: Bool, viewPwd: String?) asyn
 }

 func apiStartChat() throws -> Bool {
-    let r = chatSendCmdSync(.startChat(mainApp: true))
+    let r = chatSendCmdSync(.startChat(subscribe: true, expire: true, xftp: true))
    switch r {
    case .chatStarted: return true
    case .chatRunning: return false
@@ -228,8 +228,7 @@ func apiStopChat() async throws {
 }

 func apiActivateChat() {
-    chatReopenStore()
-    let r = chatSendCmdSync(.apiActivateChat(restoreChat: true))
+    let r = chatSendCmdSync(.apiActivateChat)
    if case .cmdOk = r { return }
    logger.error("apiActivateChat error: \(String(describing: r))")
 }
@@ -403,7 +402,7 @@ func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode) {
    case let .ntfToken(token, status, ntfMode): return (token, status, ntfMode)
    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off)
    default:
-        logger.debug("apiGetNtfToken response: \(String(describing: r))")
+        logger.debug("apiGetNtfToken response: \(String(describing: r), privacy: .public)")
        return (nil, nil, .off)
    }
 }
@@ -606,29 +605,27 @@ func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
    throw r
 }

-func apiConnect(incognito: Bool, connReq: String) async -> (ConnReqType, PendingContactConnection)? {
-    let (r, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
+func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
+    let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
    if let alert = alert {
        AlertManager.shared.showAlert(alert)
        return nil
    } else {
-        return r
+        return connReqType
    }
 }

-func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, PendingContactConnection)?, Alert?) {
+func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert?) {
    guard let userId = ChatModel.shared.currentUser?.userId else {
        logger.error("apiConnect: no current user")
        return (nil, nil)
    }
    let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
-    let m = ChatModel.shared
    switch r {
-    case let .sentConfirmation(_, connection):
-        return ((.invitation, connection), nil)
-    case let .sentInvitation(_, connection):
-        return ((.contact, connection), nil)
+    case .sentConfirmation: return (.invitation, nil)
+    case .sentInvitation: return (.contact, nil)
    case let .contactAlreadyExists(_, contact):
+        let m = ChatModel.shared
        if let c = m.getContactChat(contact.contactId) {
            await MainActor.run { m.chatId = c.id }
        }
@@ -678,18 +675,6 @@ private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
    }
 }

-func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Contact?, Alert?) {
-    guard let userId = ChatModel.shared.currentUser?.userId else {
-        logger.error("apiConnectContactViaAddress: no current user")
-        return (nil, nil)
-    }
-    let r = await chatSendCmd(.apiConnectContactViaAddress(userId: userId, incognito: incognito, contactId: contactId))
-    if case let .sentInvitationToContact(_, contact, _) = r { return (contact, nil) }
-    logger.error("apiConnectContactViaAddress error: \(responseError(r))")
-    let alert = connectionErrorAlert(r)
-    return (nil, alert)
-}
-
 func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
    if case .direct = type, case .contactDeleted = r { return }
@@ -908,46 +893,6 @@ func apiCancelFile(fileId: Int64) async -> AChatItem? {
    }
 }

-func setLocalDeviceName(_ displayName: String) throws {
-    try sendCommandOkRespSync(.setLocalDeviceName(displayName: displayName))
-}
-
-func connectRemoteCtrl(desktopAddress: String) async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String) {
-    let r = await chatSendCmd(.connectRemoteCtrl(xrcpInvitation: desktopAddress))
-    if case let .remoteCtrlConnecting(rc_, ctrlAppInfo, v) = r { return (rc_, ctrlAppInfo, v) }
-    throw r
-}
-
-func findKnownRemoteCtrl() async throws {
-    try await sendCommandOkResp(.findKnownRemoteCtrl)
-}
-
-func confirmRemoteCtrl(_ rcId: Int64) async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String) {
-    let r = await chatSendCmd(.confirmRemoteCtrl(remoteCtrlId: rcId))
-    if case let .remoteCtrlConnecting(rc_, ctrlAppInfo, v) = r { return (rc_, ctrlAppInfo, v) }
-    throw r
-}
-
-func verifyRemoteCtrlSession(_ sessCode: String) async throws -> RemoteCtrlInfo {
-    let r = await chatSendCmd(.verifyRemoteCtrlSession(sessionCode: sessCode))
-    if case let .remoteCtrlConnected(rc) = r { return rc }
-    throw r
-}
-
-func listRemoteCtrls() throws -> [RemoteCtrlInfo] {
-    let r = chatSendCmdSync(.listRemoteCtrls)
-    if case let .remoteCtrlList(rcInfo) = r { return rcInfo }
-    throw r
-}
-
-func stopRemoteCtrl() async throws {
-    try await sendCommandOkResp(.stopRemoteCtrl)
-}
-
-func deleteRemoteCtrl(_ rcId: Int64) async throws {
-    try await sendCommandOkResp(.deleteRemoteCtrl(remoteCtrlId: rcId))
-}
-
 func networkErrorAlert(_ r: ChatResponse) -> Alert? {
    switch r {
    case let .chatCmdError(_, .errorAgent(.BROKER(addr, .TIMEOUT))):
@@ -1076,12 +1021,6 @@ private func sendCommandOkResp(_ cmd: ChatCommand) async throws {
    throw r
 }

-private func sendCommandOkRespSync(_ cmd: ChatCommand) throws {
-    let r = chatSendCmdSync(cmd)
-    if case .cmdOk = r { return }
-    throw r
-}
-
 func apiNewGroup(incognito: Bool, groupProfile: GroupProfile) throws -> GroupInfo {
    let userId = try currentUserId("apiNewGroup")
    let r = chatSendCmdSync(.apiNewGroup(userId: userId, incognito: incognito, groupProfile: groupProfile))
@@ -1235,9 +1174,6 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
        try startChat(refreshInvitations: refreshInvitations)
    } else {
        m.chatRunning = false
-        try getUserChatData()
-        NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
-        m.onboardingStage = onboardingStageDefault.get()
    }
 }

@@ -1254,8 +1190,6 @@ func startChat(refreshInvitations: Bool = true) throws {
            try refreshCallInvitations()
        }
        (m.savedToken, m.tokenStatus, m.notificationMode) = apiGetNtfToken()
-        // deviceToken is set when AppDelegate.application(didRegisterForRemoteNotificationsWithDeviceToken:) is called,
-        // when it is called before startChat
        if let token = m.deviceToken {
            registerToken(token: token)
        }
@@ -1370,6 +1304,18 @@ func processReceivedMsg(_ res: ChatResponse) async {
    let m = ChatModel.shared
    logger.debug("processReceivedMsg: \(res.responseType)")
    switch res {
+    case let .newContactConnection(user, connection):
+        if active(user) {
+            await MainActor.run {
+                m.updateContactConnection(connection)
+            }
+        }
+    case let .contactConnectionDeleted(user, connection):
+        if active(user) {
+            await MainActor.run {
+                m.removeChat(connection.id)
+            }
+        }
    case let .contactDeletedByContact(user, contact):
        if active(user) && contact.directOrUsed {
            await MainActor.run {
@@ -1380,10 +1326,8 @@ func processReceivedMsg(_ res: ChatResponse) async {
        if active(user) && contact.directOrUsed {
            await MainActor.run {
                m.updateContact(contact)
-                if let conn = contact.activeConn {
-                    m.dismissConnReqView(conn.id)
-                    m.removeChat(conn.id)
-                }
+                m.dismissConnReqView(contact.activeConn.id)
+                m.removeChat(contact.activeConn.id)
            }
        }
        if contact.directOrUsed {
@@ -1396,10 +1340,8 @@ func processReceivedMsg(_ res: ChatResponse) async {
        if active(user) && contact.directOrUsed {
            await MainActor.run {
                m.updateContact(contact)
-                if let conn = contact.activeConn {
-                    m.dismissConnReqView(conn.id)
-                    m.removeChat(conn.id)
-                }
+                m.dismissConnReqView(contact.activeConn.id)
+                m.removeChat(contact.activeConn.id)
            }
        }
    case let .receivedContactRequest(user, contactRequest):
@@ -1538,9 +1480,9 @@ func processReceivedMsg(_ res: ChatResponse) async {

        await MainActor.run {
            m.updateGroup(groupInfo)
-            if let conn = hostContact?.activeConn {
-                m.dismissConnReqView(conn.id)
-                m.removeChat(conn.id)
+            if let hostContact = hostContact {
+                m.dismissConnReqView(hostContact.activeConn.id)
+                m.removeChat(hostContact.activeConn.id)
            }
        }
    case let .groupLinkConnecting(user, groupInfo, hostMember):
@@ -1662,40 +1604,36 @@ func processReceivedMsg(_ res: ChatResponse) async {
        activateCall(invitation)
    case let .callOffer(_, contact, callType, offer, sharedKey, _):
        await withCall(contact) { call in
-            await MainActor.run {
-                call.callState = .offerReceived
-                call.peerMedia = callType.media
-                call.sharedKey = sharedKey
-            }
+            call.callState = .offerReceived
+            call.peerMedia = callType.media
+            call.sharedKey = sharedKey
            let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
            let iceServers = getIceServers()
            logger.debug(".callOffer useRelay \(useRelay)")
            logger.debug(".callOffer iceServers \(String(describing: iceServers))")
-            await m.callCommand.processCommand(.offer(
+            m.callCommand = .offer(
                offer: offer.rtcSession,
                iceCandidates: offer.rtcIceCandidates,
                media: callType.media, aesKey: sharedKey,
                iceServers: iceServers,
                relay: useRelay
-            ))
+            )
        }
    case let .callAnswer(_, contact, answer):
        await withCall(contact) { call in
-            await MainActor.run {
-                call.callState = .answerReceived
-            }
-            await m.callCommand.processCommand(.answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates))
+            call.callState = .answerReceived
+            m.callCommand = .answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates)
        }
    case let .callExtraInfo(_, contact, extraInfo):
        await withCall(contact) { _ in
-            await m.callCommand.processCommand(.ice(iceCandidates: extraInfo.rtcIceCandidates))
+            m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
        }
    case let .callEnded(_, contact):
        if let invitation = await MainActor.run(body: { m.callInvitations.removeValue(forKey: contact.id) }) {
            CallController.shared.reportCallRemoteEnded(invitation: invitation)
        }
        await withCall(contact) { call in
-            await m.callCommand.processCommand(.end)
+            m.callCommand = .end
            CallController.shared.reportCallRemoteEnded(call: call)
        }
    case .chatSuspended:
@@ -1716,67 +1654,19 @@ func processReceivedMsg(_ res: ChatResponse) async {
        await MainActor.run {
            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
        }
-    case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible):
-        await MainActor.run {
-            if let sess = m.remoteCtrlSession, case .searching = sess.sessionState {
-                let state = UIRemoteCtrlSessionState.found(remoteCtrl: remoteCtrl, compatible: compatible)
-                m.remoteCtrlSession = RemoteCtrlSession(
-                    ctrlAppInfo: ctrlAppInfo_,
-                    appVersion: appVersion,
-                    sessionState: state
-                )
-            }
-        }
-    case let .remoteCtrlSessionCode(remoteCtrl_, sessionCode):
-        await MainActor.run {
-            let state = UIRemoteCtrlSessionState.pendingConfirmation(remoteCtrl_: remoteCtrl_, sessionCode: sessionCode)
-            m.remoteCtrlSession = m.remoteCtrlSession?.updateState(state)
-        }
-    case let .remoteCtrlConnected(remoteCtrl):
-        // TODO currently it is returned in response to command, so it is redundant
-        await MainActor.run {
-            let state = UIRemoteCtrlSessionState.connected(remoteCtrl: remoteCtrl, sessionCode: m.remoteCtrlSession?.sessionCode ?? "")
-            m.remoteCtrlSession = m.remoteCtrlSession?.updateState(state)
-        }
-    case .remoteCtrlStopped:
-        // This delay is needed to cancel the session that fails on network failure,
-        // e.g. when user did not grant permission to access local network yet.
-        if let sess = m.remoteCtrlSession {
-            await MainActor.run {
-                m.remoteCtrlSession = nil
-            }
-            if case .connected = sess.sessionState {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                    switchToLocalSession()
-                }
-            }
-        }
    default:
        logger.debug("unsupported event: \(res.responseType)")
    }

-    func withCall(_ contact: Contact, _ perform: (Call) async -> Void) async {
+    func withCall(_ contact: Contact, _ perform: (Call) -> Void) async {
        if let call = m.activeCall, call.contact.apiId == contact.apiId {
-            await perform(call)
+            await MainActor.run { perform(call) }
        } else {
            logger.debug("processReceivedMsg: ignoring \(res.responseType), not in call with the contact \(contact.id)")
        }
    }
 }

-func switchToLocalSession() {
-    let m = ChatModel.shared
-    m.remoteCtrlSession = nil
-    do {
-        m.users = try listUsers()
-        try getUserChatData()
-        let statuses = (try apiGetNetworkStatuses()).map { s in (s.agentConnId, s.networkStatus) }
-        m.networkStatuses = Dictionary(uniqueKeysWithValues: statuses)
-    } catch let error {
-        logger.debug("error updating chat data: \(responseError(error))")
-    }
-}
-
 func active(_ user: any UserLike) -> Bool {
    user.userId == ChatModel.shared.currentUser?.id
 }
@@ -9,30 +9,27 @@
 import Foundation
 import UIKit
 import SimpleXChat
-import SwiftUI

 private let suspendLockQueue = DispatchQueue(label: "chat.simplex.app.suspend.lock")

+let appSuspendTimeout: Int = 15 // seconds
+
 let bgSuspendTimeout: Int = 5 // seconds

 let terminationTimeout: Int = 3 // seconds

-let activationDelay: TimeInterval = 1.5
-
-let nseSuspendTimeout: TimeInterval = 5
-
 private func _suspendChat(timeout: Int) {
    // this is a redundant check to prevent logical errors, like the one fixed in this PR
-    let state = AppChatState.shared.value
+    let state = appStateGroupDefault.get()
    if !state.canSuspend {
-        logger.error("_suspendChat called, current state: \(state.rawValue)")
+        logger.error("_suspendChat called, current state: \(state.rawValue, privacy: .public)")
    } else if ChatModel.ok {
-        AppChatState.shared.set(.suspending)
+        appStateGroupDefault.set(.suspending)
        apiSuspendChat(timeoutMicroseconds: timeout * 1000000)
        let endTask = beginBGTask(chatSuspended)
        DispatchQueue.global().asyncAfter(deadline: .now() + Double(timeout) + 1, execute: endTask)
    } else {
-        AppChatState.shared.set(.suspended)
+        appStateGroupDefault.set(.suspended)
    }
 }

@@ -44,16 +41,18 @@ func suspendChat() {

 func suspendBgRefresh() {
    suspendLockQueue.sync {
-        if case .bgRefresh = AppChatState.shared.value  {
+        if case .bgRefresh = appStateGroupDefault.get()  {
            _suspendChat(timeout: bgSuspendTimeout)
        }
    }
 }

+private var terminating = false
+
 func terminateChat() {
    logger.debug("terminateChat")
    suspendLockQueue.sync {
-        switch AppChatState.shared.value {
+        switch appStateGroupDefault.get() {
        case .suspending:
            // suspend instantly if already suspending
            _chatSuspended()
@@ -65,6 +64,7 @@ func terminateChat() {
        case .stopped:
            chatCloseStore()
        default:
+            terminating = true
            // the store will be closed in _chatSuspended when event is received
            _suspendChat(timeout: terminationTimeout)
        }
@@ -73,7 +73,7 @@ func terminateChat() {

 func chatSuspended() {
    suspendLockQueue.sync {
-        if case .suspending = AppChatState.shared.value {
+        if case .suspending = appStateGroupDefault.get() {
            _chatSuspended()
        }
    }
@@ -81,121 +81,48 @@ func chatSuspended() {

 private func _chatSuspended() {
    logger.debug("_chatSuspended")
-    AppChatState.shared.set(.suspended)
+    appStateGroupDefault.set(.suspended)
    if ChatModel.shared.chatRunning == true {
        ChatReceiver.shared.stop()
    }
-    chatCloseStore()
-}
-
-func setAppState(_ appState: AppState) {
-    suspendLockQueue.sync {
-        AppChatState.shared.set(appState)
+    if terminating {
+         chatCloseStore()
    }
 }

 func activateChat(appState: AppState = .active) {
    logger.debug("DEBUGGING: activateChat")
+    terminating = false
    suspendLockQueue.sync {
-        AppChatState.shared.set(appState)
+        appStateGroupDefault.set(appState)
        if ChatModel.ok { apiActivateChat() }
        logger.debug("DEBUGGING: activateChat: after apiActivateChat")
    }
 }

 func initChatAndMigrate(refreshInvitations: Bool = true) {
+    terminating = false
    let m = ChatModel.shared
    if (!m.chatInitialized) {
-        m.v3DBMigration = v3DBMigrationDefault.get()
-        if AppChatState.shared.value == .stopped {
-            AlertManager.shared.showAlert(Alert(
-                title: Text("Start chat?"),
-                message: Text("Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat."),
-                primaryButton: .default(Text("Ok")) {
-                    AppChatState.shared.set(.active)
-                    initialize(start: true)
-                },
-                secondaryButton: .cancel {
-                    initialize(start: false)
-                }
-            ))
-        } else {
-            initialize(start: true)
-        }
-    }
-
-    func initialize(start: Bool) {
        do {
-            try initializeChat(start: m.v3DBMigration.startChat && start, refreshInvitations: refreshInvitations)
+            m.v3DBMigration = v3DBMigrationDefault.get()
+            try initializeChat(start: m.v3DBMigration.startChat, refreshInvitations: refreshInvitations)
        } catch let error {
-            AlertManager.shared.showAlertMsg(
-                title: start ? "Error starting chat" : "Error opening chat",
-                message: "Please contact developers.\nError: \(responseError(error))"
-            )
+            fatalError("Failed to start or load chats: \(responseError(error))")
        }
    }
 }

-func startChatForCall() {
-    logger.debug("DEBUGGING: startChatForCall")
-    if ChatModel.shared.chatRunning == true {
-        ChatReceiver.shared.start()
-        logger.debug("DEBUGGING: startChatForCall: after ChatReceiver.shared.start")
-    }
-    if .active != AppChatState.shared.value {
-        logger.debug("DEBUGGING: startChatForCall: before activateChat")
-        activateChat()
-        logger.debug("DEBUGGING: startChatForCall: after activateChat")
-    }
-}
-
-func startChatAndActivate(_ completion: @escaping () -> Void) {
+func startChatAndActivate() {
+    terminating = false
    logger.debug("DEBUGGING: startChatAndActivate")
    if ChatModel.shared.chatRunning == true {
        ChatReceiver.shared.start()
        logger.debug("DEBUGGING: startChatAndActivate: after ChatReceiver.shared.start")
    }
-    if case .active = AppChatState.shared.value {
-        completion()
-    } else if nseStateGroupDefault.get().inactive {
-        activate()
-    } else {
-        // setting app state to "activating" to notify NSE that it should suspend
-        setAppState(.activating)
-        waitNSESuspended(timeout: nseSuspendTimeout) { ok in
-            if !ok {
-                // if for some reason NSE failed to suspend,
-                // e.g., it crashed previously without setting its state to "suspended",
-                // set it to "suspended" state anyway, so that next time app
-                // does not have to wait when activating.
-                nseStateGroupDefault.set(.suspended)
-            }
-            if AppChatState.shared.value == .activating {
-                activate()
-            }
-        }
-    }
-
-    func activate() {
+    if .active != appStateGroupDefault.get()  {
        logger.debug("DEBUGGING: startChatAndActivate: before activateChat")
        activateChat()
-        completion()
        logger.debug("DEBUGGING: startChatAndActivate: after activateChat")
    }
 }
-
-// appStateGroupDefault must not be used in the app directly, only via this singleton
-class AppChatState {
-    static let shared = AppChatState()
-    private var value_ = appStateGroupDefault.get()
-
-    var value: AppState {
-        value_
-    }
-
-    func set(_ state: AppState) {
-        appStateGroupDefault.set(state)
-        sendAppState(state)
-        value_ = state
-    }
-}
@@ -16,15 +16,17 @@ struct SimpleXApp: App {
    @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
    @StateObject private var chatModel = ChatModel.shared
    @ObservedObject var alertManager = AlertManager.shared
-
    @Environment(\.scenePhase) var scenePhase
-    @State private var enteredBackgroundAuthenticated: TimeInterval? = nil
+    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
+    @State private var userAuthorized: Bool?
+    @State private var doAuthenticate = false
+    @State private var enteredBackground: TimeInterval? = nil
+    @State private var canConnectCall = false
+    @State private var lastSuccessfulUnlock: TimeInterval? = nil
+    @State private var showInitializationView = false

    init() {
-        DispatchQueue.global(qos: .background).sync {
-            haskell_init()
-//            hs_init(0, nil)
-        }
+        hs_init(0, nil)
        UserDefaults.standard.register(defaults: appDefaults)
        setGroupDefaults()
        registerGroupDefaults()
@@ -34,17 +36,22 @@ struct SimpleXApp: App {
    }

    var body: some Scene {
-        WindowGroup {
-            // contentAccessAuthenticationExtended has to be passed to ContentView on view initialization,
-            // so that it's computed by the time view renders, and not on event after rendering
-            ContentView(contentAccessAuthenticationExtended: !authenticationExpired())
+        return WindowGroup {
+            ContentView(
+                doAuthenticate: $doAuthenticate,
+                userAuthorized: $userAuthorized,
+                canConnectCall: $canConnectCall,
+                lastSuccessfulUnlock: $lastSuccessfulUnlock,
+                showInitializationView: $showInitializationView
+            )
                .environmentObject(chatModel)
                .onOpenURL { url in
                    logger.debug("ContentView.onOpenURL: \(url)")
                    chatModel.appOpenUrl = url
                }
                .onAppear() {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
+                    showInitializationView = true
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                        initChatAndMigrate()
                    }
                }
@@ -52,35 +59,30 @@ struct SimpleXApp: App {
                    logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
                    switch (phase) {
                    case .background:
-                        // --- authentication
-                        // see ContentView .onChange(of: scenePhase) for remaining authentication logic
-                        if chatModel.contentViewAccessAuthenticated {
-                            enteredBackgroundAuthenticated = ProcessInfo.processInfo.systemUptime
-                        }
-                        chatModel.contentViewAccessAuthenticated = false
-                        // authentication ---
-
                        if CallController.useCallKit() && chatModel.activeCall != nil {
                            CallController.shared.shouldSuspendChat = true
                        } else {
                            suspendChat()
                            BGManager.shared.schedule()
                        }
+                        if userAuthorized == true {
+                            enteredBackground = ProcessInfo.processInfo.systemUptime
+                        }
+                        doAuthenticate = false
+                        canConnectCall = false
                        NtfManager.shared.setNtfBadgeCount(chatModel.totalUnreadCountForAllUsers())
                    case .active:
                        CallController.shared.shouldSuspendChat = false
-                        let appState = AppChatState.shared.value
-
-                        if appState != .stopped {
-                            startChatAndActivate {
-                                if appState.inactive && chatModel.chatRunning == true {
-                                    updateChats()
-                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                        updateCallInvitations()
-                                    }
-                                }
+                        let appState = appStateGroupDefault.get()
+                        startChatAndActivate()
+                        if appState.inactive && chatModel.chatRunning == true {
+                            updateChats()
+                            if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                updateCallInvitations()
                            }
                        }
+                        doAuthenticate = authenticationExpired()
+                        canConnectCall = !(doAuthenticate && prefPerformLA) || unlockedRecently()
                    default:
                        break
                    }
@@ -98,12 +100,12 @@ struct SimpleXApp: App {
        if legacyDatabase, case .documents = dbContainerGroupDefault.get() {
            dbContainerGroupDefault.set(.documents)
            setMigrationState(.offer)
-            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath())*.db")
+            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath(), privacy: .public)*.db")
        } else {
            dbContainerGroupDefault.set(.group)
            setMigrationState(.ready)
-            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath())*.db")
-            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not") present")
+            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath(), privacy: .public)*.db")
+            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not", privacy: .public) present")
        }
    }

@@ -113,14 +115,22 @@ struct SimpleXApp: App {
    }

    private func authenticationExpired() -> Bool {
-        if let enteredBackgroundAuthenticated = enteredBackgroundAuthenticated {
+        if let enteredBackground = enteredBackground {
            let delay = Double(UserDefaults.standard.integer(forKey: DEFAULT_LA_LOCK_DELAY))
-            return ProcessInfo.processInfo.systemUptime - enteredBackgroundAuthenticated >= delay
+            return ProcessInfo.processInfo.systemUptime - enteredBackground >= delay
        } else {
            return true
        }
    }

+    private func unlockedRecently() -> Bool {
+        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
+            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
+        } else {
+            return false
+        }
+    }
+
    private func updateChats() {
        do {
            let chats = try apiGetChats()
@@ -38,21 +38,19 @@ struct ActiveCallView: View {
            }
        }
        .onAppear {
-            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase)), canConnectCall \(canConnectCall)")
-            AppDelegate.keepScreenOn(true)
+            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase), privacy: .public), canConnectCall \(canConnectCall)")
            createWebRTCClient()
            dismissAllSheets()
        }
        .onChange(of: canConnectCall) { _ in
-            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall)")
+            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall, privacy: .public)")
            createWebRTCClient()
        }
        .onDisappear {
            logger.debug("ActiveCallView: disappear")
-            Task { await m.callCommand.setClient(nil) }
-            AppDelegate.keepScreenOn(false)
            client?.endCall()
        }
+        .onChange(of: m.callCommand) { _ in sendCommandToClient()}
        .background(.black)
        .preferredColorScheme(.dark)
    }
@@ -60,8 +58,19 @@ struct ActiveCallView: View {
    private func createWebRTCClient() {
        if client == nil && canConnectCall {
            client = WebRTCClient($activeCall, { msg in await MainActor.run { processRtcMessage(msg: msg) } }, $localRendererAspectRatio)
+            sendCommandToClient()
+        }
+    }
+
+    private func sendCommandToClient() {
+        if call == m.activeCall,
+           m.activeCall != nil,
+           let client = client,
+           let cmd = m.callCommand {
+            m.callCommand = nil
+            logger.debug("sendCallCommand: \(cmd.cmdType)")
            Task {
-                await m.callCommand.setClient(client)
+                await client.sendCallCommand(command: cmd)
            }
        }
    }
@@ -157,10 +166,8 @@ struct ActiveCallView: View {
                }
            case let .error(message):
                logger.debug("ActiveCallView: command error: \(message)")
-                AlertManager.shared.showAlert(Alert(title: Text("Error"), message: Text(message)))
            case let .invalid(type):
                logger.debug("ActiveCallView: invalid response: \(type)")
-                AlertManager.shared.showAlert(Alert(title: Text("Invalid response"), message: Text(type)))
            }
        }
    }
@@ -246,6 +253,7 @@ struct ActiveCallOverlay: View {
                HStack {
                    Text(call.encryptionStatus)
                    if let connInfo = call.connectionInfo {
+//                        Text("(") + Text(connInfo.text) + Text(", \(connInfo.protocolText))")
                        Text("(") + Text(connInfo.text) + Text(")")
                    }
                }
@@ -130,7 +130,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
            // The delay allows to accept the second call before suspending a chat
            // see `.onChange(of: scenePhase)` in SimpleXApp
            DispatchQueue.main.asyncAfter(deadline: .now() + 3) { [weak self] in
-                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat))")
+                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat), privacy: .public)")
                if ChatModel.shared.activeCall == nil && self?.shouldSuspendChat == true {
                    self?.shouldSuspendChat = false
                    suspendChat()
@@ -142,46 +142,33 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse

    @objc(pushRegistry:didUpdatePushCredentials:forType:)
    func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
-        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue)")
+        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue, privacy: .public)")
    }

    func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
-        logger.debug("CallController: did receive push with type \(type.rawValue)")
+        logger.debug("CallController: did receive push with type \(type.rawValue, privacy: .public)")
        if type != .voIP {
            completion()
            return
        }
-        if AppChatState.shared.value == .stopped {
-            self.reportExpiredCall(payload: payload, completion)
-            return
-        }
+        logger.debug("CallController: initializing chat")
        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
-            }
+            initChatAndMigrate(refreshInvitations: false)
        }
-        logger.debug("CallController: initialized chat")
-        startChatForCall()
-        logger.debug("CallController: started chat")
-        self.shouldSuspendChat = true
+        startChatAndActivate()
+        shouldSuspendChat = true
        // There are no invitations in the model, as it was processed by NSE
        _ = try? justRefreshCallInvitations()
-        logger.debug("CallController: updated call invitations chat")
        // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
        // Extract the call information from the push notification payload
        let m = ChatModel.shared
        if let contactId = payload.dictionaryPayload["contactId"] as? String,
           let invitation = m.callInvitations[contactId] {
-            let update = self.cxCallUpdate(invitation: invitation)
+            let update = 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
+                let update = cxCallUpdate(invitation: invitation)
+                provider.reportNewIncomingCall(with: uuid, update: update) { error in
                    if error != nil {
                        m.callInvitations.removeValue(forKey: contactId)
                    }
@@ -189,10 +176,10 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                    completion()
                }
            } else {
-                self.reportExpiredCall(update: update, completion)
+                reportExpiredCall(update: update, completion)
            }
        } else {
-            self.reportExpiredCall(payload: payload, completion)
+            reportExpiredCall(payload: payload, completion)
        }
    }

@@ -223,7 +210,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
    }

    func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID))")
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID), privacy: .public)")
        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
            if invitation.callTs.timeIntervalSinceNow >= -180 {
                let update = cxCallUpdate(invitation: invitation)
@@ -363,7 +350,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
    private func requestTransaction(with action: CXAction, onSuccess: @escaping () -> Void = {}) {
        controller.request(CXTransaction(action: action)) { error in
            if let error = error {
-                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription)")
+                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription, privacy: .public)")
            } else {
                logger.debug("CallController.requestTransaction requested transaction successfully")
                onSuccess()
@@ -22,7 +22,7 @@ class CallManager {
        let m = ChatModel.shared
        if let call = m.activeCall, call.callkitUUID == callUUID {
            m.showCallView = true
-            Task { await m.callCommand.processCommand(.capabilities(media: call.localMedia)) }
+            m.callCommand = .capabilities(media: call.localMedia)
            return true
        }
        return false
@@ -57,21 +57,19 @@ class CallManager {
            m.activeCall = call
            m.showCallView = true

-            Task {
-                await m.callCommand.processCommand(.start(
+            m.callCommand = .start(
                media: invitation.callType.media,
                aesKey: invitation.sharedKey,
                iceServers: iceServers,
                relay: useRelay
-                ))
-            }
+            )
        }
    }

    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)) }
+            m.callCommand = .media(media: media, enable: enable)
            return true
        }
        return false
@@ -96,13 +94,11 @@ class CallManager {
            completed()
        } else {
            logger.debug("CallManager.endCall: ending call...")
+            m.callCommand = .end
+            m.activeCall = nil
+            m.showCallView = false
+            completed()
            Task {
-                await m.callCommand.processCommand(.end)
-                await MainActor.run {
-                    m.activeCall = nil
-                    m.showCallView = false
-                    completed()
-                }
                do {
                    try await apiEndCall(call.contact)
                } catch {
@@ -335,50 +335,6 @@ extension WCallResponse: Encodable {
    }
 }

-actor WebRTCCommandProcessor {
-    private var client: WebRTCClient? = nil
-    private var commands: [WCallCommand] = []
-    private var running: Bool = false
-
-    func setClient(_ client: WebRTCClient?) async {
-        logger.debug("WebRTC: setClient, commands count \(self.commands.count)")
-        self.client = client
-        if client != nil {
-            await processAllCommands()
-        } else {
-            commands.removeAll()
-        }
-    }
-
-    func processCommand(_ c: WCallCommand) async {
-//        logger.debug("WebRTC: process command \(c.cmdType)")
-        commands.append(c)
-        if !running && client != nil {
-            await processAllCommands()
-        }
-    }
-
-    func processAllCommands() async {
-        logger.debug("WebRTC: process all commands, commands count \(self.commands.count), client == nil \(self.client == nil)")
-        if let client = client {
-            running = true
-            while let c = commands.first, shouldRunCommand(client, c) {
-                commands.remove(at: 0)
-                await client.sendCallCommand(command: c)
-                logger.debug("WebRTC: processed cmd \(c.cmdType)")
-            }
-            running = false
-        }
-    }
-
-    func shouldRunCommand(_ client: WebRTCClient, _ c: WCallCommand) -> Bool {
-        switch c {
-        case .capabilities, .start, .offer, .end: true
-        default: client.activeCall.wrappedValue != nil
-        }
-    }
-}
-
 struct ConnectionState: Codable, Equatable {
    var connectionState: String
    var iceConnectionState: String
@@ -402,12 +358,26 @@ struct ConnectionInfo: Codable, Equatable {
            return "\(local?.rawValue ?? unknown) / \(remote?.rawValue ?? unknown)"
        }
    }
+
+    var protocolText: String {
+        let unknown = NSLocalizedString("unknown", comment: "connection info")
+        let local = localCandidate?.protocol?.uppercased() ?? unknown
+        let localRelay = localCandidate?.relayProtocol?.uppercased() ?? unknown
+        let remote = remoteCandidate?.protocol?.uppercased() ?? unknown
+        let localText = localRelay == local || localCandidate?.relayProtocol == nil
+                        ? local
+                        : "\(local) (\(localRelay))"
+        return local == remote
+                ? localText
+                : "\(localText) / \(remote)"
+    }
 }

 // https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate
 struct RTCIceCandidate: Codable, Equatable {
    var candidateType: RTCIceCandidateType?
    var `protocol`: String?
+    var relayProtocol: String?
    var sdpMid: String?
    var sdpMLineIndex: Int?
    var candidate: String
@@ -18,11 +18,10 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    }()
    private static let ivTagBytes: Int = 28
    private static let enableEncryption: Bool = true
-    private var chat_ctrl = getChatCtrl()

    struct Call {
        var connection: RTCPeerConnection
-        var iceCandidates: IceCandidates
+        var iceCandidates: [RTCIceCandidate]
        var localMedia: CallMediaType
        var localCamera: RTCVideoCapturer?
        var localVideoSource: RTCVideoSource?
@@ -34,24 +33,10 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        var frameDecryptor: RTCFrameDecryptor?
    }

-    actor IceCandidates {
-        private var candidates: [RTCIceCandidate] = []
-
-        func getAndClear() async -> [RTCIceCandidate] {
-            let cs = candidates
-            candidates = []
-            return cs
-        }
-
-        func append(_ c: RTCIceCandidate) async {
-            candidates.append(c)
-        }
-    }
-
    private let rtcAudioSession =  RTCAudioSession.sharedInstance()
    private let audioQueue = DispatchQueue(label: "audio")
    private var sendCallResponse: (WVAPIMessage) async -> Void
-    var activeCall: Binding<Call?>
+    private var activeCall: Binding<Call?>
    private var localRendererAspectRatio: Binding<CGFloat?>

    @available(*, unavailable)
@@ -75,7 +60,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
    ]

-    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
+    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ remoteIceCandidates: [RTCIceCandidate], _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
        let connection = createPeerConnection(iceServers ?? getWebRTCIceServers() ?? defaultIceServers, relay)
        connection.delegate = self
        createAudioSender(connection)
@@ -102,7 +87,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        }
        return Call(
            connection: connection,
-            iceCandidates: IceCandidates(),
+            iceCandidates: remoteIceCandidates,
            localMedia: mediaType,
            localCamera: localCamera,
            localVideoSource: localVideoSource,
@@ -159,18 +144,26 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
            logger.debug("starting incoming call - create webrtc session")
            if activeCall.wrappedValue != nil { endCall() }
            let encryption = WebRTCClient.enableEncryption
-            let call = initializeCall(iceServers?.toWebRTCIceServers(), media, encryption ? aesKey : nil, relay)
+            let call = initializeCall(iceServers?.toWebRTCIceServers(), [], media, encryption ? aesKey : nil, relay)
            activeCall.wrappedValue = call
-            let (offer, error) = await call.connection.offer()
-            if let offer = offer {
-                resp = .offer(
-                    offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: offer.type.toSdpType(), sdp: offer.sdp))),
-                    iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates())),
-                    capabilities: CallCapabilities(encryption: encryption)
-                )
-                self.waitForMoreIceCandidates()
-            } else {
-                resp = .error(message: "offer error: \(error?.localizedDescription ?? "unknown error")")
+            call.connection.offer { answer in
+                Task {
+                    let gotCandidates = await self.waitWithTimeout(10_000, stepMs: 1000, until: { self.activeCall.wrappedValue?.iceCandidates.count ?? 0 > 0 })
+                    if gotCandidates {
+                        await self.sendCallResponse(.init(
+                            corrId: nil,
+                            resp: .offer(
+                                offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
+                                iceCandidates: compressToBase64(input: encodeJSON(self.activeCall.wrappedValue?.iceCandidates ?? [])),
+                                capabilities: CallCapabilities(encryption: encryption)
+                            ),
+                            command: command)
+                        )
+                    } else {
+                        self.endCall()
+                    }
+                }
+
            }
        case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay):
            if activeCall.wrappedValue != nil {
@@ -179,21 +172,26 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                resp = .error(message: "accept: encryption is not supported")
            } else if let offer: CustomRTCSessionDescription = decodeJSON(decompressFromBase64(input: offer)),
                      let remoteIceCandidates: [RTCIceCandidate] = decodeJSON(decompressFromBase64(input: iceCandidates)) {
-                let call = initializeCall(iceServers?.toWebRTCIceServers(), media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
+                let call = initializeCall(iceServers?.toWebRTCIceServers(), remoteIceCandidates, media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
                activeCall.wrappedValue = call
                let pc = call.connection
                if let type = offer.type, let sdp = offer.sdp {
                    if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
-                        let (answer, error) = await pc.answer()
-                        if let answer = answer {
+                        pc.answer { answer in
                            self.addIceCandidates(pc, remoteIceCandidates)
-                            resp = .answer(
-                                answer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
-                                iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates()))
-                            )
-                            self.waitForMoreIceCandidates()
-                        } else {
-                            resp = .error(message: "answer error: \(error?.localizedDescription ?? "unknown error")")
+//                            Task {
+//                                try? await Task.sleep(nanoseconds: 32_000 * 1000000)
+                            Task {
+                                await self.sendCallResponse(.init(
+                                    corrId: nil,
+                                    resp: .answer(
+                                        answer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
+                                        iceCandidates: compressToBase64(input: encodeJSON(call.iceCandidates))
+                                    ),
+                                    command: command)
+                                )
+                            }
+//                            }
                        }
                    } else {
                        resp = .error(message: "accept: remote description is not set")
@@ -236,7 +234,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                resp = .ok
            }
        case .end:
-            // TODO possibly, endCall should be called before returning .ok
            await sendCallResponse(.init(corrId: nil, resp: .ok, command: command))
            endCall()
        }
@@ -245,33 +242,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        }
    }

-    func getInitialIceCandidates() async -> [RTCIceCandidate] {
-        await untilIceComplete(timeoutMs: 750, stepMs: 150) {}
-        let candidates = await activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
-        logger.debug("WebRTCClient: sending initial ice candidates: \(candidates.count)")
-        return candidates
-    }
-
-    func waitForMoreIceCandidates() {
-        Task {
-            await untilIceComplete(timeoutMs: 12000, stepMs: 1500) {
-                let candidates = await self.activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
-                if candidates.count > 0 {
-                    logger.debug("WebRTCClient: sending more ice candidates: \(candidates.count)")
-                    await self.sendIceCandidates(candidates)
-                }
-            }
-        }
-    }
-
-    func sendIceCandidates(_ candidates: [RTCIceCandidate]) async {
-        await self.sendCallResponse(.init(
-            corrId: nil,
-            resp: .ice(iceCandidates: compressToBase64(input: encodeJSON(candidates))),
-            command: nil)
-        )
-    }
-
    func enableMedia(_ media: CallMediaType, _ enable: Bool) {
        logger.debug("WebRTCClient: enabling media \(media.rawValue) \(enable)")
        media == .video ? setVideoEnabled(enable) : setAudioEnabled(enable)
@@ -309,7 +279,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
            memcpy(pointer, (unencrypted as NSData).bytes, unencrypted.count)
            let isKeyFrame = unencrypted[0] & 1 == 0
            let clearTextBytesSize = mediaType.rawValue == 0 ? 1 : isKeyFrame ? 10 : 3
-            logCrypto("encrypt", chat_encrypt_media(chat_ctrl, &key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
+            logCrypto("encrypt", chat_encrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
            return Data(bytes: pointer, count: unencrypted.count + WebRTCClient.ivTagBytes)
        } else {
            return nil
@@ -417,13 +387,12 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        audioSessionToDefaults()
    }

-    func untilIceComplete(timeoutMs: UInt64, stepMs: UInt64, action: @escaping () async -> Void) async {
-        var t: UInt64 = 0
-        repeat {
-            _ = try? await Task.sleep(nanoseconds: stepMs * 1000000)
-            t += stepMs
-            await action()
-        } while t < timeoutMs && activeCall.wrappedValue?.connection.iceGatheringState != .complete
+    func waitWithTimeout(_ timeoutMs: UInt64, stepMs: UInt64, until success: () -> Bool) async -> Bool {
+        let startedAt = DispatchTime.now()
+        while !success() && startedAt.uptimeNanoseconds + timeoutMs * 1000000 > DispatchTime.now().uptimeNanoseconds {
+            guard let _ = try? await Task.sleep(nanoseconds: stepMs * 1000000) else { break }
+        }
+        return success()
    }
 }

@@ -436,33 +405,25 @@ extension WebRTC.RTCPeerConnection {
            optionalConstraints: nil)
    }

-    func offer() async -> (RTCSessionDescription?, Error?) {
-        await withCheckedContinuation { cont in
-            offer(for: mediaConstraints()) { (sdp, error) in
-                self.processSDP(cont, sdp, error)
+    func offer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void) {
+        offer(for: mediaConstraints()) { (sdp, error) in
+            guard let sdp = sdp else {
+                return
            }
-        }
-    }
-
-    func answer() async -> (RTCSessionDescription?, Error?)  {
-        await withCheckedContinuation { cont in
-            answer(for: mediaConstraints()) { (sdp, error) in
-                self.processSDP(cont, sdp, error)
-            }
-        }
-    }
-
-    private func processSDP(_ cont: CheckedContinuation<(RTCSessionDescription?, Error?), Never>, _ sdp: RTCSessionDescription?, _ error: Error?) {
-        if let sdp = sdp {
            self.setLocalDescription(sdp, completionHandler: { (error) in
-                if let error = error {
-                    cont.resume(returning: (nil, error))
-                } else {
-                    cont.resume(returning: (sdp, nil))
-                }
+                completion(sdp)
+            })
+        }
+    }
+
+    func answer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void)  {
+        answer(for: mediaConstraints()) { (sdp, error) in
+            guard let sdp = sdp else {
+                return
+            }
+            self.setLocalDescription(sdp, completionHandler: { (error) in
+                completion(sdp)
            })
-        } else {
-            cont.resume(returning: (nil, error))
        }
    }
 }
@@ -518,7 +479,6 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                default: enableSpeaker = false
                }
                setSpeakerEnabledAndConfigureSession(enableSpeaker)
-            case .connected: sendConnectedEvent(connection)
            case .disconnected, .failed: endCall()
            default: do {}
            }
@@ -531,9 +491,7 @@ extension WebRTCClient: RTCPeerConnectionDelegate {

    func peerConnection(_ connection: RTCPeerConnection, didGenerate candidate: WebRTC.RTCIceCandidate) {
 //        logger.debug("Connection generated candidate \(candidate.debugDescription)")
-        Task {
-            await self.activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil))
-        }
+        activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil, nil))
    }

    func peerConnection(_ connection: RTCPeerConnection, didRemove candidates: [WebRTC.RTCIceCandidate]) {
@@ -548,9 +506,10 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                        lastReceivedMs lastDataReceivedMs: Int32,
                        changeReason reason: String) {
 //        logger.debug("Connection changed candidate \(reason) \(remote.debugDescription) \(remote.description)")
+        sendConnectedEvent(connection, local: local, remote: remote)
    }

-    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection) {
+    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection, local: WebRTC.RTCIceCandidate, remote: WebRTC.RTCIceCandidate) {
        connection.statistics { (stats: RTCStatisticsReport) in
            stats.statistics.values.forEach { stat in
 //                logger.debug("Stat \(stat.debugDescription)")
@@ -558,25 +517,24 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                   let localId = stat.values["localCandidateId"] as? String,
                   let remoteId = stat.values["remoteCandidateId"] as? String,
                   let localStats = stats.statistics[localId],
-                   let remoteStats = stats.statistics[remoteId]
+                   let remoteStats = stats.statistics[remoteId],
+                   local.sdp.contains("\((localStats.values["ip"] as? String ?? "--")) \((localStats.values["port"] as? String ?? "--"))") &&
+                   remote.sdp.contains("\((remoteStats.values["ip"] as? String ?? "--")) \((remoteStats.values["port"] as? String ?? "--"))")
                {
                    Task {
                        await self.sendCallResponse(.init(
                            corrId: nil,
                            resp: .connected(connectionInfo: ConnectionInfo(
-                                localCandidate: RTCIceCandidate(
-                                    candidateType: RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
-                                    protocol: localStats.values["protocol"] as? String,
-                                    sdpMid: nil,
-                                    sdpMLineIndex: nil,
-                                    candidate: ""
+                                localCandidate: local.toCandidate(
+                                    RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
+                                    localStats.values["protocol"] as? String,
+                                    localStats.values["relayProtocol"] as? String
                                ),
-                                remoteCandidate: RTCIceCandidate(
-                                    candidateType: RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
-                                    protocol: remoteStats.values["protocol"] as? String,
-                                    sdpMid: nil,
-                                    sdpMLineIndex: nil,
-                                    candidate: ""))),
+                                remoteCandidate: remote.toCandidate(
+                                    RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
+                                    remoteStats.values["protocol"] as? String,
+                                    remoteStats.values["relayProtocol"] as? String
+                                ))),
                            command: nil)
                        )
                    }
@@ -676,10 +634,11 @@ extension RTCIceCandidate {
 }

 extension WebRTC.RTCIceCandidate {
-    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?) -> RTCIceCandidate {
+    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?, _ relayProtocol: String?) -> RTCIceCandidate {
        RTCIceCandidate(
            candidateType: candidateType,
            protocol: `protocol`,
+            relayProtocol: relayProtocol,
            sdpMid: sdpMid,
            sdpMLineIndex: Int(sdpMLineIndex),
            candidate: sdp
@@ -338,7 +338,7 @@ struct ChatInfoView: View {
                verify: { code in
                    if let r = apiVerifyContact(chat.chatInfo.apiId, connectionCode: code) {
                        let (verified, existingCode) = r
-                        contact.activeConn?.connectionCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
+                        contact.activeConn.connectionCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
                        connectionCode = existingCode
                        DispatchQueue.main.async {
                            chat.chatInfo = .direct(contact: contact)
@@ -66,7 +66,7 @@ struct CIRcvDecryptionError: View {

    @ViewBuilder private func viewBody() -> some View {
        if case let .direct(contact) = chat.chatInfo,
-           let contactStats = contact.activeConn?.connectionStats {
+           let contactStats = contact.activeConn.connectionStats {
            if contactStats.ratchetSyncAllowed {
                decryptionErrorItemFixButton(syncSupported: true) {
                    alert = .syncAllowedAlert { syncContactConnection(contact) }
@@ -165,8 +165,6 @@ struct CIRcvDecryptionError: View {
            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
        case .other:
            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
-        case .ratchetSync:
-            message = Text("Encryption re-negotiation failed.")
        }
        return message
    }
@@ -9,7 +9,6 @@
 import SwiftUI
 import AVKit
 import SimpleXChat
-import Combine

 struct CIVideoView: View {
    @EnvironmentObject var m: ChatModel
@@ -29,7 +28,6 @@ struct CIVideoView: View {
    @State private var showFullScreenPlayer = false
    @State private var timeObserver: Any? = nil
    @State private var fullScreenTimeObserver: Any? = nil
-    @State private var publisher: AnyCancellable? = nil

    init(chatItem: ChatItem, image: String, duration: Int, maxWidth: CGFloat, videoWidth: Binding<CGFloat?>, scrollProxy: ScrollViewProxy?) {
        self.chatItem = chatItem
@@ -296,14 +294,6 @@ struct CIVideoView: View {
                    m.stopPreviousRecPlay = url
                    if let player = fullPlayer {
                        player.play()
-                        var played = false
-                        publisher = player.publisher(for: \.timeControlStatus).sink { status in
-                            if played || status == .playing {
-                                AppDelegate.keepScreenOn(status == .playing)
-                                AudioPlayer.changeAudioSession(status == .playing)
-                            }
-                            played = status == .playing
-                        }
                        fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
                            player.seek(to: CMTime.zero)
                            player.play()
@@ -318,7 +308,6 @@ struct CIVideoView: View {
                fullScreenTimeObserver = nil
                fullPlayer?.pause()
                fullPlayer?.seek(to: CMTime.zero)
-                publisher?.cancel()
            }
        }
    }
@@ -114,7 +114,7 @@ struct ChatView: View {
                                    connectionStats = stats
                                    customUserProfile = profile
                                    connectionCode = code
-                                    if contact.activeConn?.connectionCode != ct.activeConn?.connectionCode {
+                                    if contact.activeConn.connectionCode != ct.activeConn.connectionCode {
                                        chat.chatInfo = .direct(contact: ct)
                                    }
                                }
@@ -723,14 +723,9 @@ struct ChatView: View {
                if ci.meta.itemDeleted == nil && !ci.isLiveDummy && !live {
                    menu.append(replyUIAction(ci))
                }
-                let fileSource = getLoadedFileSource(ci.file)
-                let fileExists = if let fs = fileSource, FileManager.default.fileExists(atPath: getAppFilePath(fs.filePath).path) { true } else { false }
-                let copyAndShareAllowed = !ci.content.text.isEmpty || (ci.content.msgContent?.isImage == true && fileExists)
-                if copyAndShareAllowed {
-                    menu.append(shareUIAction(ci))
-                    menu.append(copyUIAction(ci))
-                }
-                if let fileSource = fileSource, fileExists {
+                menu.append(shareUIAction(ci))
+                menu.append(copyUIAction(ci))
+                if let fileSource = getLoadedFileSource(ci.file) {
                    if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                        if image.imageData != nil {
                            menu.append(saveFileAction(fileSource))
@@ -772,7 +767,7 @@ struct ChatView: View {
            } else if ci.isDeletedContent {
                menu.append(viewInfoUIAction(ci))
                menu.append(deleteUIAction(ci))
-            } else if ci.mergeCategory != nil && ((range?.count ?? 0) > 1 || revealed) {
+            } else if ci.mergeCategory != nil {
                menu.append(revealed ? shrinkUIAction() : expandUIAction())
            }
            return menu
@@ -104,7 +104,7 @@ struct ComposeState {

    var sendEnabled: Bool {
        switch preview {
-        case let .mediaPreviews(media): return !media.isEmpty
+        case .mediaPreviews: return true
        case .voicePreview: return voiceMessageRecordingState == .finished
        case .filePreview: return true
        default: return !message.isEmpty || liveMessage != nil
@@ -384,10 +384,10 @@ struct ComposeView: View {
            }
        }
        .sheet(isPresented: $showMediaPicker) {
-            LibraryMediaListPicker(addMedia: addMediaContent, selectionLimit: 10, finishedPreprocessing: finishedPreprocessingMediaContent) { itemsSelected in
-                await MainActor.run {
-                    showMediaPicker = false
-                    if itemsSelected {
+            LibraryMediaListPicker(media: $chosenMedia, selectionLimit: 10) { itemsSelected in
+                showMediaPicker = false
+                if itemsSelected {
+                    DispatchQueue.main.async {
                        composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: []))
                    }
                }
@@ -488,30 +488,6 @@ struct ComposeView: View {
        }
    }

-    private func addMediaContent(_ content: UploadContent) async {
-        if let img = resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
-            var newMedia: [(String, UploadContent?)] = []
-            if case var .mediaPreviews(media) = composeState.preview {
-                media.append((img, content))
-                newMedia = media
-            } else {
-                newMedia = [(img, content)]
-            }
-            await MainActor.run {
-                composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: newMedia))
-            }
-        }
-    }
-
-    // When error occurs while converting video, remove media preview
-    private func finishedPreprocessingMediaContent() {
-        if case let .mediaPreviews(media) = composeState.preview, media.isEmpty {
-            DispatchQueue.main.async {
-                composeState = composeState.copy(preview: .noPreview)
-            }
-        }
-    }
-
    private var maxFileSize: Int64 {
        getMaxFileSize(.xftp)
    }
@@ -157,7 +157,7 @@ struct AddGroupMembersViewCommon: View {
    private func rolePicker() -> some View {
        Picker("New member role", selection: $selectedRole) {
            ForEach(GroupMemberRole.allCases) { role in
-                if role <= groupInfo.membership.memberRole && role != .author {
+                if role <= groupInfo.membership.memberRole {
                    Text(role.text)
                }
            }
@@ -16,6 +16,7 @@ struct GroupChatInfoView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
    @ObservedObject var chat: Chat
    @Binding var groupInfo: GroupInfo
+    @ObservedObject private var alertManager = AlertManager.shared
    @State private var alert: GroupChatInfoViewAlert? = nil
    @State private var groupLink: String?
    @State private var groupLinkMemberRole: GroupMemberRole = .member
@@ -188,19 +188,17 @@ struct GroupMemberInfoView: View {
                        // this condition prevents re-setting picker
                        if !justOpened { return }
                    }
-                    justOpened = false
-                    DispatchQueue.main.async {
-                        newRole = member.memberRole
-                        do {
-                            let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
-                            let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
-                            _ = chatModel.upsertGroupMember(groupInfo, mem)
-                            connectionStats = stats
-                            connectionCode = code
-                        } catch let error {
-                            logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
-                        }
+                    newRole = member.memberRole
+                    do {
+                        let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
+                        let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
+                        _ = chatModel.upsertGroupMember(groupInfo, mem)
+                        connectionStats = stats
+                        connectionCode = code
+                    } catch let error {
+                        logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
                    }
+                    justOpened = false
                }
                .onChange(of: newRole) { newRole in
                    if newRole != member.memberRole {
@@ -103,10 +103,8 @@ struct GroupProfileView: View {
            }
        }
        .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) { _ in
-                await MainActor.run {
-                    showImagePicker = false
-                }
+            LibraryImagePicker(image: $chosenImage) {
+                didSelectItem in showImagePicker = false
            }
        }
        .onChange(of: chosenImage) { image in
@@ -17,7 +17,7 @@ struct ScanCodeView: View {

    var body: some View {
        VStack(alignment: .leading) {
-            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
                .aspectRatio(1, contentMode: .fit)
                .cornerRadius(12)
            Text("Scan security code from your contact's app.")
@@ -33,7 +33,6 @@ struct ChatListNavLink: View {
    @State private var showContactConnectionInfo = false
    @State private var showInvalidJSON = false
    @State private var showDeleteContactActionSheet = false
-    @State private var showConnectContactViaAddressDialog = false
    @State private var inProgress = false
    @State private var progressByTimeout = false

@@ -64,52 +63,32 @@ struct ChatListNavLink: View {
    }

    @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
-        Group {
-            if contact.activeConn == nil && contact.profile.contactLink != nil {
-                ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
-                    .frame(height: rowHeights[dynamicTypeSize])
-                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                        Button {
-                            showDeleteContactActionSheet = true
-                        } label: {
-                            Label("Delete", systemImage: "trash")
-                        }
-                        .tint(.red)
-                    }
-                    .onTapGesture { showConnectContactViaAddressDialog = true }
-                    .confirmationDialog("Connect with \(contact.chatViewName)", isPresented: $showConnectContactViaAddressDialog, titleVisibility: .visible) {
-                        Button("Use current profile") { connectContactViaAddress_(contact, false) }
-                        Button("Use new incognito profile") { connectContactViaAddress_(contact, true) }
-                    }
-            } else {
-                NavLinkPlain(
-                    tag: chat.chatInfo.id,
-                    selection: $chatModel.chatId,
-                    label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
-                )
-                .swipeActions(edge: .leading, allowsFullSwipe: true) {
-                    markReadButton()
-                    toggleFavoriteButton()
-                    toggleNtfsButton(chat)
-                }
-                .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                    if !chat.chatItems.isEmpty {
-                        clearChatButton()
-                    }
-                    Button {
-                        if contact.ready || !contact.active {
-                            showDeleteContactActionSheet = true
-                        } else {
-                            AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
-                        }
-                    } label: {
-                        Label("Delete", systemImage: "trash")
-                    }
-                    .tint(.red)
-                }
-                .frame(height: rowHeights[dynamicTypeSize])
-            }
+        NavLinkPlain(
+            tag: chat.chatInfo.id,
+            selection: $chatModel.chatId,
+            label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
+        )
+        .swipeActions(edge: .leading, allowsFullSwipe: true) {
+            markReadButton()
+            toggleFavoriteButton()
+            toggleNtfsButton(chat)
        }
+        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+            if !chat.chatItems.isEmpty {
+                clearChatButton()
+            }
+            Button {
+                if contact.ready || !contact.active {
+                    showDeleteContactActionSheet = true
+                } else {
+                    AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
+                }
+            } label: {
+                Label("Delete", systemImage: "trash")
+            }
+            .tint(.red)
+        }
+        .frame(height: rowHeights[dynamicTypeSize])
        .actionSheet(isPresented: $showDeleteContactActionSheet) {
            if contact.ready && contact.active {
                return ActionSheet(
@@ -432,17 +411,6 @@ struct ChatListNavLink: View {
                    .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
            }
    }
-
-    private func connectContactViaAddress_(_ contact: Contact, _ incognito: Bool) {
-        Task {
-            let ok = await connectContactViaAddress(contact.contactId, incognito)
-            if ok {
-                await MainActor.run {
-                    chatModel.chatId = contact.id
-                }
-            }
-        }
-    }
 }

 func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection, showError: @escaping (ErrorAlert) -> Void, success: @escaping () -> Void = {}) -> Alert {
@@ -471,21 +439,6 @@ func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection,
    )
 }

-func connectContactViaAddress(_ contactId: Int64, _ incognito: Bool) async -> Bool {
-    let (contact, alert) = await apiConnectContactViaAddress(incognito: incognito, contactId: contactId)
-    if let alert = alert {
-        AlertManager.shared.showAlert(alert)
-        return false
-    } else if let contact = contact {
-        await MainActor.run {
-            ChatModel.shared.updateContact(contact)
-            AlertManager.shared.showAlert(connReqSentAlert(.contact))
-        }
-        return true
-    }
-    return false
-}
-
 func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
    Task {
        logger.debug("joinGroup")
@@ -15,7 +15,6 @@ struct ChatListView: View {
    @State private var searchText = ""
    @State private var showAddChat = false
    @State private var userPickerVisible = false
-    @State private var showConnectDesktop = false
    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false

    var body: some View {
@@ -49,14 +48,7 @@ struct ChatListView: View {
                    }
                }
            }
-            UserPicker(
-                showSettings: $showSettings,
-                showConnectDesktop: $showConnectDesktop,
-                userPickerVisible: $userPickerVisible
-            )
-        }
-        .sheet(isPresented: $showConnectDesktop) {
-            ConnectDesktopView()
+            UserPicker(showSettings: $showSettings, userPickerVisible: $userPickerVisible)
        }
    }

@@ -185,6 +177,13 @@ struct ChatListView: View {
                showAddChat = true
            }

+            connectButton("or chat with the developers") {
+                DispatchQueue.main.async {
+                    UIApplication.shared.open(simplexTeamURL)
+                }
+            }
+            .padding(.top, 10)
+
            Spacer()
            Text("You have no chats")
                .foregroundColor(.secondary)
@@ -190,10 +190,7 @@ struct ChatPreviewView: View {
        } else {
            switch (chat.chatInfo) {
            case let .direct(contact):
-                if contact.activeConn == nil && contact.profile.contactLink != nil {
-                    chatPreviewInfoText("Tap to Connect")
-                        .foregroundColor(.accentColor)
-                } else if !contact.ready && contact.activeConn != nil {
+                if !contact.ready {
                    if contact.nextSendGrpInv {
                        chatPreviewInfoText("send direct message")
                    } else if contact.active {
@@ -241,7 +238,7 @@ struct ChatPreviewView: View {
    @ViewBuilder private func chatStatusImage() -> some View {
        switch chat.chatInfo {
        case let .direct(contact):
-            if contact.active && contact.activeConn != nil {
+            if contact.active {
                switch (chatModel.contactNetworkStatus(contact)) {
                case .connected: incognitoIcon(chat.chatInfo.incognito)
                case .error:
@@ -13,7 +13,6 @@ struct UserPicker: View {
    @EnvironmentObject var m: ChatModel
    @Environment(\.colorScheme) var colorScheme
    @Binding var showSettings: Bool
-    @Binding var showConnectDesktop: Bool
    @Binding var userPickerVisible: Bool
    @State var scrollViewContentSize: CGSize = .zero
    @State var disableScrolling: Bool = true
@@ -63,13 +62,6 @@ struct UserPicker: View {
                .simultaneousGesture(DragGesture(minimumDistance: disableScrolling ? 0 : 10000000))
                .frame(maxHeight: scrollViewContentSize.height)

-                menuButton("Use from desktop", icon: "desktopcomputer") {
-                    showConnectDesktop = true
-                    withAnimation {
-                        userPickerVisible.toggle()
-                    }
-                }
-                Divider()
                menuButton("Settings", icon: "gearshape") {
                    showSettings = true
                    withAnimation {
@@ -93,7 +85,7 @@ struct UserPicker: View {
            do {
                m.users = try listUsers()
            } catch let error {
-                logger.error("Error loading users \(responseError(error))")
+                logger.error("Error updating users \(responseError(error))")
            }
        }
    }
@@ -152,8 +144,7 @@ struct UserPicker: View {
                    .overlay(DetermineWidth())
                Spacer()
                Image(systemName: icon)
-                    .symbolRenderingMode(.monochrome)
-                    .foregroundColor(.secondary)
+//                    .frame(width: 24, alignment: .center)
            }
            .padding(.horizontal)
            .padding(.vertical, 22)
@@ -179,7 +170,6 @@ struct UserPicker_Previews: PreviewProvider {
        m.users = [UserInfo.sampleData, UserInfo.sampleData]
        return UserPicker(
            showSettings: Binding.constant(false),
-            showConnectDesktop: Binding.constant(false),
            userPickerVisible: Binding.constant(true)
        )
        .environmentObject(m)
@@ -415,7 +415,7 @@ struct DatabaseView: View {
                do {
                    try initializeChat(start: true)
                    m.chatDbChanged = false
-                    AppChatState.shared.set(.active)
+                    appStateGroupDefault.set(.active)
                } catch let error {
                    fatalError("Error starting chat \(responseError(error))")
                }
@@ -427,7 +427,7 @@ struct DatabaseView: View {
                m.chatRunning = true
                ChatReceiver.shared.start()
                chatLastStartGroupDefault.set(Date.now)
-                AppChatState.shared.set(.active)
+                appStateGroupDefault.set(.active)
            } catch let error {
                runChat = false
                alert = .error(title: "Error starting chat", error: responseError(error))
@@ -477,7 +477,7 @@ func stopChatAsync() async throws {
    try await apiStopChat()
    ChatReceiver.shared.stop()
    await MainActor.run { ChatModel.shared.chatRunning = false }
-    AppChatState.shared.set(.stopped)
+    appStateGroupDefault.set(.stopped)
 }

 func deleteChatAsync() async throws {
@@ -13,130 +13,112 @@ import SimpleXChat

 struct LibraryImagePicker: View {
    @Binding var image: UIImage?
-    var didFinishPicking: (_ didSelectImage: Bool) async -> Void
-    @State var mediaAdded = false
+    var didFinishPicking: (_ didSelectItems: Bool) -> Void
+    @State var images: [UploadContent] = []

    var body: some View {
-        LibraryMediaListPicker(addMedia: addMedia, selectionLimit: 1, didFinishPicking: didFinishPicking)
-    }
-
-    private func addMedia(_ content: UploadContent) async {
-        if mediaAdded { return }
-        await MainActor.run {
-            mediaAdded = true
-            image = content.uiImage
-        }
+        LibraryMediaListPicker(media: $images, selectionLimit: 1, didFinishPicking: didFinishPicking)
+            .onChange(of: images) { _ in
+                if let img = images.first {
+                    image = img.uiImage
+                }
+            }
    }
 }

 struct LibraryMediaListPicker: UIViewControllerRepresentable {
    typealias UIViewControllerType = PHPickerViewController
-    var addMedia: (_ content: UploadContent) async -> Void
+    @Binding var media: [UploadContent]
    var selectionLimit: Int
-    var finishedPreprocessing: () -> Void = {}
-    var didFinishPicking: (_ didSelectItems: Bool) async -> Void
+    var didFinishPicking: (_ didSelectItems: Bool) -> Void

    class Coordinator: PHPickerViewControllerDelegate {
        let parent: LibraryMediaListPicker
        let dispatchQueue = DispatchQueue(label: "chat.simplex.app.LibraryMediaListPicker")
+        var media: [UploadContent] = []
+        var mediaCount: Int = 0

        init(_ parent: LibraryMediaListPicker) {
            self.parent = parent
        }

        func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
-            Task {
-                await parent.didFinishPicking(!results.isEmpty)
-                if results.isEmpty { return }
-                for r in results {
-                    await loadItem(r.itemProvider)
-                }
-                parent.finishedPreprocessing()
+            parent.didFinishPicking(!results.isEmpty)
+            guard !results.isEmpty else {
+                return
            }
-        }

-        private func loadItem(_ p: NSItemProvider) async {
-            logger.debug("LibraryMediaListPicker result")
-            if p.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
-                if let video = await loadVideo(p) {
-                    await self.parent.addMedia(video)
-                    logger.debug("LibraryMediaListPicker: added video")
-                }
-            } else if p.hasItemConformingToTypeIdentifier(UTType.data.identifier) {
-                if let img = await loadImageData(p) {
-                    await self.parent.addMedia(img)
-                    logger.debug("LibraryMediaListPicker: added image")
-                }
-            } else if p.canLoadObject(ofClass: UIImage.self) {
-                if let img = await loadImage(p) {
-                    await self.parent.addMedia(.simpleImage(image: img))
-                    logger.debug("LibraryMediaListPicker: added image")
-                }
-            }
-        }
-
-        private func loadImageData(_ p: NSItemProvider) async -> UploadContent? {
-            await withCheckedContinuation { cont in
-                loadFileURL(p, type: UTType.data) { url in
-                    if let url = url {
-                        let img = UploadContent.loadFromURL(url: url)
-                        cont.resume(returning: img)
-                    } else {
-                        cont.resume(returning: nil)
-                    }
-                }
-            }
-        }
-
-        private func loadImage(_ p: NSItemProvider) async -> UIImage? {
-            await withCheckedContinuation { cont in
-                p.loadObject(ofClass: UIImage.self)  { obj, err in
-                    if let err = err {
-                        logger.error("LibraryMediaListPicker result image error: \(err.localizedDescription)")
-                        cont.resume(returning: nil)
-                    } else  {
-                        cont.resume(returning: obj as? UIImage)
-                    }
-                }
-            }
-        }
-
-        private func loadVideo(_ p: NSItemProvider) async -> UploadContent? {
-            await withCheckedContinuation { cont in
-                loadFileURL(p, type: UTType.movie) { url in
-                    if let url = url  {
-                        let tempUrl = URL(fileURLWithPath: generateNewFileName(getTempFilesDirectory().path + "/" + "rawvideo", url.pathExtension, fullPath: true))
-                        let convertedVideoUrl = URL(fileURLWithPath: generateNewFileName(getTempFilesDirectory().path + "/" + "video", "mp4", fullPath: true))
-                        do {
-//                          logger.debug("LibraryMediaListPicker copyItem \(url) to \(tempUrl)")
-                            try FileManager.default.copyItem(at: url, to: tempUrl)
-                        } catch let err {
-                            logger.error("LibraryMediaListPicker copyItem error: \(err.localizedDescription)")
-                            return cont.resume(returning: nil)
-                        }
-                        Task {
-                            let success = await makeVideoQualityLower(tempUrl, outputUrl: convertedVideoUrl)
-                            try? FileManager.default.removeItem(at: tempUrl)
-                            if success {
-                                _ = ChatModel.shared.filesToDelete.insert(convertedVideoUrl)
-                                let video = UploadContent.loadVideoFromURL(url: convertedVideoUrl)
-                                return cont.resume(returning: video)
+            parent.media = []
+            media = []
+            mediaCount = results.count
+            for result in results {
+                logger.log("LibraryMediaListPicker result")
+                let p = result.itemProvider
+                if p.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
+                    p.loadFileRepresentation(forTypeIdentifier: UTType.movie.identifier) { url, error in
+                        if let url = url {
+                            let tempUrl = URL(fileURLWithPath: getTempFilesDirectory().path + "/" + generateNewFileName("video", url.pathExtension))
+                            if ((try? FileManager.default.copyItem(at: url, to: tempUrl)) != nil) {
+                                ChatModel.shared.filesToDelete.insert(tempUrl)
+                                self.loadVideo(url: tempUrl, error: error)
                            }
-                            try? FileManager.default.removeItem(at: convertedVideoUrl)
-                            cont.resume(returning: nil)
                        }
                    }
+                } else if p.hasItemConformingToTypeIdentifier(UTType.data.identifier) {
+                    p.loadFileRepresentation(forTypeIdentifier: UTType.data.identifier) { url, error in
+                        self.loadImage(object: url, error: error)
+                    }
+                } else if p.canLoadObject(ofClass: UIImage.self) {
+                    p.loadObject(ofClass: UIImage.self)  { image, error in
+                        DispatchQueue.main.async {
+                            self.loadImage(object: image, error: error)
+                        }
+                    }
+                } else {
+                    dispatchQueue.sync { self.mediaCount -= 1}
+                }
+            }
+            DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
+                self.dispatchQueue.sync {
+                    if self.parent.media.count == 0 {
+                        logger.log("LibraryMediaListPicker: added \(self.media.count) images out of \(results.count)")
+                        self.parent.media = self.media
+                    }
                }
            }
        }

-        private func loadFileURL(_ p: NSItemProvider, type: UTType, completion: @escaping (URL?) -> Void) {
-            p.loadFileRepresentation(forTypeIdentifier: type.identifier) { url, err in
-                if let err = err {
-                    logger.error("LibraryMediaListPicker loadFileURL error: \(err.localizedDescription)")
-                    completion(nil)
-                } else {
-                    completion(url)
+        func loadImage(object: Any?, error: Error? = nil) {
+            if let error = error {
+                logger.error("LibraryMediaListPicker: couldn't load image with error: \(error.localizedDescription)")
+            } else if let image = object as? UIImage {
+                media.append(.simpleImage(image: image))
+                logger.log("LibraryMediaListPicker: added image")
+            } else if let url = object as? URL, let image = UploadContent.loadFromURL(url: url) {
+                media.append(image)
+            }
+            dispatchQueue.sync {
+                self.mediaCount -= 1
+                if self.mediaCount == 0 && self.parent.media.count == 0 {
+                    logger.log("LibraryMediaListPicker: added all media")
+                    self.parent.media = self.media
+                    self.media = []
+                }
+            }
+        }
+
+        func loadVideo(url: URL?, error: Error? = nil) {
+            if let error = error {
+                logger.error("LibraryMediaListPicker: couldn't load video with error: \(error.localizedDescription)")
+            } else if let url = url as URL?, let video = UploadContent.loadVideoFromURL(url: url) {
+                media.append(video)
+            }
+            dispatchQueue.sync {
+                self.mediaCount -= 1
+                if self.mediaCount == 0 && self.parent.media.count == 0 {
+                    logger.log("LibraryMediaListPicker: added all media")
+                    self.parent.media = self.media
+                    self.media = []
                }
            }
        }
@@ -6,7 +6,6 @@
 import Foundation
 import SwiftUI
 import AVKit
-import Combine

 struct VideoPlayerView: UIViewRepresentable {

@@ -38,14 +37,6 @@ struct VideoPlayerView: UIViewRepresentable {
            player.seek(to: CMTime.zero)
            player.play()
        }
-        var played = false
-        context.coordinator.publisher = player.publisher(for: \.timeControlStatus).sink { status in
-            if played || status == .playing {
-                AppDelegate.keepScreenOn(status == .playing)
-                AudioPlayer.changeAudioSession(status == .playing)
-            }
-            played = status == .playing
-        }
        return controller.view
    }

@@ -59,13 +50,11 @@ struct VideoPlayerView: UIViewRepresentable {
    class Coordinator: NSObject {
        var controller: AVPlayerViewController?
        var timeObserver: Any? = nil
-        var publisher: AnyCancellable? = nil

        deinit {
            if let timeObserver = timeObserver {
                NotificationCenter.default.removeObserver(timeObserver)
            }
-            publisher?.cancel()
        }
    }
 }
@@ -1,26 +0,0 @@
-//
-//  VideoUtils.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 25.12.2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import AVFoundation
-import Foundation
-import SimpleXChat
-
-func makeVideoQualityLower(_ input: URL, outputUrl: URL) async -> Bool {
-    let asset: AVURLAsset = AVURLAsset(url: input, options: nil)
-    if let s = AVAssetExportSession(asset: asset, presetName: AVAssetExportPreset640x480) {
-        s.outputURL = outputUrl
-        s.outputFileType = .mp4
-        s.metadataItemFilter = AVMetadataItemFilter.forSharing()
-        await s.export()
-        if let err = s.error {
-            logger.error("Failed to export video with error: \(err)")
-        }
-        return s.status == .completed
-    }
-    return false
-}
@@ -52,7 +52,7 @@ struct LocalAuthView: View {
                resetChatCtrl()
                try initializeChat(start: true)
                m.chatDbChanged = false
-                AppChatState.shared.set(.active)
+                appStateGroupDefault.set(.active)
                if m.currentUser != nil { return }
                var profile: Profile? = nil
                if let displayName = displayName, displayName != "" {
@@ -130,10 +130,8 @@ struct AddGroupView: View {
            }
        }
        .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) { _ in
-                await MainActor.run {
-                    showImagePicker = false
-                }
+            LibraryImagePicker(image: $chosenImage) {
+                didSelectItem in showImagePicker = false
            }
        }
        .alert(isPresented: $showInvalidNameAlert) {
@@ -73,7 +73,6 @@ struct CreateLinkView: View {
        Task {
            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
                await MainActor.run {
-                    m.updateContactConnection(pcc)
                    connReqInvitation = connReq
                    contactConnection = pcc
                    m.connReqInv = connReq
@@ -52,9 +52,6 @@ struct NewChatButton: View {
    func addContactAction() {
        Task {
            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
-                await MainActor.run {
-                    ChatModel.shared.updateContactConnection(pcc)
-                }
                actionSheet = .createLink(link: connReq, connection: pcc)
            }
        }
@@ -158,14 +155,12 @@ func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool) -> Alert {
 enum PlanAndConnectActionSheet: Identifiable {
    case askCurrentOrIncognitoProfile(connectionLink: String, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
    case askCurrentOrIncognitoProfileDestructive(connectionLink: String, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
-    case askCurrentOrIncognitoProfileConnectContactViaAddress(contact: Contact)
    case ownGroupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool?, groupInfo: GroupInfo)

    var id: String {
        switch self {
        case let .askCurrentOrIncognitoProfile(connectionLink, _, _): return "askCurrentOrIncognitoProfile \(connectionLink)"
        case let .askCurrentOrIncognitoProfileDestructive(connectionLink, _, _): return "askCurrentOrIncognitoProfileDestructive \(connectionLink)"
-        case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact): return "askCurrentOrIncognitoProfileConnectContactViaAddress \(contact.contactId)"
        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink)"
        }
    }
@@ -191,15 +186,6 @@ func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool
                .cancel()
            ]
        )
-    case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact):
-        return ActionSheet(
-            title: Text("Connect with \(contact.chatViewName)"),
-            buttons: [
-                .default(Text("Use current profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: false) },
-                .default(Text("Use new incognito profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: true) },
-                .cancel()
-            ]
-        )
    case let .ownGroupLinkConfirmConnect(connectionLink, connectionPlan, incognito, groupInfo):
        if let incognito = incognito {
            return ActionSheet(
@@ -291,13 +277,6 @@ func planAndConnect(
                case let .known(contact):
                    logger.debug("planAndConnect, .contactAddress, .known, incognito=\(incognito?.description ?? "nil")")
                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
-                case let .contactViaAddress(contact):
-                    logger.debug("planAndConnect, .contactAddress, .contactViaAddress, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectContactViaAddress_(contact, dismiss: dismiss, incognito: incognito)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileConnectContactViaAddress(contact: contact))
-                    }
                }
            case let .groupLink(glp):
                switch glp {
@@ -336,23 +315,9 @@ func planAndConnect(
    }
 }

-private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incognito: Bool) {
-    Task {
-        if dismiss {
-            DispatchQueue.main.async {
-                dismissAllSheets(animated: true)
-            }
-        }
-        _ = await connectContactViaAddress(contact.contactId, incognito)
-    }
-}
-
 private func connectViaLink(_ connectionLink: String, connectionPlan: ConnectionPlan?, dismiss: Bool, incognito: Bool) {
    Task {
-        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connReq: connectionLink) {
-            await MainActor.run {
-                ChatModel.shared.updateContactConnection(pcc)
-            }
+        if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
            let crt: ConnReqType
            if let plan = connectionPlan {
                crt = planToConnReqType(plan)
@@ -11,12 +11,20 @@ import CoreImage.CIFilterBuiltins

 struct MutableQRCode: View {
    @Binding var uri: String
-    var withLogo: Bool = true
-    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
+    @State private var image: UIImage?

    var body: some View {
-        QRCode(uri: uri, withLogo: withLogo, tintColor: tintColor)
-            .id("simplex-qrcode-view-for-\(uri)")
+        ZStack {
+            if let image = image {
+                qrCodeImage(image)
+            }
+        }
+        .onAppear {
+            image = generateImage(uri)
+        }
+        .onChange(of: uri) { _ in
+            image = generateImage(uri)
+        }
    }
 }

@@ -41,7 +49,7 @@ struct QRCode: View {
    var withLogo: Bool = true
    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
    @State private var image: UIImage? = nil
-    @State private var makeScreenshotFunc: () -> Void = {}
+    @State private var makeScreenshotBinding: () -> Void = {}

    var body: some View {
        ZStack {
@@ -62,19 +70,18 @@ struct QRCode: View {
                    }
                }
                .onAppear {
-                    makeScreenshotFunc = {
+                    makeScreenshotBinding = {
                        let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
-                    }
+                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])}
                }
                .frame(width: geo.size.width, height: geo.size.height)
            }
        }
-        .onTapGesture(perform: makeScreenshotFunc)
+        .onTapGesture(perform: makeScreenshotBinding)
        .onAppear {
-            image = image ?? generateImage(uri, tintColor: tintColor)
+            image = image ?? generateImage(uri)?.replaceColor(UIColor.black, tintColor)
        }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
+
    }
 }

@@ -86,13 +93,13 @@ private func qrCodeImage(_ image: UIImage) -> some View {
        .textSelection(.enabled)
 }

-private func generateImage(_ uri: String, tintColor: UIColor) -> UIImage? {
+private func generateImage(_ uri: String) -> UIImage? {
    let context = CIContext()
    let filter = CIFilter.qrCodeGenerator()
    filter.message = Data(uri.utf8)
    if let outputImage = filter.outputImage,
       let cgImage = context.createCGImage(outputImage, from: outputImage.extent) {
-        return UIImage(cgImage: cgImage).replaceColor(UIColor.black, tintColor)
+        return UIImage(cgImage: cgImage)
    }
    return nil
 }
@@ -25,7 +25,7 @@ struct ScanToConnectView: View {
                    .fixedSize(horizontal: false, vertical: true)
                    .padding(.vertical)

-                CodeScannerView(codeTypes: [.qr], scanMode: .continuous, completion: processQRCode)
+                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
                    .aspectRatio(1, contentMode: .fit)
                    .cornerRadius(12)

@@ -81,6 +81,11 @@ struct CreateSimpleXAddress: View {
                        DispatchQueue.main.async {
                            m.userAddress = UserContactLink(connReqContact: connReqContact)
                        }
+                        if let u = try await apiSetProfileAddress(on: true) {
+                            DispatchQueue.main.async {
+                                m.updateUser(u)
+                            }
+                        }
                        await MainActor.run { progressIndicator = false }
                    } catch let error {
                        logger.error("CreateSimpleXAddress create address: \(responseError(error))")
@@ -95,7 +100,7 @@ struct CreateSimpleXAddress: View {
            } label: {
                Text("Create SimpleX address").font(.title)
            }
-            Text("You can make it visible to your SimpleX contacts via Settings.")
+            Text("Your contacts in SimpleX will see it.\nYou can change it in Settings.")
                .multilineTextAlignment(.center)
                .font(.footnote)
                .padding(.horizontal, 32)
@@ -283,37 +283,6 @@ private let versionDescriptions: [VersionDescription] = [
            ),
        ]
    ),
-    VersionDescription(
-        version: "v5.4",
-        post: URL(string: "https://simplex.chat/blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.html"),
-        features: [
-            FeatureDescription(
-                icon: "desktopcomputer",
-                title: "Link mobile and desktop apps! 🔗",
-                description: "Via secure quantum resistant protocol."
-            ),
-            FeatureDescription(
-                icon: "person.2",
-                title: "Better groups",
-                description: "Faster joining and more reliable messages."
-            ),
-            FeatureDescription(
-                icon: "theatermasks",
-                title: "Incognito groups",
-                description: "Create a group using a random profile."
-            ),
-            FeatureDescription(
-                icon: "hand.raised",
-                title: "Block group members",
-                description: "To hide unwanted messages."
-            ),
-            FeatureDescription(
-                icon: "gift",
-                title: "A few more things",
-                description: "- optionally notify deleted contacts.\n- profile names with spaces.\n- and more!"
-            ),
-        ]
-    ),
 ]

 private let lastVersion = versionDescriptions.last!.version
@@ -1,556 +0,0 @@
-//
-//  ConnectDesktopView.swift
-//  SimpleX (iOS)
-//
-//  Created by Evgeny on 13/10/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-import CodeScanner
-
-struct ConnectDesktopView: View {
-    @EnvironmentObject var m: ChatModel
-    @Environment(\.dismiss) var dismiss: DismissAction
-    var viaSettings = false
-    @AppStorage(DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS) private var deviceName = UIDevice.current.name
-    @AppStorage(DEFAULT_CONFIRM_REMOTE_SESSIONS) private var confirmRemoteSessions = false
-    @AppStorage(DEFAULT_CONNECT_REMOTE_VIA_MULTICAST) private var connectRemoteViaMulticast = true
-    @AppStorage(DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO) private var connectRemoteViaMulticastAuto = true
-    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    @State private var sessionAddress: String = ""
-    @State private var remoteCtrls: [RemoteCtrlInfo] = []
-    @State private var alert: ConnectDesktopAlert?
-    @State private var showConnectScreen = true
-    @State private var showQRCodeScanner = true
-    @State private var firstAppearance = true
-
-    private var useMulticast: Bool {
-        connectRemoteViaMulticast && !remoteCtrls.isEmpty
-    }
-
-    private enum ConnectDesktopAlert: Identifiable {
-        case unlinkDesktop(rc: RemoteCtrlInfo)
-        case disconnectDesktop(action: UserDisconnectAction)
-        case badInvitationError
-        case badVersionError(version: String?)
-        case desktopDisconnectedError
-        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")
-
-        var id: String {
-            switch self {
-            case let .unlinkDesktop(rc): "unlinkDesktop \(rc.remoteCtrlId)"
-            case let .disconnectDesktop(action): "disconnectDecktop \(action)"
-            case .badInvitationError: "badInvitationError"
-            case let .badVersionError(v): "badVersionError \(v ?? "")"
-            case .desktopDisconnectedError: "desktopDisconnectedError"
-            case let .error(title, _): "error \(title)"
-            }
-        }
-    }
-
-    private enum UserDisconnectAction: String {
-        case back
-        case dismiss // TODO dismiss settings after confirmation
-    }
-
-    var body: some View {
-        if viaSettings {
-            viewBody
-                .modifier(BackButton(label: "Back") {
-                    if m.activeRemoteCtrl {
-                        alert = .disconnectDesktop(action: .back)
-                    } else {
-                        dismiss()
-                    }
-                })
-        } else {
-            NavigationView {
-                viewBody
-            }
-        }
-    }
-
-    var viewBody: some View {
-        Group {
-            let discovery = m.remoteCtrlSession?.discovery
-            if discovery == true || (discovery == nil && !showConnectScreen) {
-                searchingDesktopView()
-            } else if let session = m.remoteCtrlSession {
-                switch session.sessionState {
-                case .starting: connectingDesktopView(session, nil)
-                case .searching: searchingDesktopView()
-                case let .found(rc, compatible): foundDesktopView(session, rc, compatible)
-                case let .connecting(rc_): connectingDesktopView(session, rc_)
-                case let .pendingConfirmation(rc_, sessCode):
-                    if confirmRemoteSessions || rc_ == nil {
-                        verifySessionView(session, rc_, sessCode)
-                    } else {
-                        connectingDesktopView(session, rc_).onAppear {
-                            verifyDesktopSessionCode(sessCode)
-                        }
-                    }
-                case let .connected(rc, _): activeSessionView(session, rc)
-                }
-            // The hack below prevents camera freezing when exiting linked devices view.
-            // Using showQRCodeScanner inside connectDesktopView or passing it as parameter still results in freezing.
-            } else if showQRCodeScanner || firstAppearance {
-                connectDesktopView()
-            } else {
-                connectDesktopView(showScanner: false)
-            }
-        }
-        .onAppear {
-            setDeviceName(deviceName)
-            updateRemoteCtrls()
-            showConnectScreen = !useMulticast
-            if m.remoteCtrlSession != nil {
-                disconnectDesktop()
-            } else if useMulticast {
-                findKnownDesktop()
-            }
-            // The hack below prevents camera freezing when exiting linked devices view.
-            // `firstAppearance` prevents camera flicker when the view first opens.
-            // moving `showQRCodeScanner = false` to `onDisappear` (to avoid `firstAppearance`) does not prevent freeze.
-            showQRCodeScanner = false
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
-                firstAppearance = false
-                showQRCodeScanner = true
-            }
-        }
-        .onDisappear {
-            if m.remoteCtrlSession != nil {
-                showConnectScreen = false
-                disconnectDesktop()
-            }
-        }
-        .onChange(of: deviceName) {
-            setDeviceName($0)
-        }
-        .onChange(of: m.activeRemoteCtrl) {
-            UIApplication.shared.isIdleTimerDisabled = $0
-        }
-        .alert(item: $alert) { a in
-            switch a {
-            case let .unlinkDesktop(rc):
-                Alert(
-                    title: Text("Unlink desktop?"),
-                    primaryButton: .destructive(Text("Unlink")) {
-                        unlinkDesktop(rc)
-                    },
-                    secondaryButton: .cancel()
-                )
-            case let .disconnectDesktop(action):
-                Alert(
-                    title: Text("Disconnect desktop?"),
-                    primaryButton: .destructive(Text("Disconnect")) {
-                        disconnectDesktop(action)
-                    },
-                    secondaryButton: .cancel()
-                )
-            case .badInvitationError:
-                Alert(title: Text("Bad desktop address"))
-            case let .badVersionError(v):
-                Alert(
-                    title: Text("Incompatible version"),
-                    message: Text("Desktop app version \(v ?? "") is not compatible with this app.")
-                )
-            case .desktopDisconnectedError:
-                Alert(title: Text("Connection terminated"))
-            case let .error(title, error):
-                Alert(title: Text(title), message: Text(error))
-            }
-        }
-        .interactiveDismissDisabled(m.activeRemoteCtrl)
-    }
-
-    private func connectDesktopView(showScanner: Bool = true) -> some View {
-        List {
-            Section("This device name") {
-                devicesView()
-            }
-            if showScanner {
-                scanDesctopAddressView()
-            }
-            if developerTools {
-                desktopAddressView()
-            }
-        }
-        .navigationTitle("Connect to desktop")
-    }
-
-    private func connectingDesktopView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?) -> some View {
-        List {
-            Section("Connecting to desktop") {
-                ctrlDeviceNameText(session, rc)
-                ctrlDeviceVersionText(session)
-            }
-
-            if let sessCode = session.sessionCode {
-                Section("Session code") {
-                    sessionCodeText(sessCode)
-                }
-            }
-
-            Section {
-                disconnectButton()
-            }
-        }
-        .navigationTitle("Connecting to desktop")
-    }
-
-    private func searchingDesktopView() -> some View {
-        List {
-            Section("This device name") {
-                devicesView()
-            }
-            Section("Found desktop") {
-                Text("Waiting for desktop...").italic()
-                Button {
-                    disconnectDesktop()
-                } label: {
-                    Label("Scan QR code", systemImage: "qrcode")
-                }
-            }
-        }
-        .navigationTitle("Connecting to desktop")
-    }
-
-    @ViewBuilder private func foundDesktopView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo, _ compatible: Bool) -> some View {
-        let v = List {
-            Section("This device name") {
-                devicesView()
-            }
-            Section("Found desktop") {
-                ctrlDeviceNameText(session, rc)
-                ctrlDeviceVersionText(session)
-                if !compatible {
-                    Text("Not compatible!").foregroundColor(.red)
-                } else if !connectRemoteViaMulticastAuto {
-                    Button {
-                        confirmKnownDesktop(rc)
-                    } label: {
-                        Label("Connect", systemImage: "checkmark")
-                    }
-                }
-            }
-            if !compatible && !connectRemoteViaMulticastAuto {
-                Section {
-                    disconnectButton("Cancel")
-                }
-            }
-        }
-        .navigationTitle("Found desktop")
-
-        if compatible && connectRemoteViaMulticastAuto {
-            v.onAppear { confirmKnownDesktop(rc) }
-        } else {
-            v
-        }
-    }
-
-    private func verifySessionView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?, _ sessCode: String) -> some View {
-        List {
-            Section("Connected to desktop") {
-                ctrlDeviceNameText(session, rc)
-                ctrlDeviceVersionText(session)
-            }
-
-            Section("Verify code with desktop") {
-                sessionCodeText(sessCode)
-                Button {
-                    verifyDesktopSessionCode(sessCode)
-                } label: {
-                    Label("Confirm", systemImage: "checkmark")
-                }
-            }
-
-            Section {
-                disconnectButton()
-            }
-        }
-        .navigationTitle("Verify connection")
-    }
-
-    private func ctrlDeviceNameText(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?) -> Text {
-        var t = Text(rc?.deviceViewName ?? session.ctrlAppInfo?.deviceName ?? "")
-        if (rc == nil) {
-            t = t + Text(" ") + Text("(new)").italic()
-        }
-        return t
-    }
-
-    private func ctrlDeviceVersionText(_ session: RemoteCtrlSession) -> Text {
-        let v = session.ctrlAppInfo?.appVersionRange.maxVersion
-        var t = Text("v\(v ?? "")")
-        if v != session.appVersion {
-            t = t + Text(" ") + Text("(this device v\(session.appVersion))").italic()
-        }
-        return t
-    }
-
-    private func activeSessionView(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo) -> some View {
-        List {
-            Section("Connected desktop") {
-                Text(rc.deviceViewName)
-                ctrlDeviceVersionText(session)
-            }
-
-            if let sessCode = session.sessionCode {
-                Section("Session code") {
-                    sessionCodeText(sessCode)
-                }
-            }
-
-            Section {
-                disconnectButton()
-            } footer: {
-                // This is specific to iOS
-                Text("Keep the app open to use it from desktop")
-            }
-        }
-        .navigationTitle("Connected to desktop")
-    }
-
-    private func sessionCodeText(_ code: String) -> some View {
-        Text(code.prefix(23))
-    }
-
-    private func devicesView() -> some View {
-        Group {
-            TextField("Enter this device name…", text: $deviceName)
-            if !remoteCtrls.isEmpty {
-                NavigationLink {
-                    linkedDesktopsView()
-                } label: {
-                    Text("Linked desktops")
-                }
-            }
-        }
-    }
-
-    private func scanDesctopAddressView() -> some View {
-        Section("Scan QR code from desktop") {
-            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processDesktopQRCode)
-                .aspectRatio(1, contentMode: .fit)
-                .cornerRadius(12)
-                .listRowBackground(Color.clear)
-                .listRowSeparator(.hidden)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                .padding(.horizontal)
-        }
-    }
-
-    private func desktopAddressView() -> some View {
-        Section("Desktop address") {
-            if sessionAddress.isEmpty {
-                Button {
-                    sessionAddress = UIPasteboard.general.string ?? ""
-                } label: {
-                    Label("Paste desktop address", systemImage: "doc.plaintext")
-                }
-                .disabled(!UIPasteboard.general.hasStrings)
-            } else {
-                HStack {
-                    Text(sessionAddress).lineLimit(1)
-                    Spacer()
-                    Image(systemName: "multiply.circle.fill")
-                        .foregroundColor(.secondary)
-                        .onTapGesture { sessionAddress = "" }
-                }
-            }
-            Button {
-                connectDesktopAddress(sessionAddress)
-            } label: {
-                Label("Connect to desktop", systemImage: "rectangle.connected.to.line.below")
-            }
-            .disabled(sessionAddress.isEmpty)
-        }
-    }
-
-    private func linkedDesktopsView() -> some View {
-        List {
-            Section("Desktop devices") {
-                ForEach(remoteCtrls, id: \.remoteCtrlId) { rc in
-                    remoteCtrlView(rc)
-                }
-                .onDelete { indexSet in
-                    if let i = indexSet.first, i < remoteCtrls.count {
-                        alert = .unlinkDesktop(rc: remoteCtrls[i])
-                    }
-                }
-            }
-
-            Section("Linked desktop options") {
-                Toggle("Verify connections", isOn: $confirmRemoteSessions)
-                Toggle("Discover via local network", isOn: $connectRemoteViaMulticast)
-                if connectRemoteViaMulticast {
-                    Toggle("Connect automatically", isOn: $connectRemoteViaMulticastAuto)
-                }
-            }
-        }
-        .navigationTitle("Linked desktops")
-    }
-
-    private func remoteCtrlView(_ rc: RemoteCtrlInfo) -> some View {
-        Text(rc.deviceViewName)
-    }
-
-
-    private func setDeviceName(_ name: String) {
-        do {
-            try setLocalDeviceName(deviceName)
-        } catch let e {
-            errorAlert(e)
-        }
-    }
-
-    private func updateRemoteCtrls() {
-        do {
-            remoteCtrls = try listRemoteCtrls()
-        } catch let e {
-            errorAlert(e)
-        }
-    }
-
-    private func processDesktopQRCode(_ resp: Result<ScanResult, ScanError>) {
-        switch resp {
-        case let .success(r): connectDesktopAddress(r.string)
-        case let .failure(e): errorAlert(e)
-        }
-    }
-
-    private func findKnownDesktop() {
-        Task {
-            do {
-                try await findKnownRemoteCtrl()
-                await MainActor.run {
-                    m.remoteCtrlSession = RemoteCtrlSession(
-                        ctrlAppInfo: nil,
-                        appVersion: "",
-                        sessionState: .searching
-                    )
-                    showConnectScreen = true
-                }
-            } catch let e {
-                await MainActor.run {
-                    errorAlert(e)
-                }
-            }
-        }
-    }
-
-    private func confirmKnownDesktop(_ rc: RemoteCtrlInfo) {
-        connectDesktop_ {
-            try await confirmRemoteCtrl(rc.remoteCtrlId)
-        }
-    }
-
-    private func connectDesktopAddress(_ addr: String) {
-        connectDesktop_ {
-            try await connectRemoteCtrl(desktopAddress: addr)
-        }
-    }
-
-    private func connectDesktop_(_ connect: @escaping () async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String)) {
-        Task {
-            do {
-                let (rc_, ctrlAppInfo, v) = try await connect()
-                await MainActor.run {
-                    sessionAddress = ""
-                    m.remoteCtrlSession = RemoteCtrlSession(
-                        ctrlAppInfo: ctrlAppInfo,
-                        appVersion: v,
-                        sessionState: .connecting(remoteCtrl_: rc_)
-                    )
-                }
-            } catch let e {
-                await MainActor.run {
-                    switch e as? ChatResponse {
-                    case .chatCmdError(_, .errorRemoteCtrl(.badInvitation)): alert = .badInvitationError
-                    case .chatCmdError(_, .error(.commandError)): alert = .badInvitationError
-                    case let .chatCmdError(_, .errorRemoteCtrl(.badVersion(v))): alert = .badVersionError(version: v)
-                    case .chatCmdError(_, .errorAgent(.RCP(.version))): alert = .badVersionError(version: nil)
-                    case .chatCmdError(_, .errorAgent(.RCP(.ctrlAuth))): alert = .desktopDisconnectedError
-                    default: errorAlert(e)
-                    }
-                }
-            }
-        }
-    }
-
-    private func verifyDesktopSessionCode(_ sessCode: String) {
-        Task {
-            do {
-                let rc = try await verifyRemoteCtrlSession(sessCode)
-                await MainActor.run {
-                    m.remoteCtrlSession = m.remoteCtrlSession?.updateState(.connected(remoteCtrl: rc, sessionCode: sessCode))
-                }
-                await MainActor.run {
-                    updateRemoteCtrls()
-                }
-            } catch let error {
-                await MainActor.run {
-                    errorAlert(error)
-                }
-            }
-        }
-    }
-
-    private func disconnectButton(_ label: LocalizedStringKey = "Disconnect") -> some View {
-        Button {
-            disconnectDesktop(.dismiss)
-        } label: {
-            Label(label, systemImage: "multiply")
-        }
-    }
-
-    private func disconnectDesktop(_ action: UserDisconnectAction? = nil) {
-        Task {
-            do {
-                try await stopRemoteCtrl()
-                await MainActor.run {
-                    if case .connected = m.remoteCtrlSession?.sessionState {
-                        switchToLocalSession()
-                    } else {
-                        m.remoteCtrlSession = nil
-                    }
-                    switch action {
-                    case .back: dismiss()
-                    case .dismiss: dismiss()
-                    case .none: ()
-                    }
-                }
-            } catch let e {
-                await MainActor.run {
-                    errorAlert(e)
-                }
-            }
-        }
-    }
-
-    private func unlinkDesktop(_ rc: RemoteCtrlInfo) {
-        Task {
-            do {
-                try await deleteRemoteCtrl(rc.remoteCtrlId)
-                await MainActor.run {
-                    remoteCtrls.removeAll(where: { $0.remoteCtrlId == rc.remoteCtrlId })
-                }
-            } catch let e {
-                await MainActor.run {
-                    errorAlert(e)
-                }
-            }
-        }
-    }
-
-    private func errorAlert(_ error: Error) {
-        let a = getErrorAlert(error, "Error")
-        alert = .error(title: a.title, error: a.message)
-    }
-}
-
-#Preview {
-    ConnectDesktopView()
-}
@@ -51,9 +51,9 @@ struct AdvancedNetworkSettings: View {
                    }
                    .disabled(currentNetCfg == NetCfg.proxyDefaults)

-                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [15_000, 30_000, 45_000, 60_000, 90_000, 120_000], label: secondsLabel)
+                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [5_000000, 7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_000000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [3_000000, 5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [15_000, 30_000, 60_000, 90_000, 120_000], label: secondsLabel)
                    timeoutSettingPicker("PING interval", selection: $netCfg.smpPingInterval, values: [120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000], label: secondsLabel)
                    intSettingPicker("PING count", selection: $netCfg.smpPingCount, values: [1, 2, 3, 5, 8], label: "")
                    Toggle("Enable TCP keep-alive", isOn: $enableKeepAlive)
@@ -14,6 +14,9 @@ struct NotificationsView: View {
    @State private var notificationMode: NotificationsMode = ChatModel.shared.notificationMode
    @State private var showAlert: NotificationAlert?
    @State private var legacyDatabase = dbContainerGroupDefault.get() == .documents
+//    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+//    @AppStorage(GROUP_DEFAULT_NTF_ENABLE_LOCAL, store: groupDefaults) private var ntfEnableLocal = false
+//    @AppStorage(GROUP_DEFAULT_NTF_ENABLE_PERIODIC, store: groupDefaults) private var ntfEnablePeriodic = false

    var body: some View {
        List {
@@ -85,6 +88,13 @@ struct NotificationsView: View {
                        .padding(.top, 1)
                }
            }
+
+//            if developerTools {
+//                Section(String("Experimental")) {
+//                    Toggle(String("Always enable local"), isOn: $ntfEnableLocal)
+//                    Toggle(String("Always enable periodic"), isOn: $ntfEnablePeriodic)
+//                }
+//            }
        }
        .disabled(legacyDatabase)
    }
@@ -109,7 +119,7 @@ struct NotificationsView: View {

    private func ntfModeAlertTitle(_ mode: NotificationsMode) -> LocalizedStringKey {
        switch mode {
-        case .off: return "Use only local notifications?"
+        case .off: return "Turn off notifications?"
        case .periodic: return "Enable periodic notifications?"
        case .instant: return "Enable instant notifications?"
        }
@@ -467,7 +467,6 @@ struct SimplexLockView: View {
            switch a {
            case .enableAuth:
                SetAppPasscodeView {
-                    m.contentViewAccessAuthenticated = true
                    laLockDelay = 30
                    prefPerformLA = true
                    showChangePassword = true
@@ -620,7 +619,6 @@ struct SimplexLockView: View {
        authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
            switch laResult {
            case .success:
-                m.contentViewAccessAuthenticated = true
                prefPerformLA = true
                laAlert = .laTurnedOnAlert
            case .failed:
@@ -21,7 +21,7 @@ struct ScanProtocolServer: View {
                .font(.largeTitle)
                .bold()
                .padding(.vertical)
-            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
                .aspectRatio(1, contentMode: .fit)
                .cornerRadius(12)
                .padding(.top)
@@ -53,10 +53,6 @@ let DEFAULT_WHATS_NEW_VERSION = "defaultWhatsNewVersion"
 let DEFAULT_ONBOARDING_STAGE = "onboardingStage"
 let DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME = "customDisappearingMessageTime"
 let DEFAULT_SHOW_UNREAD_AND_FAVORITES = "showUnreadAndFavorites"
-let DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS = "deviceNameForRemoteAccess"
-let DEFAULT_CONFIRM_REMOTE_SESSIONS = "confirmRemoteSessions"
-let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST = "connectRemoteViaMulticast"
-let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "connectRemoteViaMulticastAuto"

 let appDefaults: [String: Any] = [
    DEFAULT_SHOW_LA_NOTICE: false,
@@ -89,10 +85,7 @@ let appDefaults: [String: Any] = [
    DEFAULT_SHOW_MUTE_PROFILE_ALERT: true,
    DEFAULT_ONBOARDING_STAGE: OnboardingStage.onboardingComplete.rawValue,
    DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME: 300,
-    DEFAULT_SHOW_UNREAD_AND_FAVORITES: false,
-    DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
-    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
-    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
+    DEFAULT_SHOW_UNREAD_AND_FAVORITES: false
 ]

 enum SimpleXLinkMode: String, Identifiable {
@@ -185,12 +178,6 @@ struct SettingsView: View {
                    } label: {
                        settingsRow("switch.2") { Text("Chat preferences") }
                    }
-
-                    NavigationLink {
-                        ConnectDesktopView(viaSettings: true)
-                    } label: {
-                        settingsRow("desktopcomputer") { Text("Use from desktop") }
-                    }
                }
                .disabled(chatModel.chatRunning != true)
                
@@ -375,9 +362,7 @@ struct SettingsView: View {

 func settingsRow<Content : View>(_ icon: String, color: Color = .secondary, content: @escaping () -> Content) -> some View {
    ZStack(alignment: .leading) {
-        Image(systemName: icon).frame(maxWidth: 24, maxHeight: 24, alignment: .center)
-            .symbolRenderingMode(.monochrome)
-            .foregroundColor(color)
+        Image(systemName: icon).frame(maxWidth: 24, maxHeight: 24, alignment: .center).foregroundColor(color)
        content().padding(.leading, indent)
    }
 }
@@ -190,8 +190,7 @@ struct UserAddressView: View {

    @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
        Section {
-            SimpleXLinkQRCode(uri: userAddress.connReqContact)
-                .id("simplex-contact-address-qrcode-\(userAddress.connReqContact)")
+            MutableQRCode(uri: Binding.constant(simplexChatLink(userAddress.connReqContact)))
            shareQRCodeButton(userAddress)
            if MFMailComposeViewController.canSendMail() {
                shareViaEmailButton(userAddress)
@@ -120,10 +120,8 @@ struct UserProfile: View {
            }
        }
        .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) { _ in
-                await MainActor.run {
-                    showImagePicker = false
-                }
+            LibraryImagePicker(image: $chosenImage) {
+                didSelectItem in showImagePicker = false
            }
        }
        .onChange(of: chosenImage) { image in
@@ -18,9 +18,5 @@
 	<array>
 		<string>$(AppIdentifierPrefix)chat.simplex.app</string>
 	</array>
-	<key>com.apple.developer.networking.multicast</key>
-	<true/>
-	<key>com.apple.developer.device-information.user-assigned-device-name</key>
-	<true/>
 </dict>
 </plist>
@@ -87,10 +87,6 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ and %@ connected" xml:space="preserve">
        <source>%@ and %@ connected</source>
        <target>%@ и %@ са свързани</target>
@@ -101,10 +97,6 @@
        <target>%1$@ в %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
        <source>%@ is connected!</source>
        <target>%@ е свързан!</target>
@@ -130,10 +122,6 @@
        <target>%@ иска да се свърже!</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
        <source>%@, %@ and %lld other members connected</source>
        <target>%@, %@ и %lld други членове са свързани</target>
@@ -199,27 +187,11 @@
        <target>%lld файл(а) с общ размер от %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%lld members" xml:space="preserve">
        <source>%lld members</source>
        <target>%lld членове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%lld minutes" xml:space="preserve">
        <source>%lld minutes</source>
        <target>%lld минути</target>
@@ -290,14 +262,6 @@
        <target>(</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id=")" xml:space="preserve">
        <source>)</source>
        <target>)</target>
@@ -386,12 +350,6 @@
 - и още!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve">
-        <source>- optionally notify deleted contacts.
- profile names with spaces.
- and more!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
        <source>- voice messages up to 5 minutes.
 - custom time to disappear.
@@ -406,10 +364,6 @@
        <target>.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
      <trans-unit id="0s" xml:space="preserve">
        <source>0s</source>
        <target>0s</target>
@@ -635,10 +589,6 @@
        <target>Всички съобщения ще бъдат изтрити - това не може да бъде отменено! Съобщенията ще бъдат изтрити САМО за вас.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
        <target>Всички ваши контакти ще останат свързани.</target>
@@ -744,14 +694,6 @@
        <target>Вече сте свързани?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Always use relay" xml:space="preserve">
        <source>Always use relay</source>
        <target>Винаги използвай реле</target>
@@ -872,10 +814,6 @@
        <target>Назад</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Bad message ID" xml:space="preserve">
        <source>Bad message ID</source>
        <target>Лошо ID на съобщението</target>
@@ -886,31 +824,11 @@
        <target>Лош хеш на съобщението</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Better groups" xml:space="preserve">
-        <source>Better groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>По-добри съобщения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block group members" xml:space="preserve">
-        <source>Block group members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
        <source>Both you and your contact can add message reactions.</source>
        <target>И вие, и вашият контакт можете да добавяте реакции към съобщението.</target>
@@ -1172,8 +1090,9 @@
        <target>Свързване</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect automatically" xml:space="preserve">
-        <source>Connect automatically</source>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Свързване директно</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
@@ -1181,26 +1100,14 @@
        <target>Свързване инкогнито</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Свързване чрез линк на контакта</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Свързване чрез групов линк?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via link" xml:space="preserve">
@@ -1218,18 +1125,6 @@ This is your own one-time link!</source>
        <target>Свързване чрез еднократен линк за връзка</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
        <source>Connecting to server…</source>
        <target>Свързване със сървъра…</target>
@@ -1240,10 +1135,6 @@ This is your own one-time link!</source>
        <target>Свързване със сървър…(грешка: %@)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection" xml:space="preserve">
        <source>Connection</source>
        <target>Връзка</target>
@@ -1264,10 +1155,6 @@ This is your own one-time link!</source>
        <target>Заявката за връзка е изпратена!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection timeout" xml:space="preserve">
        <source>Connection timeout</source>
        <target>Времето на изчакване за установяване на връзката изтече</target>
@@ -1283,6 +1170,11 @@ This is your own one-time link!</source>
        <target>Контактът вече съществува</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Контактът и всички съобщения ще бъдат изтрити - това не може да бъде отменено!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Contact hidden:" xml:space="preserve">
        <source>Contact hidden:</source>
        <target>Контактът е скрит:</target>
@@ -1333,10 +1225,6 @@ This is your own one-time link!</source>
        <target>Версия на ядрото: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create" xml:space="preserve">
        <source>Create</source>
        <target>Създай</target>
@@ -1347,10 +1235,6 @@ This is your own one-time link!</source>
        <target>Създай SimpleX адрес</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Create a group using a random profile." xml:space="preserve">
-        <source>Create a group using a random profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create an address to let people connect with you." xml:space="preserve">
        <source>Create an address to let people connect with you.</source>
        <target>Създайте адрес, за да позволите на хората да се свързват с вас.</target>
@@ -1361,10 +1245,6 @@ This is your own one-time link!</source>
        <target>Създай файл</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create group link" xml:space="preserve">
        <source>Create group link</source>
        <target>Създай групов линк</target>
@@ -1385,10 +1265,6 @@ This is your own one-time link!</source>
        <target>Създай линк за еднократна покана</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create queue" xml:space="preserve">
        <source>Create queue</source>
        <target>Създай опашка</target>
@@ -1547,10 +1423,6 @@ This is your own one-time link!</source>
        <target>Изтрий</target>
        <note>chat item action</note>
      </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete Contact" xml:space="preserve">
        <source>Delete Contact</source>
        <target>Изтрий контакт</target>
@@ -1576,10 +1448,6 @@ This is your own one-time link!</source>
        <target>Изтрий всички файлове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete archive" xml:space="preserve">
        <source>Delete archive</source>
        <target>Изтрий архив</target>
@@ -1610,9 +1478,9 @@ This is your own one-time link!</source>
        <target>Изтрий контакт</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Изтрий контакт?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete database" xml:space="preserve">
@@ -1755,18 +1623,6 @@ This cannot be undone!</source>
        <target>Описание</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Разработване</target>
@@ -1857,17 +1713,19 @@ This cannot be undone!</source>
        <target>Прекъсни връзката</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Discover and join groups" xml:space="preserve">
        <source>Discover and join groups</source>
        <target>Открийте и се присъединете към групи</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover via local network" xml:space="preserve">
-        <source>Discover via local network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Показвано Име</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Показвано име:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2040,14 +1898,6 @@ This cannot be undone!</source>
        <target>Криптирано съобщение: неочаквана грешка</target>
        <note>notification</note>
      </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter Passcode" xml:space="preserve">
        <source>Enter Passcode</source>
        <target>Въведете kодa за достъп</target>
@@ -2058,10 +1908,6 @@ This cannot be undone!</source>
        <target>Въведи правилна парола.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter passphrase…" xml:space="preserve">
        <source>Enter passphrase…</source>
        <target>Въведи парола…</target>
@@ -2077,10 +1923,6 @@ This cannot be undone!</source>
        <target>Въведи сървъра ръчно</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter welcome message…" xml:space="preserve">
        <source>Enter welcome message…</source>
        <target>Въведи съобщение при посрещане…</target>
@@ -2091,10 +1933,6 @@ This cannot be undone!</source>
        <target>Въведи съобщение при посрещане…(незадължително)</target>
        <note>placeholder</note>
      </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Error" xml:space="preserve">
        <source>Error</source>
        <target>Грешка при свързване със сървъра</target>
@@ -2152,7 +1990,6 @@ This cannot be undone!</source>
      </trans-unit>
      <trans-unit id="Error creating member contact" xml:space="preserve">
        <source>Error creating member contact</source>
-        <target>Грешка при създаване на контакт с член</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error creating profile!" xml:space="preserve">
@@ -2287,7 +2124,6 @@ This cannot be undone!</source>
      </trans-unit>
      <trans-unit id="Error sending member contact invitation" xml:space="preserve">
        <source>Error sending member contact invitation</source>
-        <target>Грешка при изпращане на съобщение за покана за контакт</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error sending message" xml:space="preserve">
@@ -2370,10 +2206,6 @@ This cannot be undone!</source>
        <target>Изход без запазване</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
      <trans-unit id="Export database" xml:space="preserve">
        <source>Export database</source>
        <target>Експортирай база данни</target>
@@ -2404,10 +2236,6 @@ This cannot be undone!</source>
        <target>Бързо и без чакане, докато подателят е онлайн!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
-        <source>Faster joining and more reliable messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Favorite" xml:space="preserve">
        <source>Favorite</source>
        <target>Любим</target>
@@ -2503,10 +2331,6 @@ This cannot be undone!</source>
        <target>За конзолата</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Found desktop" xml:space="preserve">
-        <source>Found desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="French interface" xml:space="preserve">
        <source>French interface</source>
        <target>Френски интерфейс</target>
@@ -2527,10 +2351,6 @@ This cannot be undone!</source>
        <target>Пълно име:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
        <source>Fully re-implemented - work in background!</source>
        <target>Напълно преработено - работи във фонов режим!</target>
@@ -2551,14 +2371,6 @@ This cannot be undone!</source>
        <target>Група</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Group display name" xml:space="preserve">
        <source>Group display name</source>
        <target>Показвано име на групата</target>
@@ -2829,10 +2641,6 @@ This cannot be undone!</source>
        <target>Инкогнито</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito groups" xml:space="preserve">
-        <source>Incognito groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Incognito mode" xml:space="preserve">
        <source>Incognito mode</source>
        <target>Режим инкогнито</target>
@@ -2863,10 +2671,6 @@ This cannot be undone!</source>
        <target>Несъвместима версия на базата данни</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Incorrect passcode" xml:space="preserve">
        <source>Incorrect passcode</source>
        <target>Неправилен kод за достъп</target>
@@ -2914,10 +2718,6 @@ This cannot be undone!</source>
        <target>Невалиден линк за връзка</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invalid server address!" xml:space="preserve">
        <source>Invalid server address!</source>
        <target>Невалиден адрес на сървъра!</target>
@@ -3009,33 +2809,16 @@ This cannot be undone!</source>
        <target>Влез в групата</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Join incognito" xml:space="preserve">
        <source>Join incognito</source>
        <target>Влез инкогнито</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Joining group" xml:space="preserve">
        <source>Joining group</source>
        <target>Присъединяване към групата</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">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
        <target>Запазете връзките си</target>
@@ -3096,18 +2879,6 @@ This is your link for group %@!</source>
        <target>Ограничения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Link mobile and desktop apps! 🔗" xml:space="preserve">
-        <source>Link mobile and desktop apps! 🔗</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Live message!" xml:space="preserve">
        <source>Live message!</source>
        <target>Съобщение на живо!</target>
@@ -3258,10 +3029,6 @@ This is your link for group %@!</source>
        <target>Съобщения и файлове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
        <target>Архивът на базата данни се мигрира…</target>
@@ -3457,10 +3224,6 @@ This is your link for group %@!</source>
        <target>Няма получени или изпратени файлове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Not compatible!" xml:space="preserve">
-        <source>Not compatible!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Известия</target>
@@ -3597,7 +3360,6 @@ This is your link for group %@!</source>
      </trans-unit>
      <trans-unit id="Open" xml:space="preserve">
        <source>Open</source>
-        <target>Отвори</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Open Settings" xml:space="preserve">
@@ -3615,10 +3377,6 @@ This is your link for group %@!</source>
        <target>Отвори конзолата</target>
        <note>authentication reason</note>
      </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Open user profiles" xml:space="preserve">
        <source>Open user profiles</source>
        <target>Отвори потребителските профили</target>
@@ -3634,6 +3392,11 @@ This is your link for group %@!</source>
        <target>Отваряне на база данни…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Отварянето на линка в браузъра може да намали поверителността и сигурността на връзката. Несигурните SimpleX линкове ще бъдат червени.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>PING бройка</target>
@@ -3679,10 +3442,6 @@ This is your link for group %@!</source>
        <target>Постави</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Paste image" xml:space="preserve">
        <source>Paste image</source>
        <target>Постави изображение</target>
@@ -3828,14 +3587,6 @@ This is your link for group %@!</source>
        <target>Профилно изображение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Профилна парола</target>
@@ -4081,14 +3832,6 @@ This is your link for group %@!</source>
        <target>Предоговори криптирането?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
        <source>Reply</source>
        <target>Отговори</target>
@@ -4274,10 +4017,6 @@ This is your link for group %@!</source>
        <target>Сканирай QR код</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Scan code" xml:space="preserve">
        <source>Scan code</source>
        <target>Сканирай код</target>
@@ -4360,7 +4099,6 @@ This is your link for group %@!</source>
      </trans-unit>
      <trans-unit id="Send direct message to connect" xml:space="preserve">
        <source>Send direct message to connect</source>
-        <target>Изпрати лично съобщение за свързване</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -4498,10 +4236,6 @@ This is your link for group %@!</source>
        <target>Сървъри</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Set 1 day" xml:space="preserve">
        <source>Set 1 day</source>
        <target>Задай 1 ден</target>
@@ -4812,10 +4546,6 @@ This is your link for group %@!</source>
        <target>Докосни бутона </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Tap to activate profile." xml:space="preserve">
        <source>Tap to activate profile.</source>
        <target>Докосни за активиране на профил.</target>
@@ -4913,6 +4643,11 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Криптирането работи и новото споразумение за криптиране не е необходимо. Това може да доведе до грешки при свързване!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>Групата е напълно децентрализирана – видима е само за членовете.</target>
+        <note>No comment provided by engineer.</note>
+      </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>Хешът на предишното съобщение е различен.</target>
@@ -4998,10 +4733,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Това действие не може да бъде отменено - вашият профил, контакти, съобщения и файлове ще бъдат безвъзвратно загубени.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
        <source>This group has over %lld members, delivery receipts are not sent.</source>
        <target>Тази група има над %lld членове, потвърждения за доставка не се изпращат.</target>
@@ -5012,14 +4743,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Тази група вече не съществува.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
        <source>This setting applies to messages in your current chat profile **%@**.</source>
        <target>Тази настройка се прилага за съобщения в текущия ви профил **%@**.</target>
@@ -5035,10 +4758,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>За да се свърже, вашият контакт може да сканира QR код или да използва линка в приложението.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To hide unwanted messages." xml:space="preserve">
-        <source>To hide unwanted messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>За да направите нова връзка</target>
@@ -5121,18 +4840,6 @@ You will be prompted to complete authentication before this feature is enabled.<
        <target>Не може да се запише гласово съобщение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Неочаквана грешка: %@</target>
@@ -5195,14 +4902,6 @@ To connect, please ask your contact to create another connection link and check
 За да се свържете, моля, помолете вашия контакт да създаде друг линк за връзка и проверете дали имате стабилна мрежова връзка.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Unlock" xml:space="preserve">
        <source>Unlock</source>
        <target>Отключи</target>
@@ -5293,10 +4992,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Използвай за нови връзки</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Use iOS call interface" xml:space="preserve">
        <source>Use iOS call interface</source>
        <target>Използвай интерфейса за повикване на iOS</target>
@@ -5327,23 +5022,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Използват се сървърите на SimpleX Chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Verify connection security" xml:space="preserve">
        <source>Verify connection security</source>
        <target>Потвръди сигурността на връзката</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Verify security code" xml:space="preserve">
        <source>Verify security code</source>
        <target>Потвръди кода за сигурност</target>
@@ -5354,10 +5037,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Чрез браузър</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Via secure quantum resistant protocol." xml:space="preserve">
-        <source>Via secure quantum resistant protocol.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Video call" xml:space="preserve">
        <source>Video call</source>
        <target>Видео разговор</target>
@@ -5408,10 +5087,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Гласово съобщение…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Waiting for desktop..." xml:space="preserve">
-        <source>Waiting for desktop...</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Waiting for file" xml:space="preserve">
        <source>Waiting for file</source>
        <target>Изчаква се получаването на файла</target>
@@ -5512,35 +5187,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Вече сте вече свързани с %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
        <source>You are connected to the server used to receive messages from this contact.</source>
        <target>Вие сте свързани към сървъра, използван за получаване на съобщения от този контакт.</target>
@@ -5636,15 +5282,6 @@ Repeat join request?</source>
        <target>Не можахте да бъдете потвърдени; Моля, опитайте отново.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You have no chats" xml:space="preserve">
        <source>You have no chats</source>
        <target>Нямате чатове</target>
@@ -5695,10 +5332,6 @@ Repeat connection request?</source>
        <target>Ще бъдете свързани с групата, когато устройството на домакина на групата е онлайн, моля, изчакайте или проверете по-късно!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
        <source>You will be connected when your connection request is accepted, please wait or check later!</source>
        <target>Ще бъдете свързани, когато заявката ви за връзка бъде приета, моля, изчакайте или проверете по-късно!</target>
@@ -5714,8 +5347,9 @@ Repeat connection request?</source>
        <target>Ще трябва да се идентифицирате, когато стартирате или възобновите приложението след 30 секунди във фонов режим.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Ще се присъедините към групата, към която този линк препраща, и ще се свържете с нейните членове.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5783,6 +5417,11 @@ Repeat connection request?</source>
        <target>Вашата чат база данни не е криптирана - задайте парола, за да я криптирате.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Вашият чат профил ще бъде изпратен на членовете на групата</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Вашите чат профили</target>
@@ -5837,10 +5476,6 @@ You can change it in Settings.</source>
        <target>Вашата поверителност</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
        <source>Your profile **%@** will be shared.</source>
        <target>Вашият профил **%@** ще бъде споделен.</target>
@@ -5933,19 +5568,11 @@ SimpleX сървърите не могат да видят вашия профи
        <target>винаги</target>
        <note>pref value</note>
      </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
        <source>audio call (not e2e encrypted)</source>
        <target>аудио разговор (не е e2e криптиран)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="author" xml:space="preserve">
-        <source>author</source>
-        <note>member role</note>
-      </trans-unit>
      <trans-unit id="bad message ID" xml:space="preserve">
        <source>bad message ID</source>
        <target>лошо ID на съобщението</target>
@@ -5956,10 +5583,6 @@ SimpleX сървърите не могат да видят вашия профи
        <target>лош хеш на съобщението</target>
        <note>integrity error chat item</note>
      </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="bold" xml:space="preserve">
        <source>bold</source>
        <target>удебелен</target>
@@ -6032,7 +5655,6 @@ SimpleX сървърите не могат да видят вашия профи
      </trans-unit>
      <trans-unit id="connected directly" xml:space="preserve">
        <source>connected directly</source>
-        <target>свързан директно</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="connecting" xml:space="preserve">
@@ -6130,10 +5752,6 @@ SimpleX сървърите не могат да видят вашия профи
        <target>изтрит</target>
        <note>deleted chat item</note>
      </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
      <trans-unit id="deleted group" xml:space="preserve">
        <source>deleted group</source>
        <target>групата изтрита</target>
@@ -6418,8 +6036,7 @@ SimpleX сървърите не могат да видят вашия профи
        <source>off</source>
        <target>изключено</target>
        <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
      </trans-unit>
      <trans-unit id="offered %@" xml:space="preserve">
        <source>offered %@</source>
@@ -6436,6 +6053,11 @@ SimpleX сървърите не могат да видят вашия профи
        <target>включено</target>
        <note>group pref value</note>
      </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>или пишете на разработчиците</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="owner" xml:space="preserve">
        <source>owner</source>
        <target>собственик</target>
@@ -6498,7 +6120,6 @@ SimpleX сървърите не могат да видят вашия профи
      </trans-unit>
      <trans-unit id="send direct message" xml:space="preserve">
        <source>send direct message</source>
-        <target>изпрати лично съобщение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="starting…" xml:space="preserve">
@@ -6526,10 +6147,6 @@ SimpleX сървърите не могат да видят вашия профи
        <target>актуализиран профил на групата</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="v%@ (%@)" xml:space="preserve">
        <source>v%@ (%@)</source>
        <target>v%@ (%@)</target>
@@ -6667,10 +6284,6 @@ SimpleX сървърите не могат да видят вашия профи
        <target>SimpleX използва Face ID за локалнa идентификация</target>
        <note>Privacy - Face ID Usage Description</note>
      </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
      <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
        <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
        <target>SimpleX се нуждае от достъп до микрофона за аудио и видео разговори и за запис на гласови съобщения.</target>
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -87,10 +87,6 @@
        <target>%@ / % @</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ and %@ connected" xml:space="preserve">
        <source>%@ and %@ connected</source>
        <target>%@ ja %@ yhdistetty</target>
@@ -101,10 +97,6 @@
        <target>%1$@ klo %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
        <source>%@ is connected!</source>
        <target>%@ on yhdistetty!</target>
@@ -130,10 +122,6 @@
        <target>%@ haluaa muodostaa yhteyden!</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
        <source>%@, %@ and %lld other members connected</source>
        <target>%@, %@ ja %lld muut jäsenet yhdistetty</target>
@@ -199,27 +187,11 @@
        <target>%lld tiedosto(a), joiden kokonaiskoko on %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%lld members" xml:space="preserve">
        <source>%lld members</source>
        <target>%lld jäsenet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%lld minutes" xml:space="preserve">
        <source>%lld minutes</source>
        <target>%lld minuuttia</target>
@@ -227,7 +199,6 @@
      </trans-unit>
      <trans-unit id="%lld new interface languages" xml:space="preserve">
        <source>%lld new interface languages</source>
-        <target>%lld uutta käyttöliittymän kieltä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%lld second(s)" xml:space="preserve">
@@ -290,14 +261,6 @@
        <target>(</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id=")" xml:space="preserve">
        <source>)</source>
        <target>)</target>
@@ -383,12 +346,6 @@
 - ja paljon muuta!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve">
-        <source>- optionally notify deleted contacts.
- profile names with spaces.
- and more!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
        <source>- voice messages up to 5 minutes.
 - custom time to disappear.
@@ -403,10 +360,6 @@
        <target>.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
      <trans-unit id="0s" xml:space="preserve">
        <source>0s</source>
        <target>0s</target>
@@ -632,10 +585,6 @@
        <target>Kaikki viestit poistetaan - tätä ei voi kumota! Viestit poistuvat VAIN sinulta.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
        <target>Kaikki kontaktisi pysyvät yhteydessä.</target>
@@ -741,14 +690,6 @@
        <target>Oletko jo muodostanut yhteyden?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Always use relay" xml:space="preserve">
        <source>Always use relay</source>
        <target>Käytä aina relettä</target>
@@ -868,10 +809,6 @@
        <target>Takaisin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Bad message ID" xml:space="preserve">
        <source>Bad message ID</source>
        <target>Virheellinen viestin tunniste</target>
@@ -882,31 +819,11 @@
        <target>Virheellinen viestin tarkiste</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Better groups" xml:space="preserve">
-        <source>Better groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Parempia viestejä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block group members" xml:space="preserve">
-        <source>Block group members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
        <source>Both you and your contact can add message reactions.</source>
        <target>Sekä sinä että kontaktisi voivat käyttää viestireaktioita.</target>
@@ -1167,8 +1084,9 @@
        <target>Yhdistä</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect automatically" xml:space="preserve">
-        <source>Connect automatically</source>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Yhdistä suoraan</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
@@ -1176,26 +1094,14 @@
        <target>Yhdistä Incognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Yhdistä kontaktilinkillä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Yhdistetäänkö ryhmälinkin kautta?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via link" xml:space="preserve">
@@ -1213,18 +1119,6 @@ This is your own one-time link!</source>
        <target>Yhdistä kertalinkillä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
        <source>Connecting to server…</source>
        <target>Yhteyden muodostaminen palvelimeen…</target>
@@ -1235,10 +1129,6 @@ This is your own one-time link!</source>
        <target>Yhteyden muodostaminen palvelimeen... (virhe: %@)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection" xml:space="preserve">
        <source>Connection</source>
        <target>Yhteys</target>
@@ -1259,10 +1149,6 @@ This is your own one-time link!</source>
        <target>Yhteyspyyntö lähetetty!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection timeout" xml:space="preserve">
        <source>Connection timeout</source>
        <target>Yhteyden aikakatkaisu</target>
@@ -1278,6 +1164,11 @@ This is your own one-time link!</source>
        <target>Kontakti on jo olemassa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Kontakti ja kaikki viestit poistetaan - tätä ei voi perua!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Contact hidden:" xml:space="preserve">
        <source>Contact hidden:</source>
        <target>Kontakti piilotettu:</target>
@@ -1328,10 +1219,6 @@ This is your own one-time link!</source>
        <target>Ydinversio: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create" xml:space="preserve">
        <source>Create</source>
        <target>Luo</target>
@@ -1342,10 +1229,6 @@ This is your own one-time link!</source>
        <target>Luo SimpleX-osoite</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Create a group using a random profile." xml:space="preserve">
-        <source>Create a group using a random profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create an address to let people connect with you." xml:space="preserve">
        <source>Create an address to let people connect with you.</source>
        <target>Luo osoite, jolla ihmiset voivat ottaa sinuun yhteyttä.</target>
@@ -1356,10 +1239,6 @@ This is your own one-time link!</source>
        <target>Luo tiedosto</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create group link" xml:space="preserve">
        <source>Create group link</source>
        <target>Luo ryhmälinkki</target>
@@ -1372,7 +1251,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
-        <target>Luo uusi profiili [työpöytäsovelluksessa](https://simplex.chat/downloads/). 💻</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Create one-time invitation link" xml:space="preserve">
@@ -1380,10 +1258,6 @@ This is your own one-time link!</source>
        <target>Luo kertakutsulinkki</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create queue" xml:space="preserve">
        <source>Create queue</source>
        <target>Luo jono</target>
@@ -1542,10 +1416,6 @@ This is your own one-time link!</source>
        <target>Poista</target>
        <note>chat item action</note>
      </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete Contact" xml:space="preserve">
        <source>Delete Contact</source>
        <target>Poista kontakti</target>
@@ -1571,10 +1441,6 @@ This is your own one-time link!</source>
        <target>Poista kaikki tiedostot</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete archive" xml:space="preserve">
        <source>Delete archive</source>
        <target>Poista arkisto</target>
@@ -1605,9 +1471,9 @@ This is your own one-time link!</source>
        <target>Poista kontakti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Poista kontakti?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete database" xml:space="preserve">
@@ -1750,18 +1616,6 @@ This cannot be undone!</source>
        <target>Kuvaus</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Kehitä</target>
@@ -1852,17 +1706,18 @@ This cannot be undone!</source>
        <target>Katkaise</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Discover and join groups" xml:space="preserve">
        <source>Discover and join groups</source>
-        <target>Löydä ryhmiä ja liity niihin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover via local network" xml:space="preserve">
-        <source>Discover via local network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Näyttönimi</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Näyttönimi:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2034,14 +1889,6 @@ This cannot be undone!</source>
        <target>Salattu viesti: odottamaton virhe</target>
        <note>notification</note>
      </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter Passcode" xml:space="preserve">
        <source>Enter Passcode</source>
        <target>Syötä pääsykoodi</target>
@@ -2052,10 +1899,6 @@ This cannot be undone!</source>
        <target>Anna oikea tunnuslause.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter passphrase…" xml:space="preserve">
        <source>Enter passphrase…</source>
        <target>Syötä tunnuslause…</target>
@@ -2071,10 +1914,6 @@ This cannot be undone!</source>
        <target>Syötä palvelin manuaalisesti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter welcome message…" xml:space="preserve">
        <source>Enter welcome message…</source>
        <target>Kirjoita tervetuloviesti…</target>
@@ -2085,10 +1924,6 @@ This cannot be undone!</source>
        <target>Kirjoita tervetuloviesti... (valinnainen)</target>
        <note>placeholder</note>
      </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Error" xml:space="preserve">
        <source>Error</source>
        <target>Virhe</target>
@@ -2362,10 +2197,6 @@ This cannot be undone!</source>
        <target>Poistu tallentamatta</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
      <trans-unit id="Export database" xml:space="preserve">
        <source>Export database</source>
        <target>Vie tietokanta</target>
@@ -2396,10 +2227,6 @@ This cannot be undone!</source>
        <target>Nopea ja ei odotusta, kunnes lähettäjä on online-tilassa!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
-        <source>Faster joining and more reliable messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Favorite" xml:space="preserve">
        <source>Favorite</source>
        <target>Suosikki</target>
@@ -2495,10 +2322,6 @@ This cannot be undone!</source>
        <target>Konsoliin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Found desktop" xml:space="preserve">
-        <source>Found desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="French interface" xml:space="preserve">
        <source>French interface</source>
        <target>Ranskalainen käyttöliittymä</target>
@@ -2519,10 +2342,6 @@ This cannot be undone!</source>
        <target>Koko nimi:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
        <source>Fully re-implemented - work in background!</source>
        <target>Täysin uudistettu - toimii taustalla!</target>
@@ -2543,14 +2362,6 @@ This cannot be undone!</source>
        <target>Ryhmä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Group display name" xml:space="preserve">
        <source>Group display name</source>
        <target>Ryhmän näyttönimi</target>
@@ -2821,10 +2632,6 @@ This cannot be undone!</source>
        <target>Incognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito groups" xml:space="preserve">
-        <source>Incognito groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Incognito mode" xml:space="preserve">
        <source>Incognito mode</source>
        <target>Incognito-tila</target>
@@ -2855,10 +2662,6 @@ This cannot be undone!</source>
        <target>Yhteensopimaton tietokantaversio</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Incorrect passcode" xml:space="preserve">
        <source>Incorrect passcode</source>
        <target>Väärä pääsykoodi</target>
@@ -2906,10 +2709,6 @@ This cannot be undone!</source>
        <target>Virheellinen yhteyslinkki</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invalid server address!" xml:space="preserve">
        <source>Invalid server address!</source>
        <target>Virheellinen palvelinosoite!</target>
@@ -3001,33 +2800,16 @@ This cannot be undone!</source>
        <target>Liity ryhmään</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Join incognito" xml:space="preserve">
        <source>Join incognito</source>
        <target>Liity incognito-tilassa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Joining group" xml:space="preserve">
        <source>Joining group</source>
        <target>Liittyy ryhmään</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">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
        <target>Pidä kontaktisi</target>
@@ -3088,18 +2870,6 @@ This is your link for group %@!</source>
        <target>Rajoitukset</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Link mobile and desktop apps! 🔗" xml:space="preserve">
-        <source>Link mobile and desktop apps! 🔗</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Live message!" xml:space="preserve">
        <source>Live message!</source>
        <target>Live-viesti!</target>
@@ -3250,10 +3020,6 @@ This is your link for group %@!</source>
        <target>Viestit ja tiedostot</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
        <target>Siirretään tietokannan arkistoa…</target>
@@ -3448,10 +3214,6 @@ This is your link for group %@!</source>
        <target>Ei vastaanotettuja tai lähetettyjä tiedostoja</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Not compatible!" xml:space="preserve">
-        <source>Not compatible!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Ilmoitukset</target>
@@ -3605,10 +3367,6 @@ This is your link for group %@!</source>
        <target>Avaa keskustelukonsoli</target>
        <note>authentication reason</note>
      </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Open user profiles" xml:space="preserve">
        <source>Open user profiles</source>
        <target>Avaa käyttäjäprofiilit</target>
@@ -3624,6 +3382,11 @@ This is your link for group %@!</source>
        <target>Avataan tietokantaa…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Linkin avaaminen selaimessa voi heikentää yhteyden yksityisyyttä ja turvallisuutta. Epäluotetut SimpleX-linkit näkyvät punaisina.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>PING-määrä</target>
@@ -3669,10 +3432,6 @@ This is your link for group %@!</source>
        <target>Liitä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Paste image" xml:space="preserve">
        <source>Paste image</source>
        <target>Liitä kuva</target>
@@ -3818,14 +3577,6 @@ This is your link for group %@!</source>
        <target>Profiilikuva</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Profiilin salasana</target>
@@ -4071,14 +3822,6 @@ This is your link for group %@!</source>
        <target>Uudelleenneuvottele salaus?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
        <source>Reply</source>
        <target>Vastaa</target>
@@ -4264,10 +4007,6 @@ This is your link for group %@!</source>
        <target>Skannaa QR-koodi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Scan code" xml:space="preserve">
        <source>Scan code</source>
        <target>Skannaa koodi</target>
@@ -4487,10 +4226,6 @@ This is your link for group %@!</source>
        <target>Palvelimet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Set 1 day" xml:space="preserve">
        <source>Set 1 day</source>
        <target>Aseta 1 päivä</target>
@@ -4800,10 +4535,6 @@ This is your link for group %@!</source>
        <target>Napauta painiketta </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Tap to activate profile." xml:space="preserve">
        <source>Tap to activate profile.</source>
        <target>Aktivoi profiili napauttamalla.</target>
@@ -4901,6 +4632,11 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Salaus toimii ja uutta salaussopimusta ei tarvita. Tämä voi johtaa yhteysvirheisiin!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>Ryhmä on täysin hajautettu - se näkyy vain jäsenille.</target>
+        <note>No comment provided by engineer.</note>
+      </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>Edellisen viestin tarkiste on erilainen.</target>
@@ -4986,10 +4722,6 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Tätä toimintoa ei voi kumota - profiilisi, kontaktisi, viestisi ja tiedostosi poistuvat peruuttamattomasti.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
        <source>This group has over %lld members, delivery receipts are not sent.</source>
        <target>Tässä ryhmässä on yli %lld jäsentä, lähetyskuittauksia ei lähetetä.</target>
@@ -5000,14 +4732,6 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Tätä ryhmää ei enää ole olemassa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
        <source>This setting applies to messages in your current chat profile **%@**.</source>
        <target>Tämä asetus koskee nykyisen keskusteluprofiilisi viestejä *%@**.</target>
@@ -5023,10 +4747,6 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Kontaktisi voi muodostaa yhteyden skannaamalla QR-koodin tai käyttämällä sovelluksessa olevaa linkkiä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To hide unwanted messages." xml:space="preserve">
-        <source>To hide unwanted messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>Uuden yhteyden luominen</target>
@@ -5108,18 +4828,6 @@ Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus ote
        <target>Ääniviestiä ei voi tallentaa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Odottamaton virhe: %@</target>
@@ -5182,14 +4890,6 @@ To connect, please ask your contact to create another connection link and check
 Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja tarkista, että verkkoyhteytesi on vakaa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Unlock" xml:space="preserve">
        <source>Unlock</source>
        <target>Avaa</target>
@@ -5280,10 +4980,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Käytä uusiin yhteyksiin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Use iOS call interface" xml:space="preserve">
        <source>Use iOS call interface</source>
        <target>Käytä iOS:n puhelujen käyttöliittymää</target>
@@ -5314,23 +5010,11 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Käyttää SimpleX Chat -palvelimia.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Verify connection security" xml:space="preserve">
        <source>Verify connection security</source>
        <target>Tarkista yhteyden suojaus</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Verify security code" xml:space="preserve">
        <source>Verify security code</source>
        <target>Tarkista turvakoodi</target>
@@ -5341,10 +5025,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Selaimella</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Via secure quantum resistant protocol." xml:space="preserve">
-        <source>Via secure quantum resistant protocol.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Video call" xml:space="preserve">
        <source>Video call</source>
        <target>Videopuhelu</target>
@@ -5395,10 +5075,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Ääniviesti…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Waiting for desktop..." xml:space="preserve">
-        <source>Waiting for desktop...</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Waiting for file" xml:space="preserve">
        <source>Waiting for file</source>
        <target>Odottaa tiedostoa</target>
@@ -5499,35 +5175,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Olet jo muodostanut yhteyden %@:n kanssa.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
        <source>You are connected to the server used to receive messages from this contact.</source>
        <target>Olet yhteydessä palvelimeen, jota käytetään vastaanottamaan viestejä tältä kontaktilta.</target>
@@ -5623,15 +5270,6 @@ Repeat join request?</source>
        <target>Sinua ei voitu todentaa; yritä uudelleen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You have no chats" xml:space="preserve">
        <source>You have no chats</source>
        <target>Sinulla ei ole keskusteluja</target>
@@ -5682,10 +5320,6 @@ Repeat connection request?</source>
        <target>Sinut yhdistetään ryhmään, kun ryhmän isännän laite on online-tilassa, odota tai tarkista myöhemmin!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
        <source>You will be connected when your connection request is accepted, please wait or check later!</source>
        <target>Sinut yhdistetään, kun yhteyspyyntösi on hyväksytty, odota tai tarkista myöhemmin!</target>
@@ -5701,8 +5335,9 @@ Repeat connection request?</source>
        <target>Sinun on tunnistauduttava, kun käynnistät sovelluksen tai jatkat sen käyttöä 30 sekunnin tauon jälkeen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Liityt ryhmään, johon tämä linkki viittaa, ja muodostat yhteyden sen ryhmän jäseniin.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5770,6 +5405,11 @@ Repeat connection request?</source>
        <target>Keskustelut-tietokantasi ei ole salattu - aseta tunnuslause sen salaamiseksi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Keskusteluprofiilisi lähetetään ryhmän jäsenille</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Keskusteluprofiilisi</target>
@@ -5824,10 +5464,6 @@ Voit muuttaa sitä Asetuksista.</target>
        <target>Yksityisyytesi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
        <source>Your profile **%@** will be shared.</source>
        <target>Profiilisi **%@** jaetaan.</target>
@@ -5920,19 +5556,11 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>aina</target>
        <note>pref value</note>
      </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
        <source>audio call (not e2e encrypted)</source>
        <target>äänipuhelu (ei e2e-salattu)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="author" xml:space="preserve">
-        <source>author</source>
-        <note>member role</note>
-      </trans-unit>
      <trans-unit id="bad message ID" xml:space="preserve">
        <source>bad message ID</source>
        <target>virheellinen viestin tunniste</target>
@@ -5943,10 +5571,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>virheellinen viestin tarkiste</target>
        <note>integrity error chat item</note>
      </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="bold" xml:space="preserve">
        <source>bold</source>
        <target>lihavoitu</target>
@@ -6116,10 +5740,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>poistettu</target>
        <note>deleted chat item</note>
      </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
      <trans-unit id="deleted group" xml:space="preserve">
        <source>deleted group</source>
        <target>poistettu ryhmä</target>
@@ -6404,8 +6024,7 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <source>off</source>
        <target>pois</target>
        <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
      </trans-unit>
      <trans-unit id="offered %@" xml:space="preserve">
        <source>offered %@</source>
@@ -6422,6 +6041,11 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>päällä</target>
        <note>group pref value</note>
      </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>tai keskustele kehittäjien kanssa</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="owner" xml:space="preserve">
        <source>owner</source>
        <target>omistaja</target>
@@ -6511,10 +6135,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>päivitetty ryhmäprofiili</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="v%@ (%@)" xml:space="preserve">
        <source>v%@ (%@)</source>
        <target>v%@ (%@)</target>
@@ -6652,10 +6272,6 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <target>SimpleX käyttää Face ID:tä paikalliseen todennukseen</target>
        <note>Privacy - Face ID Usage Description</note>
      </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
      <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
        <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
        <target>SimpleX tarvitsee mikrofonia ääni- ja videopuheluita ja ääniviestien tallentamista varten.</target>
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -84,10 +84,6 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ and %@ connected" xml:space="preserve">
        <source>%@ and %@ connected</source>
        <note>No comment provided by engineer.</note>
@@ -97,10 +93,6 @@
        <target>%1$@ ที่ %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
        <source>%@ is connected!</source>
        <target>%@ เชื่อมต่อสำเร็จ!</target>
@@ -126,10 +118,6 @@
        <target>%@ อยากเชื่อมต่อ!</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
        <source>%@, %@ and %lld other members connected</source>
        <note>No comment provided by engineer.</note>
@@ -194,27 +182,11 @@
        <target>%lld ไฟล์ที่มีขนาดรวม %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%lld members" xml:space="preserve">
        <source>%lld members</source>
        <target>%lld สมาชิก</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%lld minutes" xml:space="preserve">
        <source>%lld minutes</source>
        <target>%lld นาที</target>
@@ -284,14 +256,6 @@
        <target>(</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id=")" xml:space="preserve">
        <source>)</source>
        <target>)</target>
@@ -377,12 +341,6 @@
 - และอื่น ๆ!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve">
-        <source>- optionally notify deleted contacts.
- profile names with spaces.
- and more!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
        <source>- voice messages up to 5 minutes.
 - custom time to disappear.
@@ -397,10 +355,6 @@
        <target>.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
      <trans-unit id="0s" xml:space="preserve">
        <source>0s</source>
        <target>0s</target>
@@ -624,10 +578,6 @@
        <target>ข้อความทั้งหมดจะถูกลบ - ไม่สามารถยกเลิกได้! ข้อความจะถูกลบสำหรับคุณเท่านั้น.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
        <target>ผู้ติดต่อทั้งหมดของคุณจะยังคงเชื่อมต่ออยู่.</target>
@@ -733,14 +683,6 @@
        <target>เชื่อมต่อสำเร็จแล้ว?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Always use relay" xml:space="preserve">
        <source>Always use relay</source>
        <target>ใช้รีเลย์เสมอ</target>
@@ -860,10 +802,6 @@
        <target>กลับ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Bad message ID" xml:space="preserve">
        <source>Bad message ID</source>
        <target>ID ข้อความที่ไม่ดี</target>
@@ -874,31 +812,11 @@
        <target>แฮชข้อความไม่ดี</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Better groups" xml:space="preserve">
-        <source>Better groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>ข้อความที่ดีขึ้น</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block group members" xml:space="preserve">
-        <source>Block group members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
        <source>Both you and your contact can add message reactions.</source>
        <target>ทั้งคุณและผู้ติดต่อของคุณสามารถเพิ่มปฏิกิริยาของข้อความได้</target>
@@ -1159,34 +1077,21 @@
        <target>เชื่อมต่อ</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect automatically" xml:space="preserve">
-        <source>Connect automatically</source>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
        <source>Connect incognito</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>เชื่อมต่อผ่านลิงค์กลุ่ม?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via link" xml:space="preserve">
@@ -1203,18 +1108,6 @@ This is your own one-time link!</source>
        <source>Connect via one-time link</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
        <source>Connecting to server…</source>
        <target>กำลังเชื่อมต่อกับเซิร์ฟเวอร์…</target>
@@ -1225,10 +1118,6 @@ This is your own one-time link!</source>
        <target>กำลังเชื่อมต่อกับเซิร์ฟเวอร์... (ข้อผิดพลาด: %@)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection" xml:space="preserve">
        <source>Connection</source>
        <target>การเชื่อมต่อ</target>
@@ -1249,10 +1138,6 @@ This is your own one-time link!</source>
        <target>ส่งคําขอเชื่อมต่อแล้ว!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection timeout" xml:space="preserve">
        <source>Connection timeout</source>
        <target>หมดเวลาการเชื่อมต่อ</target>
@@ -1268,6 +1153,11 @@ This is your own one-time link!</source>
        <target>ผู้ติดต่อรายนี้มีอยู่แล้ว</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>ผู้ติดต่อและข้อความทั้งหมดจะถูกลบ - ไม่สามารถยกเลิกได้!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Contact hidden:" xml:space="preserve">
        <source>Contact hidden:</source>
        <target>ผู้ติดต่อถูกซ่อน:</target>
@@ -1318,10 +1208,6 @@ This is your own one-time link!</source>
        <target>รุ่นหลัก: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create" xml:space="preserve">
        <source>Create</source>
        <target>สร้าง</target>
@@ -1332,10 +1218,6 @@ This is your own one-time link!</source>
        <target>สร้างที่อยู่ SimpleX</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Create a group using a random profile." xml:space="preserve">
-        <source>Create a group using a random profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create an address to let people connect with you." xml:space="preserve">
        <source>Create an address to let people connect with you.</source>
        <target>สร้างที่อยู่เพื่อให้ผู้อื่นเชื่อมต่อกับคุณ</target>
@@ -1346,10 +1228,6 @@ This is your own one-time link!</source>
        <target>สร้างไฟล์</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create group link" xml:space="preserve">
        <source>Create group link</source>
        <target>สร้างลิงค์กลุ่ม</target>
@@ -1369,10 +1247,6 @@ This is your own one-time link!</source>
        <target>สร้างลิงก์เชิญแบบใช้ครั้งเดียว</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create queue" xml:space="preserve">
        <source>Create queue</source>
        <target>สร้างคิว</target>
@@ -1531,10 +1405,6 @@ This is your own one-time link!</source>
        <target>ลบ</target>
        <note>chat item action</note>
      </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete Contact" xml:space="preserve">
        <source>Delete Contact</source>
        <target>ลบผู้ติดต่อ</target>
@@ -1560,10 +1430,6 @@ This is your own one-time link!</source>
        <target>ลบไฟล์ทั้งหมด</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete archive" xml:space="preserve">
        <source>Delete archive</source>
        <target>ลบที่เก็บถาวร</target>
@@ -1594,9 +1460,9 @@ This is your own one-time link!</source>
        <target>ลบผู้ติดต่อ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>ลบผู้ติดต่อ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete database" xml:space="preserve">
@@ -1738,18 +1604,6 @@ This cannot be undone!</source>
        <target>คำอธิบาย</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>พัฒนา</target>
@@ -1840,16 +1694,18 @@ This cannot be undone!</source>
        <target>ตัดการเชื่อมต่อ</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Discover and join groups" xml:space="preserve">
        <source>Discover and join groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover via local network" xml:space="preserve">
-        <source>Discover via local network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>ชื่อที่แสดง</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>ชื่อที่แสดง:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2020,14 +1876,6 @@ This cannot be undone!</source>
        <target>ข้อความที่ encrypt: ข้อผิดพลาดที่ไม่คาดคิด</target>
        <note>notification</note>
      </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter Passcode" xml:space="preserve">
        <source>Enter Passcode</source>
        <target>ใส่รหัสผ่าน</target>
@@ -2038,10 +1886,6 @@ This cannot be undone!</source>
        <target>ใส่รหัสผ่านที่ถูกต้อง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter passphrase…" xml:space="preserve">
        <source>Enter passphrase…</source>
        <target>ใส่รหัสผ่าน</target>
@@ -2057,10 +1901,6 @@ This cannot be undone!</source>
        <target>ใส่เซิร์ฟเวอร์ด้วยตนเอง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter welcome message…" xml:space="preserve">
        <source>Enter welcome message…</source>
        <target>ใส่ข้อความต้อนรับ…</target>
@@ -2071,10 +1911,6 @@ This cannot be undone!</source>
        <target>ใส่ข้อความต้อนรับ… (ไม่บังคับ)</target>
        <note>placeholder</note>
      </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Error" xml:space="preserve">
        <source>Error</source>
        <target>ผิดพลาด</target>
@@ -2347,10 +2183,6 @@ This cannot be undone!</source>
        <target>ออกโดยไม่บันทึก</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
      <trans-unit id="Export database" xml:space="preserve">
        <source>Export database</source>
        <target>ส่งออกฐานข้อมูล</target>
@@ -2381,10 +2213,6 @@ This cannot be undone!</source>
        <target>รวดเร็วและไม่ต้องรอจนกว่าผู้ส่งจะออนไลน์!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
-        <source>Faster joining and more reliable messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Favorite" xml:space="preserve">
        <source>Favorite</source>
        <target>ที่ชอบ</target>
@@ -2480,10 +2308,6 @@ This cannot be undone!</source>
        <target>สำหรับคอนโซล</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Found desktop" xml:space="preserve">
-        <source>Found desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="French interface" xml:space="preserve">
        <source>French interface</source>
        <target>อินเทอร์เฟซภาษาฝรั่งเศส</target>
@@ -2504,10 +2328,6 @@ This cannot be undone!</source>
        <target>ชื่อเต็ม:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
        <source>Fully re-implemented - work in background!</source>
        <target>ดำเนินการใหม่อย่างสมบูรณ์ - ทำงานในพื้นหลัง!</target>
@@ -2528,14 +2348,6 @@ This cannot be undone!</source>
        <target>กลุ่ม</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Group display name" xml:space="preserve">
        <source>Group display name</source>
        <target>ชื่อกลุ่มที่แสดง</target>
@@ -2806,10 +2618,6 @@ This cannot be undone!</source>
        <target>ไม่ระบุตัวตน</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito groups" xml:space="preserve">
-        <source>Incognito groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Incognito mode" xml:space="preserve">
        <source>Incognito mode</source>
        <target>โหมดไม่ระบุตัวตน</target>
@@ -2839,10 +2647,6 @@ This cannot be undone!</source>
        <target>เวอร์ชันฐานข้อมูลที่เข้ากันไม่ได้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Incorrect passcode" xml:space="preserve">
        <source>Incorrect passcode</source>
        <target>รหัสผ่านไม่ถูกต้อง</target>
@@ -2890,10 +2694,6 @@ This cannot be undone!</source>
        <target>ลิงค์เชื่อมต่อไม่ถูกต้อง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invalid server address!" xml:space="preserve">
        <source>Invalid server address!</source>
        <target>ที่อยู่เซิร์ฟเวอร์ไม่ถูกต้อง!</target>
@@ -2984,33 +2784,16 @@ This cannot be undone!</source>
        <target>เข้าร่วมกลุ่ม</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Join incognito" xml:space="preserve">
        <source>Join incognito</source>
        <target>เข้าร่วมแบบไม่ระบุตัวตน</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Joining group" xml:space="preserve">
        <source>Joining group</source>
        <target>กำลังจะเข้าร่วมกลุ่ม</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">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
        <target>รักษาการเชื่อมต่อของคุณ</target>
@@ -3071,18 +2854,6 @@ This is your link for group %@!</source>
        <target>ข้อจำกัด</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Link mobile and desktop apps! 🔗" xml:space="preserve">
-        <source>Link mobile and desktop apps! 🔗</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Live message!" xml:space="preserve">
        <source>Live message!</source>
        <target>ข้อความสด!</target>
@@ -3233,10 +3004,6 @@ This is your link for group %@!</source>
        <target>ข้อความและไฟล์</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
        <target>กำลังย้ายข้อมูลที่เก็บถาวรของฐานข้อมูล…</target>
@@ -3429,10 +3196,6 @@ This is your link for group %@!</source>
        <target>ไม่มีไฟล์ที่ได้รับหรือส่ง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Not compatible!" xml:space="preserve">
-        <source>Not compatible!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>การแจ้งเตือน</target>
@@ -3586,10 +3349,6 @@ This is your link for group %@!</source>
        <target>เปิดคอนโซลการแชท</target>
        <note>authentication reason</note>
      </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Open user profiles" xml:space="preserve">
        <source>Open user profiles</source>
        <target>เปิดโปรไฟล์ผู้ใช้</target>
@@ -3605,6 +3364,11 @@ This is your link for group %@!</source>
        <target>กำลังเปิดฐานข้อมูล…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>การเปิดลิงก์ในเบราว์เซอร์อาจลดความเป็นส่วนตัวและความปลอดภัยของการเชื่อมต่อ ลิงก์ SimpleX ที่ไม่น่าเชื่อถือจะเป็นสีแดง</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>จํานวน PING</target>
@@ -3650,10 +3414,6 @@ This is your link for group %@!</source>
        <target>แปะ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Paste image" xml:space="preserve">
        <source>Paste image</source>
        <target>แปะภาพ</target>
@@ -3798,14 +3558,6 @@ This is your link for group %@!</source>
        <target>รูปโปรไฟล์</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>รหัสผ่านโปรไฟล์</target>
@@ -4049,14 +3801,6 @@ This is your link for group %@!</source>
        <target>เจรจา enryption ใหม่หรือไม่?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
        <source>Reply</source>
        <target>ตอบ</target>
@@ -4242,10 +3986,6 @@ This is your link for group %@!</source>
        <target>สแกนคิวอาร์โค้ด</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Scan code" xml:space="preserve">
        <source>Scan code</source>
        <target>สแกนรหัส</target>
@@ -4463,10 +4203,6 @@ This is your link for group %@!</source>
        <target>เซิร์ฟเวอร์</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Set 1 day" xml:space="preserve">
        <source>Set 1 day</source>
        <target>ตั้ง 1 วัน</target>
@@ -4774,10 +4510,6 @@ This is your link for group %@!</source>
        <target>แตะปุ่ม </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Tap to activate profile." xml:space="preserve">
        <source>Tap to activate profile.</source>
        <target>แตะเพื่อเปิดใช้งานโปรไฟล์</target>
@@ -4876,6 +4608,11 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>encryption กำลังทำงานและไม่จำเป็นต้องใช้ข้อตกลง encryption ใหม่ อาจทำให้การเชื่อมต่อผิดพลาดได้!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>กลุ่มมีการกระจายอำนาจอย่างเต็มที่ – มองเห็นได้เฉพาะสมาชิกเท่านั้น</target>
+        <note>No comment provided by engineer.</note>
+      </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>แฮชของข้อความก่อนหน้านี้แตกต่างกัน</target>
@@ -4960,10 +4697,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>การดำเนินการนี้ไม่สามารถยกเลิกได้ - โปรไฟล์ ผู้ติดต่อ ข้อความ และไฟล์ของคุณจะสูญหายไปอย่างถาวร</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
        <source>This group has over %lld members, delivery receipts are not sent.</source>
        <note>No comment provided by engineer.</note>
@@ -4973,14 +4706,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>ไม่มีกลุ่มนี้แล้ว</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
        <source>This setting applies to messages in your current chat profile **%@**.</source>
        <target>การตั้งค่านี้ใช้กับข้อความในโปรไฟล์แชทปัจจุบันของคุณ **%@**</target>
@@ -4996,10 +4721,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>เพื่อการเชื่อมต่อ ผู้ติดต่อของคุณสามารถสแกนคิวอาร์โค้ดหรือใช้ลิงก์ในแอป</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To hide unwanted messages." xml:space="preserve">
-        <source>To hide unwanted messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>เพื่อสร้างการเชื่อมต่อใหม่</target>
@@ -5081,18 +4802,6 @@ You will be prompted to complete authentication before this feature is enabled.<
        <target>ไม่สามารถบันทึกข้อความเสียง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>ข้อผิดพลาดที่ไม่คาดคิด: %@</target>
@@ -5155,14 +4864,6 @@ To connect, please ask your contact to create another connection link and check
 ในการเชื่อมต่อ โปรดขอให้ผู้ติดต่อของคุณสร้างลิงก์การเชื่อมต่ออื่น และตรวจสอบว่าคุณมีการเชื่อมต่อเครือข่ายที่เสถียร</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Unlock" xml:space="preserve">
        <source>Unlock</source>
        <target>ปลดล็อค</target>
@@ -5252,10 +4953,6 @@ To connect, please ask your contact to create another connection link and check
        <target>ใช้สำหรับการเชื่อมต่อใหม่</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Use iOS call interface" xml:space="preserve">
        <source>Use iOS call interface</source>
        <target>ใช้อินเทอร์เฟซการโทร iOS</target>
@@ -5285,23 +4982,11 @@ To connect, please ask your contact to create another connection link and check
        <target>กำลังใช้เซิร์ฟเวอร์ SimpleX Chat อยู่</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Verify connection security" xml:space="preserve">
        <source>Verify connection security</source>
        <target>ตรวจสอบความปลอดภัยในการเชื่อมต่อ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Verify security code" xml:space="preserve">
        <source>Verify security code</source>
        <target>ตรวจสอบรหัสความปลอดภัย</target>
@@ -5312,10 +4997,6 @@ To connect, please ask your contact to create another connection link and check
        <target>ผ่านเบราว์เซอร์</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Via secure quantum resistant protocol." xml:space="preserve">
-        <source>Via secure quantum resistant protocol.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Video call" xml:space="preserve">
        <source>Video call</source>
        <target>การสนทนาทางวิดีโอ</target>
@@ -5366,10 +5047,6 @@ To connect, please ask your contact to create another connection link and check
        <target>ข้อความเสียง…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Waiting for desktop..." xml:space="preserve">
-        <source>Waiting for desktop...</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Waiting for file" xml:space="preserve">
        <source>Waiting for file</source>
        <target>กำลังรอไฟล์</target>
@@ -5470,35 +5147,6 @@ To connect, please ask your contact to create another connection link and check
        <target>คุณได้เชื่อมต่อกับ %@ แล้ว</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
        <source>You are connected to the server used to receive messages from this contact.</source>
        <target>คุณเชื่อมต่อกับเซิร์ฟเวอร์ที่ใช้รับข้อความจากผู้ติดต่อนี้</target>
@@ -5594,15 +5242,6 @@ Repeat join request?</source>
        <target>เราไม่สามารถตรวจสอบคุณได้ กรุณาลองอีกครั้ง.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You have no chats" xml:space="preserve">
        <source>You have no chats</source>
        <target>คุณไม่มีการแชท</target>
@@ -5652,10 +5291,6 @@ Repeat connection request?</source>
        <target>คุณจะเชื่อมต่อกับกลุ่มเมื่ออุปกรณ์โฮสต์ของกลุ่มออนไลน์อยู่ โปรดรอหรือตรวจสอบภายหลัง!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
        <source>You will be connected when your connection request is accepted, please wait or check later!</source>
        <target>คุณจะเชื่อมต่อเมื่อคำขอเชื่อมต่อของคุณได้รับการยอมรับ โปรดรอหรือตรวจสอบในภายหลัง!</target>
@@ -5671,8 +5306,9 @@ Repeat connection request?</source>
        <target>คุณจะต้องตรวจสอบสิทธิ์เมื่อคุณเริ่มหรือกลับมาใช้แอปพลิเคชันอีกครั้งหลังจากผ่านไป 30 วินาทีในพื้นหลัง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>คุณจะเข้าร่วมกลุ่มที่ลิงก์นี้อ้างถึงและเชื่อมต่อกับสมาชิกในกลุ่ม</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5740,6 +5376,11 @@ Repeat connection request?</source>
        <target>ฐานข้อมูลการแชทของคุณไม่ได้ถูก encrypt - ตั้งรหัสผ่านเพื่อ encrypt</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>โปรไฟล์การแชทของคุณจะถูกส่งไปยังสมาชิกในกลุ่ม</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>โปรไฟล์แชทของคุณ</target>
@@ -5794,10 +5435,6 @@ You can change it in Settings.</source>
        <target>ความเป็นส่วนตัวของคุณ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
        <source>Your profile **%@** will be shared.</source>
        <note>No comment provided by engineer.</note>
@@ -5889,19 +5526,11 @@ SimpleX servers cannot see your profile.</source>
        <target>เสมอ</target>
        <note>pref value</note>
      </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
        <source>audio call (not e2e encrypted)</source>
        <target>การโทรด้วยเสียง (ไม่ได้ encrypt จากต้นจนจบ)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="author" xml:space="preserve">
-        <source>author</source>
-        <note>member role</note>
-      </trans-unit>
      <trans-unit id="bad message ID" xml:space="preserve">
        <source>bad message ID</source>
        <target>ID ข้อความที่ไม่ดี</target>
@@ -5912,10 +5541,6 @@ SimpleX servers cannot see your profile.</source>
        <target>แฮชข้อความไม่ดี</target>
        <note>integrity error chat item</note>
      </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="bold" xml:space="preserve">
        <source>bold</source>
        <target>ตัวหนา</target>
@@ -6085,10 +5710,6 @@ SimpleX servers cannot see your profile.</source>
        <target>ลบแล้ว</target>
        <note>deleted chat item</note>
      </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
      <trans-unit id="deleted group" xml:space="preserve">
        <source>deleted group</source>
        <target>กลุ่มที่ถูกลบ</target>
@@ -6371,8 +5992,7 @@ SimpleX servers cannot see your profile.</source>
        <source>off</source>
        <target>ปิด</target>
        <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
      </trans-unit>
      <trans-unit id="offered %@" xml:space="preserve">
        <source>offered %@</source>
@@ -6389,6 +6009,11 @@ SimpleX servers cannot see your profile.</source>
        <target>เปิด</target>
        <note>group pref value</note>
      </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>หรือแชทกับนักพัฒนาแอป</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="owner" xml:space="preserve">
        <source>owner</source>
        <target>เจ้าของ</target>
@@ -6478,10 +6103,6 @@ SimpleX servers cannot see your profile.</source>
        <target>อัปเดตโปรไฟล์กลุ่มแล้ว</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="v%@ (%@)" xml:space="preserve">
        <source>v%@ (%@)</source>
        <target>v%@ (%@)</target>
@@ -6619,10 +6240,6 @@ SimpleX servers cannot see your profile.</source>
        <target>SimpleX ใช้ Face ID สำหรับการรับรองความถูกต้องในเครื่อง</target>
        <note>Privacy - Face ID Usage Description</note>
      </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
      <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
        <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
        <target>SimpleX ต้องการการเข้าถึงไมโครโฟนสำหรับการโทรด้วยเสียงและวิดีโอ และเพื่อบันทึกข้อความเสียง</target>
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -87,10 +87,6 @@
        <target>%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ and %@" xml:space="preserve">
-        <source>%@ and %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ and %@ connected" xml:space="preserve">
        <source>%@ and %@ connected</source>
        <target>%@ і %@ підключено</target>
@@ -101,10 +97,6 @@
        <target>%1$@ за %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
-      <trans-unit id="%@ connected" xml:space="preserve">
-        <source>%@ connected</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
        <source>%@ is connected!</source>
        <target>%@ підключено!</target>
@@ -130,10 +122,6 @@
        <target>%@ хоче підключитися!</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
-        <source>%@, %@ and %lld members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
        <source>%@, %@ and %lld other members connected</source>
        <target>%@, %@ та %lld інші підключені учасники</target>
@@ -199,27 +187,11 @@
        <target>%lld файл(и) загальним розміром %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve">
-        <source>%lld group events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%lld members" xml:space="preserve">
        <source>%lld members</source>
        <target>%lld учасників</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld messages blocked" xml:space="preserve">
-        <source>%lld messages blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
-        <source>%lld messages marked deleted</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve">
-        <source>%lld messages moderated by %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="%lld minutes" xml:space="preserve">
        <source>%lld minutes</source>
        <target>%lld хвилин</target>
@@ -289,14 +261,6 @@
        <target>(</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="(new)" xml:space="preserve">
-        <source>(new)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="(this device v%@)" xml:space="preserve">
-        <source>(this device v%@)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id=")" xml:space="preserve">
        <source>)</source>
        <target>)</target>
@@ -382,12 +346,6 @@
 - і багато іншого!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve">
-        <source>- optionally notify deleted contacts.
- profile names with spaces.
- and more!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve">
        <source>- voice messages up to 5 minutes.
 - custom time to disappear.
@@ -402,10 +360,6 @@
        <target>.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="0 sec" xml:space="preserve">
-        <source>0 sec</source>
-        <note>time to disappear</note>
-      </trans-unit>
      <trans-unit id="0s" xml:space="preserve">
        <source>0s</source>
        <target>0с</target>
@@ -631,10 +585,6 @@
        <target>Всі повідомлення будуть видалені - це неможливо скасувати! Повідомлення будуть видалені ТІЛЬКИ для вас.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
-        <source>All new messages from %@ will be hidden!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
        <target>Всі ваші контакти залишаться на зв'язку.</target>
@@ -740,14 +690,6 @@
        <target>Вже підключено?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Already connecting!" xml:space="preserve">
-        <source>Already connecting!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Already joining the group!" xml:space="preserve">
-        <source>Already joining the group!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Always use relay" xml:space="preserve">
        <source>Always use relay</source>
        <target>Завжди використовуйте реле</target>
@@ -867,10 +809,6 @@
        <target>Назад</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve">
-        <source>Bad desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Bad message ID" xml:space="preserve">
        <source>Bad message ID</source>
        <target>Неправильний ідентифікатор повідомлення</target>
@@ -881,31 +819,11 @@
        <target>Поганий хеш повідомлення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Better groups" xml:space="preserve">
-        <source>Better groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Кращі повідомлення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Block" xml:space="preserve">
-        <source>Block</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block group members" xml:space="preserve">
-        <source>Block group members</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member" xml:space="preserve">
-        <source>Block member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Block member?" xml:space="preserve">
-        <source>Block member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
        <source>Both you and your contact can add message reactions.</source>
        <target>Реакції на повідомлення можете додавати як ви, так і ваш контакт.</target>
@@ -1166,8 +1084,9 @@
        <target>Підключіться</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Connect automatically" xml:space="preserve">
-        <source>Connect automatically</source>
+      <trans-unit id="Connect directly" xml:space="preserve">
+        <source>Connect directly</source>
+        <target>Підключіться безпосередньо</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
@@ -1175,26 +1094,14 @@
        <target>Підключайтеся інкогніто</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect to desktop" xml:space="preserve">
-        <source>Connect to desktop</source>
+      <trans-unit id="Connect via contact link" xml:space="preserve">
+        <source>Connect via contact link</source>
+        <target>Підключіться за контактним посиланням</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect to yourself?" xml:space="preserve">
-        <source>Connect to yourself?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve">
-        <source>Connect to yourself?
-This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact address" xml:space="preserve">
-        <source>Connect via contact address</source>
+      <trans-unit id="Connect via group link?" xml:space="preserve">
+        <source>Connect via group link?</source>
+        <target>Підключитися за груповим посиланням?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via link" xml:space="preserve">
@@ -1212,18 +1119,6 @@ This is your own one-time link!</source>
        <target>Під'єднатися за одноразовим посиланням</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect with %@" xml:space="preserve">
-        <source>Connect with %@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected desktop" xml:space="preserve">
-        <source>Connected desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connected to desktop" xml:space="preserve">
-        <source>Connected to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connecting server…" xml:space="preserve">
        <source>Connecting to server…</source>
        <target>Підключення до сервера…</target>
@@ -1234,10 +1129,6 @@ This is your own one-time link!</source>
        <target>Підключення до сервера... (помилка: %@)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connecting to desktop" xml:space="preserve">
-        <source>Connecting to desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection" xml:space="preserve">
        <source>Connection</source>
        <target>Підключення</target>
@@ -1258,10 +1149,6 @@ This is your own one-time link!</source>
        <target>Запит на підключення відправлено!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connection terminated" xml:space="preserve">
-        <source>Connection terminated</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connection timeout" xml:space="preserve">
        <source>Connection timeout</source>
        <target>Тайм-аут з'єднання</target>
@@ -1277,6 +1164,11 @@ This is your own one-time link!</source>
        <target>Контакт вже існує</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Contact and all messages will be deleted - this cannot be undone!" xml:space="preserve">
+        <source>Contact and all messages will be deleted - this cannot be undone!</source>
+        <target>Контакт і всі повідомлення будуть видалені - це неможливо скасувати!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Contact hidden:" xml:space="preserve">
        <source>Contact hidden:</source>
        <target>Контакт приховано:</target>
@@ -1327,10 +1219,6 @@ This is your own one-time link!</source>
        <target>Основна версія: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Correct name to %@?" xml:space="preserve">
-        <source>Correct name to %@?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create" xml:space="preserve">
        <source>Create</source>
        <target>Створити</target>
@@ -1341,10 +1229,6 @@ This is your own one-time link!</source>
        <target>Створіть адресу SimpleX</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Create a group using a random profile." xml:space="preserve">
-        <source>Create a group using a random profile.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create an address to let people connect with you." xml:space="preserve">
        <source>Create an address to let people connect with you.</source>
        <target>Створіть адресу, щоб люди могли з вами зв'язатися.</target>
@@ -1355,10 +1239,6 @@ This is your own one-time link!</source>
        <target>Створити файл</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Create group" xml:space="preserve">
-        <source>Create group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create group link" xml:space="preserve">
        <source>Create group link</source>
        <target>Створити групове посилання</target>
@@ -1378,10 +1258,6 @@ This is your own one-time link!</source>
        <target>Створіть одноразове посилання-запрошення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Create profile" xml:space="preserve">
-        <source>Create profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create queue" xml:space="preserve">
        <source>Create queue</source>
        <target>Створити чергу</target>
@@ -1540,10 +1416,6 @@ This is your own one-time link!</source>
        <target>Видалити</target>
        <note>chat item action</note>
      </trans-unit>
-      <trans-unit id="Delete %lld messages?" xml:space="preserve">
-        <source>Delete %lld messages?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete Contact" xml:space="preserve">
        <source>Delete Contact</source>
        <target>Видалити контакт</target>
@@ -1569,10 +1441,6 @@ This is your own one-time link!</source>
        <target>Видалити всі файли</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete and notify contact" xml:space="preserve">
-        <source>Delete and notify contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Delete archive" xml:space="preserve">
        <source>Delete archive</source>
        <target>Видалити архів</target>
@@ -1603,9 +1471,9 @@ This is your own one-time link!</source>
        <target>Видалити контакт</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Delete contact?&#10;This cannot be undone!" xml:space="preserve">
-        <source>Delete contact?
-This cannot be undone!</source>
+      <trans-unit id="Delete contact?" xml:space="preserve">
+        <source>Delete contact?</source>
+        <target>Видалити контакт?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete database" xml:space="preserve">
@@ -1748,18 +1616,6 @@ This cannot be undone!</source>
        <target>Опис</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Desktop address" xml:space="preserve">
-        <source>Desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop app version %@ is not compatible with this app." xml:space="preserve">
-        <source>Desktop app version %@ is not compatible with this app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Desktop devices" xml:space="preserve">
-        <source>Desktop devices</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
        <source>Develop</source>
        <target>Розробник</target>
@@ -1850,16 +1706,18 @@ This cannot be undone!</source>
        <target>Від'єднати</target>
        <note>server test step</note>
      </trans-unit>
-      <trans-unit id="Disconnect desktop?" xml:space="preserve">
-        <source>Disconnect desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Discover and join groups" xml:space="preserve">
        <source>Discover and join groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover via local network" xml:space="preserve">
-        <source>Discover via local network</source>
+      <trans-unit id="Display name" xml:space="preserve">
+        <source>Display name</source>
+        <target>Відображуване ім'я</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Display name:" xml:space="preserve">
+        <source>Display name:</source>
+        <target>Відображуване ім'я:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -2030,14 +1888,6 @@ This cannot be undone!</source>
        <target>Зашифроване повідомлення: несподівана помилка</target>
        <note>notification</note>
      </trans-unit>
-      <trans-unit id="Encryption re-negotiation error" xml:space="preserve">
-        <source>Encryption re-negotiation error</source>
-        <note>message decrypt error item</note>
-      </trans-unit>
-      <trans-unit id="Encryption re-negotiation failed." xml:space="preserve">
-        <source>Encryption re-negotiation failed.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter Passcode" xml:space="preserve">
        <source>Enter Passcode</source>
        <target>Введіть пароль</target>
@@ -2048,10 +1898,6 @@ This cannot be undone!</source>
        <target>Введіть правильну парольну фразу.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enter group name…" xml:space="preserve">
-        <source>Enter group name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter passphrase…" xml:space="preserve">
        <source>Enter passphrase…</source>
        <target>Введіть пароль…</target>
@@ -2067,10 +1913,6 @@ This cannot be undone!</source>
        <target>Увійдіть на сервер вручну</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Enter this device name…" xml:space="preserve">
-        <source>Enter this device name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Enter welcome message…" xml:space="preserve">
        <source>Enter welcome message…</source>
        <target>Введіть вітальне повідомлення…</target>
@@ -2081,10 +1923,6 @@ This cannot be undone!</source>
        <target>Введіть вітальне повідомлення... (необов'язково)</target>
        <note>placeholder</note>
      </trans-unit>
-      <trans-unit id="Enter your name…" xml:space="preserve">
-        <source>Enter your name…</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Error" xml:space="preserve">
        <source>Error</source>
        <target>Помилка</target>
@@ -2357,10 +2195,6 @@ This cannot be undone!</source>
        <target>Вихід без збереження</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Expand" xml:space="preserve">
-        <source>Expand</source>
-        <note>chat item action</note>
-      </trans-unit>
      <trans-unit id="Export database" xml:space="preserve">
        <source>Export database</source>
        <target>Експорт бази даних</target>
@@ -2391,10 +2225,6 @@ This cannot be undone!</source>
        <target>Швидко і без очікування, поки відправник буде онлайн!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Faster joining and more reliable messages." xml:space="preserve">
-        <source>Faster joining and more reliable messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Favorite" xml:space="preserve">
        <source>Favorite</source>
        <target>Улюблений</target>
@@ -2490,10 +2320,6 @@ This cannot be undone!</source>
        <target>Для консолі</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Found desktop" xml:space="preserve">
-        <source>Found desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="French interface" xml:space="preserve">
        <source>French interface</source>
        <target>Французький інтерфейс</target>
@@ -2514,10 +2340,6 @@ This cannot be undone!</source>
        <target>Повне ім'я:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
-        <source>Fully decentralized – visible only to members.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
        <source>Fully re-implemented - work in background!</source>
        <target>Повністю перероблено - робота у фоновому режимі!</target>
@@ -2538,14 +2360,6 @@ This cannot be undone!</source>
        <target>Група</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group already exists" xml:space="preserve">
-        <source>Group already exists</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Group already exists!" xml:space="preserve">
-        <source>Group already exists!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Group display name" xml:space="preserve">
        <source>Group display name</source>
        <target>Назва групи для відображення</target>
@@ -2816,10 +2630,6 @@ This cannot be undone!</source>
        <target>Інкогніто</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incognito groups" xml:space="preserve">
-        <source>Incognito groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Incognito mode" xml:space="preserve">
        <source>Incognito mode</source>
        <target>Режим інкогніто</target>
@@ -2850,10 +2660,6 @@ This cannot be undone!</source>
        <target>Несумісна версія бази даних</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Incompatible version" xml:space="preserve">
-        <source>Incompatible version</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Incorrect passcode" xml:space="preserve">
        <source>Incorrect passcode</source>
        <target>Неправильний пароль</target>
@@ -2901,10 +2707,6 @@ This cannot be undone!</source>
        <target>Неправильне посилання для підключення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Invalid name!" xml:space="preserve">
-        <source>Invalid name!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Invalid server address!" xml:space="preserve">
        <source>Invalid server address!</source>
        <target>Неправильна адреса сервера!</target>
@@ -2996,33 +2798,16 @@ This cannot be undone!</source>
        <target>Приєднуйтесь до групи</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Join group?" xml:space="preserve">
-        <source>Join group?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Join incognito" xml:space="preserve">
        <source>Join incognito</source>
        <target>Приєднуйтесь інкогніто</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Join with current profile" xml:space="preserve">
-        <source>Join with current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Join your group?&#10;This is your link for group %@!" xml:space="preserve">
-        <source>Join your group?
-This is your link for group %@!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Joining group" xml:space="preserve">
        <source>Joining group</source>
        <target>Приєднання до групи</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">
-        <source>Keep the app open to use it from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
        <target>Зберігайте свої зв'язки</target>
@@ -3083,18 +2868,6 @@ This is your link for group %@!</source>
        <target>Обмеження</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Link mobile and desktop apps! 🔗" xml:space="preserve">
-        <source>Link mobile and desktop apps! 🔗</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktop options" xml:space="preserve">
-        <source>Linked desktop options</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Linked desktops" xml:space="preserve">
-        <source>Linked desktops</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Live message!" xml:space="preserve">
        <source>Live message!</source>
        <target>Живе повідомлення!</target>
@@ -3245,10 +3018,6 @@ This is your link for group %@!</source>
        <target>Повідомлення та файли</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Messages from %@ will be shown!" xml:space="preserve">
-        <source>Messages from %@ will be shown!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Migrating database archive…" xml:space="preserve">
        <source>Migrating database archive…</source>
        <target>Перенесення архіву бази даних…</target>
@@ -3443,10 +3212,6 @@ This is your link for group %@!</source>
        <target>Немає отриманих або відправлених файлів</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Not compatible!" xml:space="preserve">
-        <source>Not compatible!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Сповіщення</target>
@@ -3600,10 +3365,6 @@ This is your link for group %@!</source>
        <target>Відкрийте консоль чату</target>
        <note>authentication reason</note>
      </trans-unit>
-      <trans-unit id="Open group" xml:space="preserve">
-        <source>Open group</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Open user profiles" xml:space="preserve">
        <source>Open user profiles</source>
        <target>Відкрити профілі користувачів</target>
@@ -3619,6 +3380,11 @@ This is your link for group %@!</source>
        <target>Відкриття бази даних…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." xml:space="preserve">
+        <source>Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.</source>
+        <target>Відкриття посилання в браузері може знизити конфіденційність і безпеку з'єднання. Ненадійні посилання SimpleX будуть червоного кольору.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>Кількість PING</target>
@@ -3664,10 +3430,6 @@ This is your link for group %@!</source>
        <target>Вставити</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste desktop address" xml:space="preserve">
-        <source>Paste desktop address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Paste image" xml:space="preserve">
        <source>Paste image</source>
        <target>Вставити зображення</target>
@@ -3813,14 +3575,6 @@ This is your link for group %@!</source>
        <target>Зображення профілю</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Пароль до профілю</target>
@@ -4066,14 +3820,6 @@ This is your link for group %@!</source>
        <target>Переузгодьте шифрування?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Repeat connection request?" xml:space="preserve">
-        <source>Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Repeat join request?" xml:space="preserve">
-        <source>Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Reply" xml:space="preserve">
        <source>Reply</source>
        <target>Відповісти</target>
@@ -4259,10 +4005,6 @@ This is your link for group %@!</source>
        <target>Відскануйте QR-код</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Scan QR code from desktop" xml:space="preserve">
-        <source>Scan QR code from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Scan code" xml:space="preserve">
        <source>Scan code</source>
        <target>Сканувати код</target>
@@ -4482,10 +4224,6 @@ This is your link for group %@!</source>
        <target>Сервери</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Session code" xml:space="preserve">
-        <source>Session code</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Set 1 day" xml:space="preserve">
        <source>Set 1 day</source>
        <target>Встановити 1 день</target>
@@ -4795,10 +4533,6 @@ This is your link for group %@!</source>
        <target>Натисніть кнопку </target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Tap to Connect" xml:space="preserve">
-        <source>Tap to Connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Tap to activate profile." xml:space="preserve">
        <source>Tap to activate profile.</source>
        <target>Натисніть, щоб активувати профіль.</target>
@@ -4896,6 +4630,11 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Шифрування працює і нова угода про шифрування не потрібна. Це може призвести до помилок з'єднання!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The group is fully decentralized – it is visible only to the members." xml:space="preserve">
+        <source>The group is fully decentralized – it is visible only to the members.</source>
+        <target>Група повністю децентралізована - її бачать лише учасники.</target>
+        <note>No comment provided by engineer.</note>
+      </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>Хеш попереднього повідомлення відрізняється.</target>
@@ -4981,10 +4720,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Цю дію неможливо скасувати - ваш профіль, контакти, повідомлення та файли будуть безповоротно втрачені.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This device name" xml:space="preserve">
-        <source>This device name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
        <source>This group has over %lld members, delivery receipts are not sent.</source>
        <target>У цій групі більше %lld учасників, підтвердження доставки не надсилаються.</target>
@@ -4995,14 +4730,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Цієї групи більше не існує.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="This is your own SimpleX address!" xml:space="preserve">
-        <source>This is your own SimpleX address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="This is your own one-time link!" xml:space="preserve">
-        <source>This is your own one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
        <source>This setting applies to messages in your current chat profile **%@**.</source>
        <target>Це налаштування застосовується до повідомлень у вашому поточному профілі чату **%@**.</target>
@@ -5018,10 +4745,6 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Щоб підключитися, ваш контакт може відсканувати QR-код або скористатися посиланням у додатку.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="To hide unwanted messages." xml:space="preserve">
-        <source>To hide unwanted messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="To make a new connection" xml:space="preserve">
        <source>To make a new connection</source>
        <target>Щоб створити нове з'єднання</target>
@@ -5103,18 +4826,6 @@ You will be prompted to complete authentication before this feature is enabled.<
        <target>Не вдається записати голосове повідомлення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Unblock" xml:space="preserve">
-        <source>Unblock</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member" xml:space="preserve">
-        <source>Unblock member</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unblock member?" xml:space="preserve">
-        <source>Unblock member?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Unexpected error: %@" xml:space="preserve">
        <source>Unexpected error: %@</source>
        <target>Неочікувана помилка: %@</target>
@@ -5177,14 +4888,6 @@ To connect, please ask your contact to create another connection link and check
 Щоб підключитися, попросіть вашого контакта створити інше посилання і перевірте, чи маєте ви стабільне з'єднання з мережею.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Unlink" xml:space="preserve">
-        <source>Unlink</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Unlink desktop?" xml:space="preserve">
-        <source>Unlink desktop?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Unlock" xml:space="preserve">
        <source>Unlock</source>
        <target>Розблокувати</target>
@@ -5275,10 +4978,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Використовуйте для нових з'єднань</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Use from desktop" xml:space="preserve">
-        <source>Use from desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Use iOS call interface" xml:space="preserve">
        <source>Use iOS call interface</source>
        <target>Використовуйте інтерфейс виклику iOS</target>
@@ -5309,23 +5008,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Використання серверів SimpleX Chat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Verify code with desktop" xml:space="preserve">
-        <source>Verify code with desktop</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Verify connection" xml:space="preserve">
-        <source>Verify connection</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Verify connection security" xml:space="preserve">
        <source>Verify connection security</source>
        <target>Перевірте безпеку з'єднання</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Verify connections" xml:space="preserve">
-        <source>Verify connections</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Verify security code" xml:space="preserve">
        <source>Verify security code</source>
        <target>Підтвердіть код безпеки</target>
@@ -5336,10 +5023,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Через браузер</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Via secure quantum resistant protocol." xml:space="preserve">
-        <source>Via secure quantum resistant protocol.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Video call" xml:space="preserve">
        <source>Video call</source>
        <target>Відеодзвінок</target>
@@ -5390,10 +5073,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Голосове повідомлення…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Waiting for desktop..." xml:space="preserve">
-        <source>Waiting for desktop...</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Waiting for file" xml:space="preserve">
        <source>Waiting for file</source>
        <target>Очікування файлу</target>
@@ -5494,35 +5173,6 @@ To connect, please ask your contact to create another connection link and check
        <target>Ви вже підключені до %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You are already connecting to %@." xml:space="preserve">
-        <source>You are already connecting to %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already connecting via this one-time link!" xml:space="preserve">
-        <source>You are already connecting via this one-time link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already in group %@." xml:space="preserve">
-        <source>You are already in group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group %@." xml:space="preserve">
-        <source>You are already joining the group %@.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link!" xml:space="preserve">
-        <source>You are already joining the group via this link!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group via this link." xml:space="preserve">
-        <source>You are already joining the group via this link.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You are already joining the group!&#10;Repeat join request?" xml:space="preserve">
-        <source>You are already joining the group!
-Repeat join request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
        <source>You are connected to the server used to receive messages from this contact.</source>
        <target>Ви підключені до сервера, який використовується для отримання повідомлень від цього контакту.</target>
@@ -5618,15 +5268,6 @@ Repeat join request?</source>
        <target>Вас не вдалося верифікувати, спробуйте ще раз.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You have already requested connection via this address!" xml:space="preserve">
-        <source>You have already requested connection via this address!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="You have already requested connection!&#10;Repeat connection request?" xml:space="preserve">
-        <source>You have already requested connection!
-Repeat connection request?</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You have no chats" xml:space="preserve">
        <source>You have no chats</source>
        <target>У вас немає чатів</target>
@@ -5677,10 +5318,6 @@ Repeat connection request?</source>
        <target>Ви будете підключені до групи, коли пристрій господаря групи буде в мережі, будь ласка, зачекайте або перевірте пізніше!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
-        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
        <source>You will be connected when your connection request is accepted, please wait or check later!</source>
        <target>Ви будете підключені, коли ваш запит на підключення буде прийнято, будь ласка, зачекайте або перевірте пізніше!</target>
@@ -5696,8 +5333,9 @@ Repeat connection request?</source>
        <target>Вам потрібно буде пройти автентифікацію при запуску або відновленні програми після 30 секунд роботи у фоновому режимі.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You will connect to all group members." xml:space="preserve">
-        <source>You will connect to all group members.</source>
+      <trans-unit id="You will join a group this link refers to and connect to its group members." xml:space="preserve">
+        <source>You will join a group this link refers to and connect to its group members.</source>
+        <target>Ви приєднаєтеся до групи, на яку посилається це посилання, і з'єднаєтеся з її учасниками.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You will still receive calls and notifications from muted profiles when they are active." xml:space="preserve">
@@ -5765,6 +5403,11 @@ Repeat connection request?</source>
        <target>Ваша база даних чату не зашифрована - встановіть ключову фразу, щоб зашифрувати її.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
+        <source>Your chat profile will be sent to group members</source>
+        <target>Ваш профіль у чаті буде надіслано учасникам групи</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Ваші профілі чату</target>
@@ -5819,10 +5462,6 @@ You can change it in Settings.</source>
        <target>Ваша конфіденційність</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile" xml:space="preserve">
-        <source>Your profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
        <source>Your profile **%@** will be shared.</source>
        <target>Ваш профіль **%@** буде опублікований.</target>
@@ -5915,19 +5554,11 @@ SimpleX servers cannot see your profile.</source>
        <target>завжди</target>
        <note>pref value</note>
      </trans-unit>
-      <trans-unit id="and %lld other events" xml:space="preserve">
-        <source>and %lld other events</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="audio call (not e2e encrypted)" xml:space="preserve">
        <source>audio call (not e2e encrypted)</source>
        <target>аудіовиклик (без шифрування e2e)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="author" xml:space="preserve">
-        <source>author</source>
-        <note>member role</note>
-      </trans-unit>
      <trans-unit id="bad message ID" xml:space="preserve">
        <source>bad message ID</source>
        <target>невірний ідентифікатор повідомлення</target>
@@ -5938,10 +5569,6 @@ SimpleX servers cannot see your profile.</source>
        <target>невірний хеш повідомлення</target>
        <note>integrity error chat item</note>
      </trans-unit>
-      <trans-unit id="blocked" xml:space="preserve">
-        <source>blocked</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="bold" xml:space="preserve">
        <source>bold</source>
        <target>жирний</target>
@@ -6111,10 +5738,6 @@ SimpleX servers cannot see your profile.</source>
        <target>видалено</target>
        <note>deleted chat item</note>
      </trans-unit>
-      <trans-unit id="deleted contact" xml:space="preserve">
-        <source>deleted contact</source>
-        <note>rcv direct event chat item</note>
-      </trans-unit>
      <trans-unit id="deleted group" xml:space="preserve">
        <source>deleted group</source>
        <target>видалено групу</target>
@@ -6399,8 +6022,7 @@ SimpleX servers cannot see your profile.</source>
        <source>off</source>
        <target>вимкнено</target>
        <note>enabled status
-   group pref value
-   time to disappear</note>
+   group pref value</note>
      </trans-unit>
      <trans-unit id="offered %@" xml:space="preserve">
        <source>offered %@</source>
@@ -6417,6 +6039,11 @@ SimpleX servers cannot see your profile.</source>
        <target>увімкнено</target>
        <note>group pref value</note>
      </trans-unit>
+      <trans-unit id="or chat with the developers" xml:space="preserve">
+        <source>or chat with the developers</source>
+        <target>або поспілкуйтеся з розробниками</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="owner" xml:space="preserve">
        <source>owner</source>
        <target>власник</target>
@@ -6506,10 +6133,6 @@ SimpleX servers cannot see your profile.</source>
        <target>оновлений профіль групи</target>
        <note>rcv group event chat item</note>
      </trans-unit>
-      <trans-unit id="v%@" xml:space="preserve">
-        <source>v%@</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="v%@ (%@)" xml:space="preserve">
        <source>v%@ (%@)</source>
        <target>v%@ (%@)</target>
@@ -6647,10 +6270,6 @@ SimpleX servers cannot see your profile.</source>
        <target>SimpleX використовує Face ID для локальної автентифікації</target>
        <note>Privacy - Face ID Usage Description</note>
      </trans-unit>
-      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
-        <source>SimpleX uses local network access to allow using user chat profile via desktop app on the same network.</source>
-        <note>Privacy - Local Network Usage Description</note>
-      </trans-unit>
      <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
        <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
        <target>SimpleX потребує доступу до мікрофона для аудіо та відео дзвінків, а також для запису голосових повідомлень.</target>
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */
@@ -1,64 +0,0 @@
-//
-//  ConcurrentQueue.swift
-//  SimpleX NSE
-//
-//  Created by Evgeny on 08/12/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-
-struct DequeueElement<T> {
-    var elementId: UUID?
-    var task: Task<T?, Never>
-}
-
-class ConcurrentQueue<T> {
-    private var queue: [T] = []
-    private var queueLock = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.concurrent-queue.lock.\(UUID())")
-    private var continuations = [(elementId: UUID, continuation: CheckedContinuation<T?, Never>)]()
-
-    func enqueue(_ el: T) {
-        resumeContinuation(el) { self.queue.append(el) }
-    }
-
-    func frontEnqueue(_ el: T) {
-        resumeContinuation(el) { self.queue.insert(el, at: 0) }
-    }
-
-    private func resumeContinuation(_ el: T, add: @escaping () -> Void) {
-        queueLock.sync {
-            if let (_, cont) = continuations.first {
-                continuations.remove(at: 0)
-                cont.resume(returning: el)
-            } else {
-                add()
-            }
-        }
-    }
-
-    func dequeue() -> DequeueElement<T> {
-        queueLock.sync {
-            if queue.isEmpty {
-                let elementId = UUID()
-                let task = Task {
-                    await withCheckedContinuation { cont in
-                        continuations.append((elementId, cont))
-                    }
-                }
-                return DequeueElement(elementId: elementId, task: task)
-            } else {
-                let el = queue.remove(at: 0)
-                return DequeueElement(task: Task { el })
-            }
-        }
-    }
-
-    func cancelDequeue(_ elementId: UUID) {
-        queueLock.sync {
-            let cancelled = continuations.filter { $0.elementId == elementId }
-            continuations.removeAll { $0.elementId == elementId }
-            cancelled.forEach { $0.continuation.resume(returning: nil) }
-        }
-    }
-}
@@ -14,233 +14,91 @@ import SimpleXChat

 let logger = Logger()

-let appSuspendingDelay: UInt64 = 2_500_000_000
+let suspendingDelay: UInt64 = 2_000_000_000

-typealias SuspendSchedule = (delay: TimeInterval, timeout: Int)
+typealias NtfStream = AsyncStream<NSENotification>

-let nseSuspendSchedule: SuspendSchedule = (2, 4)
-
-let fastNSESuspendSchedule: SuspendSchedule = (1, 1)
-
-typealias NtfStream = ConcurrentQueue<NSENotification>
-
-// Notifications are delivered via concurrent queues, as they are all received from chat controller in a single loop that
-// writes to ConcurrentQueue and when notification is processed, the instance of Notification service extension reads from the queue.
-// One queue per connection (entity) is used.
-// The concurrent queues allow read cancellation, to ensure that notifications are not lost in case the current thread completes
-// before expected notification is read (multiple notifications can be expected, because one notification can be delivered for several messages).
 actor PendingNtfs {
    static let shared = PendingNtfs()
    private var ntfStreams: [String: NtfStream] = [:]
+    private var ntfConts: [String: NtfStream.Continuation] = [:]

-    func createStream(_ id: String) async {
-        logger.debug("NotificationService PendingNtfs.createStream: \(id)")
-        if ntfStreams[id] == nil {
-            ntfStreams[id] = ConcurrentQueue()
-            logger.debug("NotificationService PendingNtfs.createStream: created ConcurrentQueue")
+    func createStream(_ id: String) {
+        logger.debug("PendingNtfs.createStream: \(id, privacy: .public)")
+        if ntfStreams.index(forKey: id) == nil {
+            ntfStreams[id] = AsyncStream { cont in
+                ntfConts[id] = cont
+                logger.debug("PendingNtfs.createStream: store continuation")
+            }
        }
    }

-    func readStream(_ id: String, for nse: NotificationService, ntfInfo: NtfMessages) async {
-        logger.debug("NotificationService PendingNtfs.readStream: \(id) \(ntfInfo.ntfMessages.count)")
-        if !ntfInfo.user.showNotifications {
-            nse.setBestAttemptNtf(.empty)
-        }
+    func readStream(_ id: String, for nse: NotificationService, msgCount: Int = 1, showNotifications: Bool) async {
+        logger.debug("PendingNtfs.readStream: \(id, privacy: .public) \(msgCount, privacy: .public)")
        if let s = ntfStreams[id] {
-            logger.debug("NotificationService PendingNtfs.readStream: has stream")
-            var expected = Set(ntfInfo.ntfMessages.map { $0.msgId })
-            logger.debug("NotificationService PendingNtfs.readStream: expecting: \(expected)")
-            var readCancelled = false
-            var dequeued: DequeueElement<NSENotification>?
-            nse.cancelRead = {
-                readCancelled = true
-                if let elementId = dequeued?.elementId {
-                    s.cancelDequeue(elementId)
-                }
+            logger.debug("PendingNtfs.readStream: has stream")
+            var rcvCount = max(1, msgCount)
+            for await ntf in s {
+                nse.setBestAttemptNtf(showNotifications ? ntf : .empty)
+                rcvCount -= 1
+                if rcvCount == 0 || ntf.categoryIdentifier == ntfCategoryCallInvitation { break }
            }
-            while !readCancelled {
-                dequeued = s.dequeue()
-                if let ntf = await dequeued?.task.value {
-                    if readCancelled {
-                        logger.debug("NotificationService PendingNtfs.readStream: read cancelled, put ntf to queue front")
-                        s.frontEnqueue(ntf)
-                        break
-                    } else if case let .msgInfo(info) = ntf {
-                        let found = expected.remove(info.msgId)
-                        if found != nil {
-                            logger.debug("NotificationService PendingNtfs.readStream: msgInfo, last: \(expected.isEmpty)")
-                            if expected.isEmpty { break }
-                        } else if let msgTs = ntfInfo.msgTs, info.msgTs > msgTs {
-                            logger.debug("NotificationService PendingNtfs.readStream: unexpected msgInfo")
-                            s.frontEnqueue(ntf)
-                            break
-                        }
-                    } else if ntfInfo.user.showNotifications {
-                        logger.debug("NotificationService PendingNtfs.readStream: setting best attempt")
-                        nse.setBestAttemptNtf(ntf)
-                        if ntf.isCallInvitation { break }
-                    }
-                } else {
-                    break
-                }
-            }
-            nse.cancelRead = nil
-            logger.debug("NotificationService PendingNtfs.readStream: exiting")
+            logger.debug("PendingNtfs.readStream: exiting")
        }
    }

-    func writeStream(_ id: String, _ ntf: NSENotification) async {
-        logger.debug("NotificationService PendingNtfs.writeStream: \(id)")
-        if let s = ntfStreams[id] {
-            logger.debug("NotificationService PendingNtfs.writeStream: writing ntf")
-            s.enqueue(ntf)
-        }
-    }
-}
-
-// The current implementation assumes concurrent notification delivery and uses semaphores
-// to process only one notification per connection (entity) at a time.
-class NtfStreamSemaphores {
-    static let shared = NtfStreamSemaphores()
-    private static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-semaphores.lock")
-    private var semaphores: [String: DispatchSemaphore] = [:]
-
-    func waitForStream(_ id: String) {
-        streamSemaphore(id, value: 0)?.wait()
-    }
-
-    func signalStreamReady(_ id: String) {
-        streamSemaphore(id, value: 1)?.signal()
-    }
-
-    // this function returns nil if semaphore is just created, so passed value shoud be coordinated with the desired end value of the semaphore
-    private func streamSemaphore(_ id: String, value: Int) -> DispatchSemaphore? {
-        NtfStreamSemaphores.queue.sync {
-            if let s = semaphores[id] {
-                return s
-            } else {
-                semaphores[id] = DispatchSemaphore(value: value)
-                return nil
-            }
+    func writeStream(_ id: String, _ ntf: NSENotification) {
+        logger.debug("PendingNtfs.writeStream: \(id, privacy: .public)")
+        if let cont = ntfConts[id] {
+            logger.debug("PendingNtfs.writeStream: writing ntf")
+            cont.yield(ntf)
        }
    }
 }

 enum NSENotification {
-    case nse(UNMutableNotificationContent)
-    case callkit(RcvCallInvitation)
+    case nse(notification: UNMutableNotificationContent)
+    case callkit(invitation: RcvCallInvitation)
    case empty
-    case msgInfo(NtfMsgInfo)

-    var isCallInvitation: Bool {
+    var categoryIdentifier: String? {
        switch self {
-        case let .nse(ntf): ntf.categoryIdentifier == ntfCategoryCallInvitation
-        case .callkit: true
-        case .empty: false
-        case .msgInfo: false
+        case let .nse(ntf): return ntf.categoryIdentifier
+        case .callkit: return ntfCategoryCallInvitation
+        case .empty: return nil
        }
    }
 }

-// Once the last thread in the process completes processing chat controller is suspended, and the database is closed, to avoid
-// background crashes and contention for database with the application (both UI and background fetch triggered either on schedule
-// or when background notification is received.
-class NSEThreads {
-    static let shared = NSEThreads()
-    private static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
-    private var allThreads: Set<UUID> = []
-    private var activeThreads: Set<UUID> = []
-
-    func newThread() -> UUID {
-        NSEThreads.queue.sync {
-            let (_, t) = allThreads.insert(UUID())
-            return t
-        }
-    }
-
-    func startThread(_ t: UUID) {
-        NSEThreads.queue.sync {
-            if allThreads.contains(t) {
-                _ = activeThreads.insert(t)
-            } else {
-                logger.warning("NotificationService startThread: thread \(t) was removed before it started")
-            }
-        }
-    }
-
-    func endThread(_ t: UUID) -> Bool {
-        NSEThreads.queue.sync {
-            let tActive = activeThreads.remove(t)
-            let t = allThreads.remove(t)
-            if tActive != nil && activeThreads.isEmpty {
-                return true
-            }
-            if t != nil && allThreads.isEmpty {
-                NSEChatState.shared.set(.suspended)
-            }
-            return false
-        }
-    }
-
-    var noThreads: Bool {
-        allThreads.isEmpty
-    }
-}
-
-// Notification service extension creates a new instance of the class and calls didReceive for each notification.
-// Each didReceive is called in its own thread, but multiple calls can be made in one process, and, empirically, there is never
-// more than one process of notification service extension exists at a time.
-// Soon after notification service delivers the last notification it is either suspended or terminated.
 class NotificationService: UNNotificationServiceExtension {
    var contentHandler: ((UNNotificationContent) -> Void)?
    var bestAttemptNtf: NSENotification?
    var badgeCount: Int = 0
-    // thread is added to allThreads here - if thread did not start chat,
-    // chat does not need to be suspended but NSE state still needs to be set to "suspended".
-    var threadId: UUID? = NSEThreads.shared.newThread()
-    var receiveEntityId: String?
-    var cancelRead: (() -> Void)?
-    var appSubscriber: AppSubscriber?
-    var returnedSuspension = false

    override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
        logger.debug("DEBUGGING: NotificationService.didReceive")
-        let ntf = if let ntf_ = request.content.mutableCopy() as? UNMutableNotificationContent { ntf_ } else { UNMutableNotificationContent() }
-        setBestAttemptNtf(ntf)
+        if let ntf = request.content.mutableCopy() as? UNMutableNotificationContent {
+            setBestAttemptNtf(ntf)
+        }
        self.contentHandler = contentHandler
        registerGroupDefaults()
        let appState = appStateGroupDefault.get()
-        logger.debug("NotificationService: app is \(appState.rawValue)")
        switch appState {
-        case .stopped:
-            setBadgeCount()
-            setBestAttemptNtf(createAppStoppedNtf())
-            deliverBestAttemptNtf()
        case .suspended:
+            logger.debug("NotificationService: app is suspended")
            setBadgeCount()
            receiveNtfMessages(request, contentHandler)
        case .suspending:
+            logger.debug("NotificationService: app is suspending")
            setBadgeCount()
            Task {
-                let state: AppState = await withCheckedContinuation { cont in
-                    appSubscriber = appStateSubscriber { s in
-                        if s == .suspended { appSuspension(s) }
-                    }
-                    DispatchQueue.global().asyncAfter(deadline: .now() + Double(appSuspendTimeout) + 1) {
-                        logger.debug("NotificationService: appSuspension timeout")
-                        appSuspension(appStateGroupDefault.get())
-                    }
-
-                    @Sendable
-                    func appSuspension(_ s: AppState) {
-                        if !self.returnedSuspension {
-                            self.returnedSuspension = true
-                            self.appSubscriber = nil // this disposes of appStateSubscriber
-                            cont.resume(returning: s)
-                        }
-                    }
+                var state = appState
+                for _ in 1...5 {
+                    _ = try await Task.sleep(nanoseconds: suspendingDelay)
+                    state = appStateGroupDefault.get()
+                    if state == .suspended || state != .suspending { break }
                }
-                logger.debug("NotificationService: app state is now \(state.rawValue)")
+                logger.debug("NotificationService: app state is \(state.rawValue, privacy: .public)")
                if state.inactive {
                    receiveNtfMessages(request, contentHandler)
                } else {
@@ -248,6 +106,7 @@ class NotificationService: UNNotificationServiceExtension {
                }
            }
        default:
+            logger.debug("NotificationService: app state is \(appState.rawValue, privacy: .public)")
            deliverBestAttemptNtf()
        }
    }
@@ -262,35 +121,27 @@ class NotificationService: UNNotificationServiceExtension {
        if let ntfData = userInfo["notificationData"] as? [AnyHashable : Any],
           let nonce = ntfData["nonce"] as? String,
           let encNtfInfo = ntfData["message"] as? String,
-           // check it here again
-           appStateGroupDefault.get().inactive {
-            // thread is added to activeThreads tracking set here - if thread started chat it needs to be suspended
-            if let t = threadId { NSEThreads.shared.startThread(t) }
-            let dbStatus = startChat()
+           let dbStatus = startChat() {
            if case .ok = dbStatus,
-               let ntfInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
-                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfInfo.ntfMessages.count))")
-                if let connEntity = ntfInfo.connEntity_ {
+               let ntfMsgInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
+                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfMsgInfo), privacy: .public)")
+                if let connEntity = ntfMsgInfo.connEntity {
                    setBestAttemptNtf(
-                        ntfInfo.ntfsEnabled
-                        ? .nse(createConnectionEventNtf(ntfInfo.user, connEntity))
+                        ntfMsgInfo.ntfsEnabled
+                        ? .nse(notification: createConnectionEventNtf(ntfMsgInfo.user, connEntity))
                        : .empty
                    )
                    if let id = connEntity.id {
-                        receiveEntityId = id
-                        NtfStreamSemaphores.shared.waitForStream(id)
-                        if receiveEntityId != nil {
-                            Task {
-                                logger.debug("NotificationService: receiveNtfMessages: in Task, connEntity id \(id)")
-                                await PendingNtfs.shared.createStream(id)
-                                await PendingNtfs.shared.readStream(id, for: self, ntfInfo: ntfInfo)
-                                deliverBestAttemptNtf()
-                            }
+                        Task {
+                            logger.debug("NotificationService: receiveNtfMessages: in Task, connEntity id \(id, privacy: .public)")
+                            await PendingNtfs.shared.createStream(id)
+                            await PendingNtfs.shared.readStream(id, for: self, msgCount: ntfMsgInfo.ntfMessages.count, showNotifications: ntfMsgInfo.user.showNotifications)
+                            deliverBestAttemptNtf()
                        }
-                        return
                    }
                }
-            } else if let dbStatus = dbStatus {
+                return
+            } else {
                setBestAttemptNtf(createErrorNtf(dbStatus))
            }
        }
@@ -299,7 +150,7 @@ class NotificationService: UNNotificationServiceExtension {

    override func serviceExtensionTimeWillExpire() {
        logger.debug("DEBUGGING: NotificationService.serviceExtensionTimeWillExpire")
-        deliverBestAttemptNtf(urgent: true)
+        deliverBestAttemptNtf()
    }

    func setBadgeCount() {
@@ -308,301 +159,91 @@ class NotificationService: UNNotificationServiceExtension {
    }

    func setBestAttemptNtf(_ ntf: UNMutableNotificationContent) {
-        setBestAttemptNtf(.nse(ntf))
+        setBestAttemptNtf(.nse(notification: ntf))
    }

    func setBestAttemptNtf(_ ntf: NSENotification) {
        logger.debug("NotificationService.setBestAttemptNtf")
        if case let .nse(notification) = ntf {
            notification.badge = badgeCount as NSNumber
-            bestAttemptNtf = .nse(notification)
+            bestAttemptNtf = .nse(notification: notification)
        } else {
            bestAttemptNtf = ntf
        }
    }

-    private func deliverBestAttemptNtf(urgent: Bool = false) {
+    private func deliverBestAttemptNtf() {
        logger.debug("NotificationService.deliverBestAttemptNtf")
-        if let cancel = cancelRead {
-            cancelRead = nil
-            cancel()
-        }
-        if let id = receiveEntityId {
-            receiveEntityId = nil
-            NtfStreamSemaphores.shared.signalStreamReady(id)
-        }
-        let suspend: Bool
-        if let t = threadId {
-            threadId = nil
-            suspend = NSEThreads.shared.endThread(t) && NSEThreads.shared.noThreads
-        } else {
-            suspend = false
-        }
-        deliverCallkitOrNotification(urgent: urgent, suspend: suspend)
-    }
-
-    private func deliverCallkitOrNotification(urgent: Bool, suspend: Bool = false) {
-        if case .callkit = bestAttemptNtf {
-            logger.debug("NotificationService.deliverCallkitOrNotification: will suspend, callkit")
-            if urgent {
-                // suspending NSE even though there may be other notifications
-                // to allow the app to process callkit call
-                suspendChat(0)
-                deliverNotification()
-            } else {
-                // suspending NSE with delay and delivering after the suspension
-                // because pushkit notification must be processed without delay
-                // to avoid app termination
-                DispatchQueue.global().asyncAfter(deadline: .now() + fastNSESuspendSchedule.delay) {
-                    suspendChat(fastNSESuspendSchedule.timeout)
-                    DispatchQueue.global().asyncAfter(deadline: .now() + Double(fastNSESuspendSchedule.timeout)) {
-                        self.deliverNotification()
-                    }
-                }
-            }
-        } else {
-            if suspend {
-                logger.debug("NotificationService.deliverCallkitOrNotification: will suspend")
-                if urgent {
-                    suspendChat(0)
-                } else {
-                    // suspension is delayed to allow chat core finalise any processing
-                    // (e.g., send delivery receipts)
-                    DispatchQueue.global().asyncAfter(deadline: .now() + nseSuspendSchedule.delay) {
-                        if NSEThreads.shared.noThreads {
-                            suspendChat(nseSuspendSchedule.timeout)
-                        }
-                    }
-                }
-            }
-            deliverNotification()
-        }
-    }
-
-    private func deliverNotification() {
        if let handler = contentHandler, let ntf = bestAttemptNtf {
-            contentHandler = nil
-            bestAttemptNtf = nil
-            let deliver: (UNMutableNotificationContent?) -> Void = { ntf in
-                let useNtf = if let ntf = ntf {
-                    appStateGroupDefault.get().running ? UNMutableNotificationContent() : ntf
-                } else {
-                    UNMutableNotificationContent()
-                }
-                handler(useNtf)
-            }
            switch ntf {
-            case let .nse(content): deliver(content)
+            case let .nse(content): handler(content)
            case let .callkit(invitation):
-                logger.debug("NotificationService reportNewIncomingVoIPPushPayload for \(invitation.contact.id)")
                CXProvider.reportNewIncomingVoIPPushPayload([
                    "displayName": invitation.contact.displayName,
                    "contactId": invitation.contact.id,
                    "media": invitation.callType.media.rawValue
                ]) { error in
-                    logger.debug("reportNewIncomingVoIPPushPayload result: \(error)")
-                    deliver(error == nil ? nil : createCallInvitationNtf(invitation))
+                    if error == nil {
+                        handler(UNMutableNotificationContent())
+                    } else {
+                        logger.debug("reportNewIncomingVoIPPushPayload success to CallController for \(invitation.contact.id)")
+                        handler(createCallInvitationNtf(invitation))
+                    }
                }
-            case .empty: deliver(nil) // used to mute notifications that did not unsubscribe yet
-            case .msgInfo: deliver(nil) // unreachable, the best attempt is never set to msgInfo
+            case .empty: handler(UNMutableNotificationContent())
            }
+            bestAttemptNtf = nil
        }
    }
 }

-// nseStateGroupDefault must not be used in NSE directly, only via this singleton
-class NSEChatState {
-    static let shared = NSEChatState()
-    private var value_ = NSEState.created
-
-    var value: NSEState {
-        value_
-    }
-
-    func set(_ state: NSEState) {
-        nseStateGroupDefault.set(state)
-        sendNSEState(state)
-        value_ = state
-    }
-
-    init() {
-        // This is always set to .created state, as in case previous start of NSE crashed in .active state, it is stored correctly.
-        // Otherwise the app will be activating slower
-        set(.created)
-    }
-}
-
-var appSubscriber: AppSubscriber = appStateSubscriber { state in
-    logger.debug("NotificationService: appSubscriber")
-    if state.running && NSEChatState.shared.value.canSuspend {
-        logger.debug("NotificationService: appSubscriber app state \(state.rawValue), suspending")
-        suspendChat(fastNSESuspendSchedule.timeout)
-    }
-}
-
-func appStateSubscriber(onState: @escaping (AppState) -> Void) -> AppSubscriber {
-    appMessageSubscriber { msg in
-        if case let .state(state) = msg {
-            logger.debug("NotificationService: appStateSubscriber \(state.rawValue)")
-            onState(state)
-        }
-    }
-}
-
-var receiverStarted = false
-let startLock = DispatchSemaphore(value: 1)
-let suspendLock = DispatchSemaphore(value: 1)
+var chatStarted = false
 var networkConfig: NetCfg = getNetCfg()
-let xftpConfig: XFTPFileConfig? = getXFTPCfg()
+var xftpConfig: XFTPFileConfig? = getXFTPCfg()

-// startChat uses semaphore startLock to ensure that only one didReceive thread can start chat controller
-// Subsequent calls to didReceive will be waiting on semaphore and won't start chat again, as it will be .active
 func startChat() -> DBMigrationResult? {
-    logger.debug("NotificationService: startChat")
-    // only skip creating if there is chat controller
-    if case .active = NSEChatState.shared.value, hasChatCtrl() { return .ok }
-
-    startLock.wait()
-    defer { startLock.signal() }
-    
-    if hasChatCtrl() {
-        return switch NSEChatState.shared.value {
-        case .created: doStartChat()
-        case .starting: .ok // it should never get to this branch, as it would be waiting for start on startLock
-        case .active: .ok
-        case .suspending: activateChat()
-        case .suspended: activateChat()
-        }
-    } else {
-        // Ignore state in preference if there is no chat controller.
-        // State in preference may have failed to update e.g. because of a crash.
-        NSEChatState.shared.set(.created)
-        return doStartChat()
-    }
-}
-
-func doStartChat() -> DBMigrationResult? {
-    logger.debug("NotificationService: doStartChat")
-    haskell_init_nse()
-    let (_, dbStatus) = chatMigrateInit(confirmMigrations: defaultMigrationConfirmation(), backgroundMode: true)
-    logger.debug("NotificationService: doStartChat \(String(describing: dbStatus))")
+    hs_init(0, nil)
+    if chatStarted { return .ok }
+    let (_, dbStatus) = chatMigrateInit(confirmMigrations: defaultMigrationConfirmation())
    if dbStatus != .ok {
        resetChatCtrl()
-        NSEChatState.shared.set(.created)
        return dbStatus
    }
-    let state = NSEChatState.shared.value
-    NSEChatState.shared.set(.starting)
    if let user = apiGetActiveUser() {
-        logger.debug("NotificationService active user \(String(describing: user))")
+        logger.debug("active user \(String(describing: user))")
        do {
            try setNetworkConfig(networkConfig)
            try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
            try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
            try setXFTPConfig(xftpConfig)
            try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
-            // prevent suspension while starting chat
-            suspendLock.wait()
-            defer { suspendLock.signal() }
-            if NSEChatState.shared.value == .starting {
-                updateNetCfg()
-                let justStarted = try apiStartChat()
-                NSEChatState.shared.set(.active)
-                if justStarted {
-                    chatLastStartGroupDefault.set(Date.now)
-                    Task {
-                        if !receiverStarted {
-                            receiverStarted = true
-                            await receiveMessages()
-                        }
-                    }
-                }
-                return .ok
+            let justStarted = try apiStartChat()
+            chatStarted = true
+            if justStarted {
+                chatLastStartGroupDefault.set(Date.now)
+                Task { await receiveMessages() }
            }
+            return .ok
        } catch {
-            logger.error("NotificationService startChat error: \(responseError(error))")
+            logger.error("NotificationService startChat error: \(responseError(error), privacy: .public)")
        }
    } else {
-        logger.debug("NotificationService: no active user")
+        logger.debug("no active user")
    }
-    if NSEChatState.shared.value == .starting { NSEChatState.shared.set(state) }
    return nil
 }

-func activateChat() -> DBMigrationResult? {
-    logger.debug("NotificationService: activateChat")
-    let state = NSEChatState.shared.value
-    NSEChatState.shared.set(.active)
-    if apiActivateChat() {
-        logger.debug("NotificationService: activateChat: after apiActivateChat")
-        return .ok
-    } else {
-        NSEChatState.shared.set(state)
-        return nil
-    }
-}
-
-// suspendChat uses semaphore suspendLock to ensure that only one suspension can happen.
-func suspendChat(_ timeout: Int) {
-    logger.debug("NotificationService: suspendChat")
-    let state = NSEChatState.shared.value
-    if !state.canSuspend {
-        logger.error("NotificationService suspendChat called, current state: \(state.rawValue)")
-    } else if hasChatCtrl() {
-        // only suspend if we have chat controller to avoid crashes when suspension is
-        // attempted when chat controller was not created
-        suspendLock.wait()
-        defer { suspendLock.signal() }
-
-        NSEChatState.shared.set(.suspending)
-        if apiSuspendChat(timeoutMicroseconds: timeout * 1000000) {
-            logger.debug("NotificationService: suspendChat: after apiSuspendChat")
-            DispatchQueue.global().asyncAfter(deadline: .now() + Double(timeout) + 1, execute: chatSuspended)
-        } else {
-            NSEChatState.shared.set(state)
-        }
-    }
-}
-
-func chatSuspended() {
-    logger.debug("NotificationService chatSuspended")
-    if case .suspending = NSEChatState.shared.value {
-        NSEChatState.shared.set(.suspended)
-        chatCloseStore()
-        logger.debug("NotificationService chatSuspended: suspended")
-    }
-}
-
-// A single loop is used per Notification service extension process to receive and process all messages depending on the NSE state
-// If the extension is not active yet, or suspended/suspending, or the app is running, the notifications will no be received.
 func receiveMessages() async {
    logger.debug("NotificationService receiveMessages")
    while true {
-        switch NSEChatState.shared.value {
-        // it should never get to "created" and "starting" branches, as NSE state is set to .active before the loop start
-        case .created: await delayWhenInactive()
-        case .starting: await delayWhenInactive()
-        case .active: await receiveMsg()
-        case .suspending: await receiveMsg()
-        case .suspended: await delayWhenInactive()
-        }
-    }
-
-    func receiveMsg() async {
+        updateNetCfg()
        if let msg = await chatRecvMsg() {
-            logger.debug("NotificationService receiveMsg: message")
            if let (id, ntf) = await receivedMsgNtf(msg) {
-                logger.debug("NotificationService receiveMsg: notification")
                await PendingNtfs.shared.createStream(id)
                await PendingNtfs.shared.writeStream(id, ntf)
            }
        }
    }
-
-    func delayWhenInactive() async {
-        logger.debug("NotificationService delayWhenInactive")
-        _ = try? await Task.sleep(nanoseconds: 1000_000000)
-    }
 }

 func chatRecvMsg() async -> ChatResponse? {
@@ -616,14 +257,14 @@ private let isInChina = SKStorefront().countryCode == "CHN"
 private func useCallKit() -> Bool { !isInChina && callKitEnabledGroupDefault.get() }

 func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
-    logger.debug("NotificationService receivedMsgNtf: \(res.responseType)")
+    logger.debug("NotificationService processReceivedMsg: \(res.responseType)")
    switch res {
    case let .contactConnected(user, contact, _):
-        return (contact.id, .nse(createContactConnectedNtf(user, contact)))
+        return (contact.id, .nse(notification: createContactConnectedNtf(user, contact)))
 //        case let .contactConnecting(contact):
 //            TODO profile update
    case let .receivedContactRequest(user, contactRequest):
-        return (UserContact(contactRequest: contactRequest).id, .nse(createContactRequestNtf(user, contactRequest)))
+        return (UserContact(contactRequest: contactRequest).id, .nse(notification: createContactRequestNtf(user, contactRequest)))
    case let .newChatItem(user, aChatItem):
        let cInfo = aChatItem.chatInfo
        var cItem = aChatItem.chatItem
@@ -633,7 +274,7 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
        if let file = cItem.autoReceiveFile() {
            cItem = autoReceiveFile(file, encrypted: cItem.encryptLocalFile) ?? cItem
        }
-        let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(createMessageReceivedNtf(user, cInfo, cItem)) : .empty
+        let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(notification: createMessageReceivedNtf(user, cInfo, cItem)) : .empty
        return cItem.showNotification ? (aChatItem.chatId, ntf) : nil
    case let .rcvFileSndCancelled(_, aChatItem, _):
        cleanupFile(aChatItem)
@@ -651,18 +292,10 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
        // Do not post it without CallKit support, iOS will stop launching the app without showing CallKit
        return (
            invitation.contact.id,
-            useCallKit() ? .callkit(invitation) : .nse(createCallInvitationNtf(invitation))
+            useCallKit() ? .callkit(invitation: invitation) : .nse(notification: createCallInvitationNtf(invitation))
        )
-    case let .ntfMessage(_, connEntity, ntfMessage):
-        return if let id = connEntity.id { (id, .msgInfo(ntfMessage)) } else { nil }
-    case .chatSuspended:
-        chatSuspended()
-        return nil
-    case let .chatError(_, err):
-        logger.error("NotificationService receivedMsgNtf error: \(String(describing: err))")
-        return nil
    default:
-        logger.debug("NotificationService receivedMsgNtf ignored event: \(res.responseType)")
+        logger.debug("NotificationService processReceivedMsg ignored event: \(res.responseType)")
        return nil
    }
 }
@@ -675,22 +308,17 @@ func updateNetCfg() {
            try setNetworkConfig(networkConfig)
            networkConfig = newNetConfig
        } catch {
-            logger.error("NotificationService apply changed network config error: \(responseError(error))")
+            logger.error("NotificationService apply changed network config error: \(responseError(error), privacy: .public)")
        }
    }
 }

 func apiGetActiveUser() -> User? {
    let r = sendSimpleXCmd(.showActiveUser)
-    logger.debug("apiGetActiveUser sendSimpleXCmd response: \(r.responseType)")
+    logger.debug("apiGetActiveUser sendSimpleXCmd response: \(String(describing: r))")
    switch r {
    case let .activeUser(user): return user
-    case .chatCmdError(_, .error(.noActiveUser)):
-        logger.debug("apiGetActiveUser sendSimpleXCmd no active user")
-        return nil
-    case let .chatCmdError(_, err):
-        logger.debug("apiGetActiveUser sendSimpleXCmd error: \(String(describing: err))")
-        return nil
+    case .chatCmdError(_, .error(.noActiveUser)): return nil
    default:
        logger.error("NotificationService apiGetActiveUser unexpected response: \(String(describing: r))")
        return nil
@@ -698,7 +326,7 @@ func apiGetActiveUser() -> User? {
 }

 func apiStartChat() throws -> Bool {
-    let r = sendSimpleXCmd(.startChat(mainApp: false))
+    let r = sendSimpleXCmd(.startChat(subscribe: false, expire: false, xftp: false))
    switch r {
    case .chatStarted: return true
    case .chatRunning: return false
@@ -706,21 +334,6 @@ func apiStartChat() throws -> Bool {
    }
 }

-func apiActivateChat() -> Bool {
-    chatReopenStore()
-    let r = sendSimpleXCmd(.apiActivateChat(restoreChat: false))
-    if case .cmdOk = r { return true }
-    logger.error("NotificationService apiActivateChat error: \(String(describing: r))")
-    return false
-}
-
-func apiSuspendChat(timeoutMicroseconds: Int) -> Bool {
-    let r = sendSimpleXCmd(.apiSuspendChat(timeoutMicroseconds: timeoutMicroseconds))
-    if case .cmdOk = r { return true }
-    logger.error("NotificationService apiSuspendChat error: \(String(describing: r))")
-    return false
-}
-
 func apiSetTempFolder(tempFolder: String) throws {
    let r = sendSimpleXCmd(.setTempFolder(tempFolder: tempFolder))
    if case .cmdOk = r { return }
@@ -751,13 +364,12 @@ func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
        return nil
    }
    let r = sendSimpleXCmd(.apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo))
-    if case let .ntfMessages(user, connEntity_, msgTs, ntfMessages) = r, let user = user {
-        logger.debug("apiGetNtfMessage response ntfMessages: \(ntfMessages.count)")
-        return NtfMessages(user: user, connEntity_: connEntity_, msgTs: msgTs, ntfMessages: ntfMessages)
+    if case let .ntfMessages(user, connEntity, msgTs, ntfMessages) = r, let user = user {
+        return NtfMessages(user: user, connEntity: connEntity, msgTs: msgTs, ntfMessages: ntfMessages)
    } else if case let .chatCmdError(_, error) = r {
        logger.debug("apiGetNtfMessage error response: \(String.init(describing: error))")
    } else {
-        logger.debug("apiGetNtfMessage ignored response: \(r.responseType) \(String.init(describing: r))")
+        logger.debug("apiGetNtfMessage ignored response: \(r.responseType, privacy: .public) \(String.init(describing: r), privacy: .private)")
    }
    return nil
 }
@@ -793,11 +405,11 @@ func setNetworkConfig(_ cfg: NetCfg) throws {

 struct NtfMessages {
    var user: User
-    var connEntity_: ConnectionEntity?
+    var connEntity: ConnectionEntity?
    var msgTs: Date?
    var ntfMessages: [NtfMsgInfo]

    var ntfsEnabled: Bool {
-        user.showNotifications && (connEntity_?.ntfsEnabled ?? false)
+        user.showNotifications && (connEntity?.ntfsEnabled ?? false)
    }
 }
@@ -30,11 +30,6 @@
 		5C116CDC27AABE0400E66D01 /* ContactRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C116CDB27AABE0400E66D01 /* ContactRequestView.swift */; };
 		5C13730B28156D2700F43030 /* ContactConnectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C13730A28156D2700F43030 /* ContactConnectionView.swift */; };
 		5C1A4C1E27A715B700EAD5AD /* ChatItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C1A4C1D27A715B700EAD5AD /* ChatItemView.swift */; };
-		5C245F232B4EAA5E001CC39F /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F1E2B4EAA5E001CC39F /* libgmpxx.a */; };
-		5C245F242B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F1F2B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a */; };
-		5C245F252B4EAA5E001CC39F /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F202B4EAA5E001CC39F /* libgmp.a */; };
-		5C245F262B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F212B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a */; };
-		5C245F272B4EAA5E001CC39F /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F222B4EAA5E001CC39F /* libffi.a */; };
 		5C2E260727A2941F00F70299 /* SimpleXAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E260627A2941F00F70299 /* SimpleXAPI.swift */; };
 		5C2E260B27A30CFA00F70299 /* ChatListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E260A27A30CFA00F70299 /* ChatListView.swift */; };
 		5C2E260F27A30FDC00F70299 /* ChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E260E27A30FDC00F70299 /* ChatView.swift */; };
@@ -44,7 +39,6 @@
 		5C36027327F47AD5009F19D9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C36027227F47AD5009F19D9 /* AppDelegate.swift */; };
 		5C3A88CE27DF50170060F1C2 /* DetermineWidth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */; };
 		5C3A88D127DF57800060F1C2 /* FramedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3A88D027DF57800060F1C2 /* FramedItemView.swift */; };
-		5C3CCFCC2AE6BD3100C3F0C3 /* ConnectDesktopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3CCFCB2AE6BD3100C3F0C3 /* ConnectDesktopView.swift */; };
 		5C3F1D562842B68D00EC8A82 /* IntegrityErrorItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */; };
 		5C3F1D58284363C400EC8A82 /* PrivacySettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */; };
 		5C4B3B0A285FB130003915F2 /* DatabaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B3B09285FB130003915F2 /* DatabaseView.swift */; };
@@ -123,8 +117,11 @@
 		5CCB939C297EFCB100399E78 /* NavStackCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCB939B297EFCB100399E78 /* NavStackCompat.swift */; };
 		5CCD403427A5F6DF00368C90 /* AddContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403327A5F6DF00368C90 /* AddContactView.swift */; };
 		5CCD403727A5F9A200368C90 /* ScanToConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */; };
-		5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD67B8D2B0E858A00C510B1 /* hs_init.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CD67B8E2B0E858A00C510B1 /* hs_init.c */; };
+		5CD089312AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD0892C2AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a */; };
+		5CD089322AE59CB300669208 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD0892D2AE59CB300669208 /* libffi.a */; };
+		5CD089332AE59CB300669208 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD0892E2AE59CB300669208 /* libgmpxx.a */; };
+		5CD089342AE59CB300669208 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD0892F2AE59CB300669208 /* libgmp.a */; };
+		5CD089352AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CD089302AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.a */; };
 		5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CDCAD472818589900503DA2 /* NotificationService.swift */; };
 		5CE2BA702845308900EC33A6 /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		5CE2BA712845308900EC33A6 /* SimpleXChat.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -150,9 +147,6 @@
 		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 */; };
-		5CF9371E2B23429500E1D781 /* ConcurrentQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */; };
-		5CF937202B24DE8C00E1D781 /* SharedFileSubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */; };
-		5CF937232B2503D000E1D781 /* NSESubscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF937212B25034A00E1D781 /* NSESubscriber.swift */; };
 		5CFA59C42860BC6200863A68 /* MigrateToAppGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */; };
 		5CFA59D12864782E00863A68 /* ChatArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFA59CF286477B400863A68 /* ChatArchiveView.swift */; };
 		5CFE0921282EEAF60002594B /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */; };
@@ -168,11 +162,6 @@
 		64466DC829FC2B3B00E3D48D /* CreateSimpleXAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64466DC729FC2B3B00E3D48D /* CreateSimpleXAddress.swift */; };
 		64466DCC29FFE3E800E3D48D /* MailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64466DCB29FFE3E800E3D48D /* MailView.swift */; };
 		6448BBB628FA9D56000D2AB9 /* GroupLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */; };
-		6449333A2AF8E51000AC506E /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933352AF8E51000AC506E /* libgmpxx.a */; };
-		6449333B2AF8E51000AC506E /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933362AF8E51000AC506E /* libgmp.a */; };
-		6449333C2AF8E51000AC506E /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933372AF8E51000AC506E /* libffi.a */; };
-		6449333D2AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933382AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a */; };
-		6449333E2AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933392AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a */; };
 		644EFFDE292BCD9D00525D5B /* ComposeVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFDD292BCD9D00525D5B /* ComposeVoiceView.swift */; };
 		644EFFE0292CFD7F00525D5B /* CIVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFDF292CFD7F00525D5B /* CIVoiceView.swift */; };
 		644EFFE2292D089800525D5B /* FramedCIVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFE1292D089800525D5B /* FramedCIVoiceView.swift */; };
@@ -193,7 +182,6 @@
 		64D0C2C629FAC1EC00B38D5F /* AddContactLearnMore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D0C2C529FAC1EC00B38D5F /* AddContactLearnMore.swift */; };
 		64E972072881BB22008DBC02 /* CIGroupInvitationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */; };
 		64F1CC3B28B39D8600CD1FB1 /* IncognitoHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */; };
-		8C05382E2B39887E006436DC /* VideoUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C05382D2B39887E006436DC /* VideoUtils.swift */; };
 		D7197A1829AE89660055C05A /* WebRTC in Frameworks */ = {isa = PBXBuildFile; productRef = D7197A1729AE89660055C05A /* WebRTC */; };
 		D72A9088294BD7A70047C86D /* NativeTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72A9087294BD7A70047C86D /* NativeTextEditor.swift */; };
 		D741547829AF89AF0022400A /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D741547729AF89AF0022400A /* StoreKit.framework */; };
@@ -285,11 +273,6 @@
 		5C13730A28156D2700F43030 /* ContactConnectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactConnectionView.swift; sourceTree = "<group>"; };
 		5C13730C2815740A00F43030 /* DebugJSON.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = DebugJSON.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		5C1A4C1D27A715B700EAD5AD /* ChatItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemView.swift; sourceTree = "<group>"; };
-		5C245F1E2B4EAA5E001CC39F /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5C245F1F2B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a"; sourceTree = "<group>"; };
-		5C245F202B4EAA5E001CC39F /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5C245F212B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a"; sourceTree = "<group>"; };
-		5C245F222B4EAA5E001CC39F /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5C2E260627A2941F00F70299 /* SimpleXAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleXAPI.swift; sourceTree = "<group>"; };
 		5C2E260A27A30CFA00F70299 /* ChatListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListView.swift; sourceTree = "<group>"; };
 		5C2E260E27A30FDC00F70299 /* ChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatView.swift; sourceTree = "<group>"; };
@@ -299,7 +282,6 @@
 		5C36027227F47AD5009F19D9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		5C3A88CD27DF50170060F1C2 /* DetermineWidth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetermineWidth.swift; sourceTree = "<group>"; };
 		5C3A88D027DF57800060F1C2 /* FramedItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FramedItemView.swift; sourceTree = "<group>"; };
-		5C3CCFCB2AE6BD3100C3F0C3 /* ConnectDesktopView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectDesktopView.swift; sourceTree = "<group>"; };
 		5C3F1D552842B68D00EC8A82 /* IntegrityErrorItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrityErrorItemView.swift; sourceTree = "<group>"; };
 		5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacySettings.swift; sourceTree = "<group>"; };
 		5C422A7C27A9A6FA0097A1E1 /* SimpleX (iOS).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "SimpleX (iOS).entitlements"; sourceTree = "<group>"; };
@@ -415,8 +397,11 @@
 		5CCB939B297EFCB100399E78 /* NavStackCompat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavStackCompat.swift; sourceTree = "<group>"; };
 		5CCD403327A5F6DF00368C90 /* AddContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddContactView.swift; sourceTree = "<group>"; };
 		5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanToConnectView.swift; sourceTree = "<group>"; };
-		5CD67B8D2B0E858A00C510B1 /* hs_init.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hs_init.h; sourceTree = "<group>"; };
-		5CD67B8E2B0E858A00C510B1 /* hs_init.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = hs_init.c; sourceTree = "<group>"; };
+		5CD0892C2AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a"; sourceTree = "<group>"; };
+		5CD0892D2AE59CB300669208 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5CD0892E2AE59CB300669208 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5CD0892F2AE59CB300669208 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5CD089302AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.a"; sourceTree = "<group>"; };
 		5CDCAD452818589900503DA2 /* SimpleX NSE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX NSE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5CDCAD472818589900503DA2 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		5CDCAD492818589900503DA2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -443,9 +428,6 @@
 		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>"; };
-		5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConcurrentQueue.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>"; };
 		5CFA59C32860BC6200863A68 /* MigrateToAppGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateToAppGroupView.swift; sourceTree = "<group>"; };
 		5CFA59CF286477B400863A68 /* ChatArchiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatArchiveView.swift; sourceTree = "<group>"; };
 		5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ZoomableScrollView.swift; path = Shared/Views/ZoomableScrollView.swift; sourceTree = SOURCE_ROOT; };
@@ -460,11 +442,6 @@
 		64466DC729FC2B3B00E3D48D /* CreateSimpleXAddress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateSimpleXAddress.swift; sourceTree = "<group>"; };
 		64466DCB29FFE3E800E3D48D /* MailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailView.swift; sourceTree = "<group>"; };
 		6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupLinkView.swift; sourceTree = "<group>"; };
-		644933352AF8E51000AC506E /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		644933362AF8E51000AC506E /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		644933372AF8E51000AC506E /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		644933382AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a"; sourceTree = "<group>"; };
-		644933392AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a"; sourceTree = "<group>"; };
 		644EFFDD292BCD9D00525D5B /* ComposeVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeVoiceView.swift; sourceTree = "<group>"; };
 		644EFFDF292CFD7F00525D5B /* CIVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIVoiceView.swift; sourceTree = "<group>"; };
 		644EFFE1292D089800525D5B /* FramedCIVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FramedCIVoiceView.swift; sourceTree = "<group>"; };
@@ -487,7 +464,6 @@
 		64DAE1502809D9F5000DA960 /* FileUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileUtils.swift; sourceTree = "<group>"; };
 		64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIGroupInvitationView.swift; sourceTree = "<group>"; };
 		64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoHelp.swift; sourceTree = "<group>"; };
-		8C05382D2B39887E006436DC /* VideoUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoUtils.swift; sourceTree = "<group>"; };
 		D72A9087294BD7A70047C86D /* NativeTextEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeTextEditor.swift; sourceTree = "<group>"; };
 		D741547729AF89AF0022400A /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -529,13 +505,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5C245F232B4EAA5E001CC39F /* libgmpxx.a in Frameworks */,
-				5C245F262B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a in Frameworks */,
-				5C245F252B4EAA5E001CC39F /* libgmp.a in Frameworks */,
+				5CD089352AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5C245F272B4EAA5E001CC39F /* libffi.a in Frameworks */,
+				5CD089332AE59CB300669208 /* libgmpxx.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				5C245F242B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a in Frameworks */,
+				5CD089312AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a in Frameworks */,
+				5CD089342AE59CB300669208 /* libgmp.a in Frameworks */,
+				5CD089322AE59CB300669208 /* libffi.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -568,7 +544,6 @@
 				5CB924DD27A8622200ACCCDD /* NewChat */,
 				5CFA59C22860B04D00863A68 /* Database */,
 				5CB634AB29E46CDB0066AD6B /* LocalAuth */,
-				5CA8D01B2AD9B076001FD661 /* RemoteAccess */,
 				5CB924DF27A8678B00ACCCDD /* UserSettings */,
 				5C2E261127A30FEA00F70299 /* TerminalView.swift */,
 			);
@@ -597,11 +572,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5C245F222B4EAA5E001CC39F /* libffi.a */,
-				5C245F202B4EAA5E001CC39F /* libgmp.a */,
-				5C245F1E2B4EAA5E001CC39F /* libgmpxx.a */,
-				5C245F1F2B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH-ghc9.6.3.a */,
-				5C245F212B4EAA5E001CC39F /* libHSsimplex-chat-5.4.3.0-BrNBQIZf2Ju9TtaZoeJyIH.a */,
+				5CD0892D2AE59CB300669208 /* libffi.a */,
+				5CD0892F2AE59CB300669208 /* libgmp.a */,
+				5CD0892E2AE59CB300669208 /* libgmpxx.a */,
+				5CD0892C2AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO-ghc8.10.7.a */,
+				5CD089302AE59CB300669208 /* libHSsimplex-chat-5.4.0.2-d5Ky77yoZRFE1pplaEhZO.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -626,7 +601,6 @@
 				5C35CFC727B2782E00FB6C6D /* BGManager.swift */,
 				5C35CFCA27B2E91D00FB6C6D /* NtfManager.swift */,
 				5CB346E42868AA7F001FD2EF /* SuspendChat.swift */,
-				5CF937212B25034A00E1D781 /* NSESubscriber.swift */,
 				5CB346E82869E8BA001FD2EF /* PushEnvironment.swift */,
 				5C93293E2928E0FD0090FFF9 /* AudioRecPlay.swift */,
 				5CBD2859295711D700EC2CF4 /* ImageUtils.swift */,
@@ -654,7 +628,6 @@
 				64466DCB29FFE3E800E3D48D /* MailView.swift */,
 				64C3B0202A0D359700E19930 /* CustomTimePicker.swift */,
 				5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */,
-				8C05382D2B39887E006436DC /* VideoUtils.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -711,14 +684,6 @@
 			path = "Tests iOS";
 			sourceTree = "<group>";
 		};
-		5CA8D01B2AD9B076001FD661 /* RemoteAccess */ = {
-			isa = PBXGroup;
-			children = (
-				5C3CCFCB2AE6BD3100C3F0C3 /* ConnectDesktopView.swift */,
-			);
-			path = RemoteAccess;
-			sourceTree = "<group>";
-		};
 		5CB0BA8C282711BC00B3292C /* Onboarding */ = {
 			isa = PBXGroup;
 			children = (
@@ -808,7 +773,6 @@
 			isa = PBXGroup;
 			children = (
 				5CDCAD5128186DE400503DA2 /* SimpleX NSE.entitlements */,
-				5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */,
 				5CDCAD472818589900503DA2 /* NotificationService.swift */,
 				5CDCAD492818589900503DA2 /* Info.plist */,
 				5CB0BA862826CB3A00B3292C /* InfoPlist.strings */,
@@ -829,13 +793,10 @@
 				64DAE1502809D9F5000DA960 /* FileUtils.swift */,
 				5C9D81182AA7A4F1001D49FD /* CryptoFile.swift */,
 				5C00168028C4FE760094D739 /* KeyChain.swift */,
-				5CF9371F2B24DE8C00E1D781 /* SharedFileSubscriber.swift */,
 				5CE2BA76284530BF00EC33A6 /* SimpleXChat.h */,
 				5CE2BA8A2845332200EC33A6 /* SimpleX.h */,
 				5CE2BA78284530CC00EC33A6 /* SimpleXChat.docc */,
 				5CE2BA96284537A800EC33A6 /* dummy.m */,
-				5CD67B8D2B0E858A00C510B1 /* hs_init.h */,
-				5CD67B8E2B0E858A00C510B1 /* hs_init.c */,
 			);
 			path = SimpleXChat;
 			sourceTree = "<group>";
@@ -920,7 +881,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				5CE2BA77284530BF00EC33A6 /* SimpleXChat.h in Headers */,
-				5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */,
 				5CE2BA952845354B00EC33A6 /* SimpleX.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1202,7 +1162,6 @@
 				5C2E260F27A30FDC00F70299 /* ChatView.swift in Sources */,
 				5C2E260B27A30CFA00F70299 /* ChatListView.swift in Sources */,
 				6442E0BA287F169300CEC0F9 /* AddGroupView.swift in Sources */,
-				5CF937232B2503D000E1D781 /* NSESubscriber.swift in Sources */,
 				6419EC582AB97507004A607A /* CIMemberCreatedContactView.swift in Sources */,
 				64D0C2C229FA57AB00B38D5F /* UserAddressLearnMore.swift in Sources */,
 				64466DCC29FFE3E800E3D48D /* MailView.swift in Sources */,
@@ -1211,7 +1170,6 @@
 				6454036F2822A9750090DDFF /* ComposeFileView.swift in Sources */,
 				5C5DB70E289ABDD200730FFF /* AppearanceSettings.swift in Sources */,
 				5C5F2B6D27EBC3FE006A9D5F /* ImagePicker.swift in Sources */,
-				5C3CCFCC2AE6BD3100C3F0C3 /* ConnectDesktopView.swift in Sources */,
 				5C9C2DA92899DA6F00CC63B1 /* NetworkAndServers.swift in Sources */,
 				5C6BA667289BD954009B8ECC /* DismissSheets.swift in Sources */,
 				5C577F7D27C83AA10006112D /* MarkdownHelp.swift in Sources */,
@@ -1225,7 +1183,6 @@
 				5CCD403727A5F9A200368C90 /* ScanToConnectView.swift in Sources */,
 				5CFA59D12864782E00863A68 /* ChatArchiveView.swift in Sources */,
 				649BCDA22805D6EF00C3A862 /* CIImageView.swift in Sources */,
-				8C05382E2B39887E006436DC /* VideoUtils.swift in Sources */,
 				5CADE79C292131E900072E13 /* ContactPreferencesView.swift in Sources */,
 				5CB346E52868AA7F001FD2EF /* SuspendChat.swift in Sources */,
 				5C9C2DA52894777E00CC63B1 /* GroupProfileView.swift in Sources */,
@@ -1283,7 +1240,6 @@
 			files = (
 				5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */,
 				5CFE0922282EEAF60002594B /* ZoomableScrollView.swift in Sources */,
-				5CF9371E2B23429500E1D781 /* ConcurrentQueue.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1291,11 +1247,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CF937202B24DE8C00E1D781 /* SharedFileSubscriber.swift in Sources */,
 				5C00168128C4FE760094D739 /* KeyChain.swift in Sources */,
 				5CE2BA97284537A800EC33A6 /* dummy.m in Sources */,
 				5CE2BA922845340900EC33A6 /* FileUtils.swift in Sources */,
-				5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */,
 				5CE2BA91284533A300EC33A6 /* Notifications.swift in Sources */,
 				5CE2BA79284530CC00EC33A6 /* SimpleXChat.docc in Sources */,
 				5CE2BA90284533A300EC33A6 /* JSON.swift in Sources */,
@@ -1528,7 +1482,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 180;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1536,7 +1490,6 @@
 				INFOPLIST_FILE = "SimpleX--iOS--Info.plist";
 				INFOPLIST_KEY_NSCameraUsageDescription = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 				INFOPLIST_KEY_NSFaceIDUsageDescription = "SimpleX uses Face ID for local authentication";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "SimpleX needs access to Photo Library for saving captured and received media";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
@@ -1550,7 +1503,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1571,7 +1524,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 180;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1579,7 +1532,6 @@
 				INFOPLIST_FILE = "SimpleX--iOS--Info.plist";
 				INFOPLIST_KEY_NSCameraUsageDescription = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 				INFOPLIST_KEY_NSFaceIDUsageDescription = "SimpleX uses Face ID for local authentication";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "SimpleX needs access to Photo Library for saving captured and received media";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
@@ -1593,7 +1545,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1652,7 +1604,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 180;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1665,7 +1617,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1684,7 +1636,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 180;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1697,7 +1649,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1716,7 +1668,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 180;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1740,7 +1692,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1762,7 +1714,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 188;
+				CURRENT_PROJECT_VERSION = 180;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1786,7 +1738,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4.3;
+				MARKETING_VERSION = 5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -41,7 +41,7 @@
      </Testables>
   </TestAction>
   <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
@@ -2,7 +2,7 @@
 <Scheme
   LastUpgradeVersion = "1400"
   wasCreatedForAppExtension = "YES"
-   version = "1.3">
+   version = "2.0">
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
@@ -47,14 +47,16 @@
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
      launchStyle = "0"
+      askForAppToLaunch = "Yes"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
         <BuildableReference
@@ -12,16 +12,12 @@ private var chatController: chat_ctrl?

 private var migrationResult: (Bool, DBMigrationResult)?

-public func hasChatCtrl() -> Bool {
-    chatController != nil
-}
-
-public func getChatCtrl() -> chat_ctrl {
+public func getChatCtrl(_ useKey: String? = nil) -> chat_ctrl {
    if let controller = chatController { return controller }
    fatalError("chat controller not initialized")
 }

-public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: MigrationConfirmation? = nil, backgroundMode: Bool = false) -> (Bool, DBMigrationResult) {
+public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: MigrationConfirmation? = nil) -> (Bool, DBMigrationResult) {
    if let res = migrationResult { return res }
    let dbPath = getAppDatabasePath().path
    var dbKey = ""
@@ -45,7 +41,7 @@ public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: Migratio
    var cKey = dbKey.cString(using: .utf8)!
    var cConfirm = confirm.rawValue.cString(using: .utf8)!
    // the last parameter of chat_migrate_init is used to return the pointer to chat controller
-    let cjson = chat_migrate_init_key(&cPath, &cKey, 1, &cConfirm, backgroundMode ? 1 : 0, &chatController)!
+    let cjson = chat_migrate_init(&cPath, &cKey, &cConfirm, &chatController)!
    let dbRes = dbMigrationResult(fromCString(cjson))
    let encrypted = dbKey != ""
    let keychainErr = dbRes == .ok && useKeychain && encrypted && !kcDatabasePassword.set(dbKey)
@@ -61,13 +57,6 @@ public func chatCloseStore() {
    }
 }

-public func chatReopenStore() {
-    let err = fromCString(chat_reopen_store(getChatCtrl()))
-    if err != "" {
-        logger.error("chatReopenStore error: \(err)")
-    }
-}
-
 public func resetChatCtrl() {
    chatController = nil
    migrationResult = nil
@@ -25,9 +25,9 @@ public enum ChatCommand {
    case apiMuteUser(userId: Int64)
    case apiUnmuteUser(userId: Int64)
    case apiDeleteUser(userId: Int64, delSMPQueues: Bool, viewPwd: String?)
-    case startChat(mainApp: Bool)
+    case startChat(subscribe: Bool, expire: Bool, xftp: Bool)
    case apiStopChat
-    case apiActivateChat(restoreChat: Bool)
+    case apiActivateChat
    case apiSuspendChat(timeoutMicroseconds: Int)
    case setTempFolder(tempFolder: String)
    case setFilesFolder(filesFolder: String)
@@ -90,7 +90,6 @@ public enum ChatCommand {
    case apiSetConnectionIncognito(connId: Int64, incognito: Bool)
    case apiConnectPlan(userId: Int64, connReq: String)
    case apiConnect(userId: Int64, incognito: Bool, connReq: String)
-    case apiConnectContactViaAddress(userId: Int64, incognito: Bool, contactId: Int64)
    case apiDeleteChat(type: ChatType, id: Int64, notify: Bool?)
    case apiClearChat(type: ChatType, id: Int64)
    case apiListContacts(userId: Int64)
@@ -120,16 +119,6 @@ public enum ChatCommand {
    case receiveFile(fileId: Int64, encrypted: Bool?, inline: Bool?)
    case setFileToReceive(fileId: Int64, encrypted: Bool?)
    case cancelFile(fileId: Int64)
-    // remote desktop commands
-    case setLocalDeviceName(displayName: String)
-    case connectRemoteCtrl(xrcpInvitation: String)
-    case findKnownRemoteCtrl
-    case confirmRemoteCtrl(remoteCtrlId: Int64)
-    case verifyRemoteCtrlSession(sessionCode: String)
-    case listRemoteCtrls
-    case stopRemoteCtrl
-    case deleteRemoteCtrl(remoteCtrlId: Int64)
-    // misc
    case showVersion
    case string(String)

@@ -154,9 +143,9 @@ public enum ChatCommand {
            case let .apiMuteUser(userId): return "/_mute user \(userId)"
            case let .apiUnmuteUser(userId): return "/_unmute user \(userId)"
            case let .apiDeleteUser(userId, delSMPQueues, viewPwd): return "/_delete user \(userId) del_smp=\(onOff(delSMPQueues))\(maybePwd(viewPwd))"
-            case let .startChat(mainApp): return "/_start main=\(onOff(mainApp))"
+            case let .startChat(subscribe, expire, xftp): return "/_start subscribe=\(onOff(subscribe)) expire=\(onOff(expire)) xftp=\(onOff(xftp))"
            case .apiStopChat: return "/_stop"
-            case let .apiActivateChat(restore): return "/_app activate restore=\(onOff(restore))"
+            case .apiActivateChat: return "/_app activate"
            case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
            case let .setTempFolder(tempFolder): return "/_temp_folder \(tempFolder)"
            case let .setFilesFolder(filesFolder): return "/_files_folder \(filesFolder)"
@@ -237,7 +226,6 @@ public enum ChatCommand {
            case let .apiSetConnectionIncognito(connId, incognito): return "/_set incognito :\(connId) \(onOff(incognito))"
            case let .apiConnectPlan(userId, connReq): return "/_connect plan \(userId) \(connReq)"
            case let .apiConnect(userId, incognito, connReq): return "/_connect \(userId) incognito=\(onOff(incognito)) \(connReq)"
-            case let .apiConnectContactViaAddress(userId, incognito, contactId): return "/_connect contact \(userId) incognito=\(onOff(incognito)) \(contactId)"
            case let .apiDeleteChat(type, id, notify): if let notify = notify {
                return "/_delete \(ref(type, id)) notify=\(onOff(notify))"
            } else {
@@ -270,14 +258,6 @@ public enum ChatCommand {
            case let .receiveFile(fileId, encrypt, inline): return "/freceive \(fileId)\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
            case let .setFileToReceive(fileId, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("encrypt", encrypt))"
            case let .cancelFile(fileId): return "/fcancel \(fileId)"
-            case let .setLocalDeviceName(displayName): return "/set device name \(displayName)"
-            case let .connectRemoteCtrl(xrcpInv): return "/connect remote ctrl \(xrcpInv)"
-            case .findKnownRemoteCtrl: return "/find remote ctrl"
-            case let .confirmRemoteCtrl(rcId): return "/confirm remote ctrl \(rcId)"
-            case let .verifyRemoteCtrlSession(sessCode): return "/verify remote ctrl \(sessCode)"
-            case .listRemoteCtrls: return "/list remote ctrls"
-            case .stopRemoteCtrl: return "/stop remote ctrl"
-            case let .deleteRemoteCtrl(rcId): return "/delete remote ctrl \(rcId)"
            case .showVersion: return "/version"
            case let .string(str): return str
            }
@@ -317,7 +297,6 @@ public enum ChatCommand {
            case .apiSendMessage: return "apiSendMessage"
            case .apiUpdateChatItem: return "apiUpdateChatItem"
            case .apiDeleteChatItem: return "apiDeleteChatItem"
-            case .apiConnectContactViaAddress: return "apiConnectContactViaAddress"
            case .apiDeleteMemberChatItem: return "apiDeleteMemberChatItem"
            case .apiChatItemReaction: return "apiChatItemReaction"
            case .apiGetNtfToken: return "apiGetNtfToken"
@@ -393,14 +372,6 @@ public enum ChatCommand {
            case .receiveFile: return "receiveFile"
            case .setFileToReceive: return "setFileToReceive"
            case .cancelFile: return "cancelFile"
-            case .setLocalDeviceName: return "setLocalDeviceName"
-            case .connectRemoteCtrl: return "connectRemoteCtrl"
-            case .findKnownRemoteCtrl: return "findKnownRemoteCtrl"
-            case .confirmRemoteCtrl: return "confirmRemoteCtrl"
-            case .verifyRemoteCtrlSession: return "verifyRemoteCtrlSession"
-            case .listRemoteCtrls: return "listRemoteCtrls"
-            case .stopRemoteCtrl: return "stopRemoteCtrl"
-            case .deleteRemoteCtrl: return "deleteRemoteCtrl"
            case .showVersion: return "showVersion"
            case .string: return "console command"
            }
@@ -485,7 +456,7 @@ public enum ChatResponse: Decodable, Error {
    case serverTestResult(user: UserRef, testServer: String, testFailure: ProtocolTestFailure?)
    case chatItemTTL(user: UserRef, chatItemTTL: Int64?)
    case networkConfig(networkConfig: NetCfg)
-    case contactInfo(user: UserRef, contact: Contact, connectionStats_: ConnectionStats?, customUserProfile: Profile?)
+    case contactInfo(user: UserRef, contact: Contact, connectionStats: ConnectionStats, customUserProfile: Profile?)
    case groupMemberInfo(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats_: ConnectionStats?)
    case contactSwitchStarted(user: UserRef, contact: Contact, connectionStats: ConnectionStats)
    case groupMemberSwitchStarted(user: UserRef, groupInfo: GroupInfo, member: GroupMember, connectionStats: ConnectionStats)
@@ -505,9 +476,8 @@ public enum ChatResponse: Decodable, Error {
    case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
    case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
    case connectionPlan(user: UserRef, connectionPlan: ConnectionPlan)
-    case sentConfirmation(user: UserRef, connection: PendingContactConnection)
-    case sentInvitation(user: UserRef, connection: PendingContactConnection)
-    case sentInvitationToContact(user: UserRef, contact: Contact, customUserProfile: Profile?)
+    case sentConfirmation(user: UserRef)
+    case sentInvitation(user: UserRef)
    case contactAlreadyExists(user: UserRef, contact: Contact)
    case contactRequestAlreadyAccepted(user: UserRef, contact: Contact)
    case contactDeleted(user: UserRef, contact: Contact)
@@ -604,17 +574,9 @@ public enum ChatResponse: Decodable, Error {
    case callInvitations(callInvitations: [RcvCallInvitation])
    case ntfTokenStatus(status: NtfTknStatus)
    case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode)
-    case ntfMessages(user_: User?, connEntity_: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
-    case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgInfo)
+    case ntfMessages(user_: User?, connEntity: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
+    case newContactConnection(user: UserRef, connection: PendingContactConnection)
    case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
-    // remote desktop responses/events
-    case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
-    case remoteCtrlFound(remoteCtrl: RemoteCtrlInfo, ctrlAppInfo_: CtrlAppInfo?, appVersion: String, compatible: Bool)
-    case remoteCtrlConnecting(remoteCtrl_: RemoteCtrlInfo?, ctrlAppInfo: CtrlAppInfo, appVersion: String)
-    case remoteCtrlSessionCode(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
-    case remoteCtrlConnected(remoteCtrl: RemoteCtrlInfo)
-    case remoteCtrlStopped(rcsState: RemoteCtrlSessionState, rcStopReason: RemoteCtrlStopReason)
-    // misc
    case versionInfo(versionInfo: CoreVersionInfo, chatMigrations: [UpMigration], agentMigrations: [UpMigration])
    case cmdOk(user: UserRef?)
    case chatCmdError(user_: UserRef?, chatError: ChatError)
@@ -660,7 +622,6 @@ public enum ChatResponse: Decodable, Error {
            case .connectionPlan: return "connectionPlan"
            case .sentConfirmation: return "sentConfirmation"
            case .sentInvitation: return "sentInvitation"
-            case .sentInvitationToContact: return "sentInvitationToContact"
            case .contactAlreadyExists: return "contactAlreadyExists"
            case .contactRequestAlreadyAccepted: return "contactRequestAlreadyAccepted"
            case .contactDeleted: return "contactDeleted"
@@ -752,14 +713,8 @@ public enum ChatResponse: Decodable, Error {
            case .ntfTokenStatus: return "ntfTokenStatus"
            case .ntfToken: return "ntfToken"
            case .ntfMessages: return "ntfMessages"
-            case .ntfMessage: return "ntfMessage"
+            case .newContactConnection: return "newContactConnection"
            case .contactConnectionDeleted: return "contactConnectionDeleted"
-            case .remoteCtrlList: return "remoteCtrlList"
-            case .remoteCtrlFound: return "remoteCtrlFound"
-            case .remoteCtrlConnecting: return "remoteCtrlConnecting"
-            case .remoteCtrlSessionCode: return "remoteCtrlSessionCode"
-            case .remoteCtrlConnected: return "remoteCtrlConnected"
-            case .remoteCtrlStopped: return "remoteCtrlStopped"
            case .versionInfo: return "versionInfo"
            case .cmdOk: return "cmdOk"
            case .chatCmdError: return "chatCmdError"
@@ -786,7 +741,7 @@ public enum ChatResponse: Decodable, Error {
            case let .serverTestResult(u, server, testFailure): return withUser(u, "server: \(server)\nresult: \(String(describing: testFailure))")
            case let .chatItemTTL(u, chatItemTTL): return withUser(u, String(describing: chatItemTTL))
            case let .networkConfig(networkConfig): return String(describing: networkConfig)
-            case let .contactInfo(u, contact, connectionStats_, customUserProfile): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats_: \(String(describing: connectionStats_))\ncustomUserProfile: \(String(describing: customUserProfile))")
+            case let .contactInfo(u, contact, connectionStats, customUserProfile): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))\ncustomUserProfile: \(String(describing: customUserProfile))")
            case let .groupMemberInfo(u, groupInfo, member, connectionStats_): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats_: \(String(describing: connectionStats_))")
            case let .contactSwitchStarted(u, contact, connectionStats): return withUser(u, "contact: \(String(describing: contact))\nconnectionStats: \(String(describing: connectionStats))")
            case let .groupMemberSwitchStarted(u, groupInfo, member, connectionStats): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionStats: \(String(describing: connectionStats))")
@@ -803,12 +758,11 @@ public enum ChatResponse: Decodable, Error {
            case let .contactCode(u, contact, connectionCode): return withUser(u, "contact: \(String(describing: contact))\nconnectionCode: \(connectionCode)")
            case let .groupMemberCode(u, groupInfo, member, connectionCode): return withUser(u, "groupInfo: \(String(describing: groupInfo))\nmember: \(String(describing: member))\nconnectionCode: \(connectionCode)")
            case let .connectionVerified(u, verified, expectedCode): return withUser(u, "verified: \(verified)\nconnectionCode: \(expectedCode)")
-            case let .invitation(u, connReqInvitation, connection): return withUser(u, "connReqInvitation: \(connReqInvitation)\nconnection: \(connection)")
+            case let .invitation(u, connReqInvitation, _): return withUser(u, connReqInvitation)
            case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
            case let .connectionPlan(u, connectionPlan): return withUser(u, String(describing: connectionPlan))
-            case let .sentConfirmation(u, connection): return withUser(u, String(describing: connection))
-            case let .sentInvitation(u, connection): return withUser(u, String(describing: connection))
-            case let .sentInvitationToContact(u, contact, _): return withUser(u, String(describing: contact))
+            case .sentConfirmation: return noDetails
+            case .sentInvitation: return noDetails
            case let .contactAlreadyExists(u, contact): return withUser(u, String(describing: contact))
            case let .contactRequestAlreadyAccepted(u, contact): return withUser(u, String(describing: contact))
            case let .contactDeleted(u, contact): return withUser(u, String(describing: contact))
@@ -900,14 +854,8 @@ public enum ChatResponse: Decodable, Error {
            case let .ntfTokenStatus(status): return String(describing: status)
            case let .ntfToken(token, status, ntfMode): return "token: \(token)\nstatus: \(status.rawValue)\nntfMode: \(ntfMode.rawValue)"
            case let .ntfMessages(u, connEntity, msgTs, ntfMessages): return withUser(u, "connEntity: \(String(describing: connEntity))\nmsgTs: \(String(describing: msgTs))\nntfMessages: \(String(describing: ntfMessages))")
-            case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
+            case let .newContactConnection(u, connection): return withUser(u, String(describing: connection))
            case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
-            case let .remoteCtrlList(remoteCtrls): return String(describing: remoteCtrls)
-            case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible): return "remoteCtrl:\n\(String(describing: remoteCtrl))\nctrlAppInfo_:\n\(String(describing: ctrlAppInfo_))\nappVersion: \(appVersion)\ncompatible: \(compatible)"
-            case let .remoteCtrlConnecting(remoteCtrl_, ctrlAppInfo, appVersion): return "remoteCtrl_:\n\(String(describing: remoteCtrl_))\nctrlAppInfo:\n\(String(describing: ctrlAppInfo))\nappVersion: \(appVersion)"
-            case let .remoteCtrlSessionCode(remoteCtrl_, sessionCode): return "remoteCtrl_:\n\(String(describing: remoteCtrl_))\nsessionCode: \(sessionCode)"
-            case let .remoteCtrlConnected(remoteCtrl): return String(describing: remoteCtrl)
-            case .remoteCtrlStopped: return noDetails
            case let .versionInfo(versionInfo, chatMigrations, agentMigrations): return "\(String(describing: versionInfo))\n\nchat migrations: \(chatMigrations.map(\.upName))\n\nagent migrations: \(agentMigrations.map(\.upName))"
            case .cmdOk: return noDetails
            case let .chatCmdError(u, chatError): return withUser(u, String(describing: chatError))
@@ -954,7 +902,6 @@ public enum ContactAddressPlan: Decodable {
    case connectingConfirmReconnect
    case connectingProhibit(contact: Contact)
    case known(contact: Contact)
-    case contactViaAddress(contact: Contact)
 }

 public enum GroupLinkPlan: Decodable {
@@ -1207,9 +1154,9 @@ public struct NetCfg: Codable, Equatable {
    public static let defaults: NetCfg = NetCfg(
        socksProxy: nil,
        sessionMode: TransportSessionMode.user,
-        tcpConnectTimeout: 20_000_000,
-        tcpTimeout: 15_000_000,
-        tcpTimeoutPerKb: 45_000,
+        tcpConnectTimeout: 15_000_000,
+        tcpTimeout: 10_000_000,
+        tcpTimeoutPerKb: 30_000,
        tcpKeepAlive: KeepAliveOpts.defaults,
        smpPingInterval: 1200_000_000,
        smpPingCount: 3,
@@ -1498,8 +1445,6 @@ 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 {
    case off = "OFF"
    case periodic = "PERIODIC"
@@ -1507,9 +1452,9 @@ public enum NotificationsMode: String, Decodable, SelectableItem {

    public var label: LocalizedStringKey {
        switch self {
-        case .off: "Local"
-        case .periodic: "Periodically"
-        case .instant: "Instantly"
+        case .off: return "Off (Local)"
+        case .periodic: return "Periodically"
+        case .instant: return "Instantly"
        }
    }

@@ -1536,41 +1481,6 @@ public enum NotificationPreviewMode: String, SelectableItem {
    public static var values: [NotificationPreviewMode] = [.message, .contact, .hidden]
 }

-public struct RemoteCtrlInfo: Decodable {
-    public var remoteCtrlId: Int64
-    public var ctrlDeviceName: String
-    public var sessionState: RemoteCtrlSessionState?
-
-    public var deviceViewName: String {
-        ctrlDeviceName == "" ? "\(remoteCtrlId)" : ctrlDeviceName
-    }
-}
-
-public enum RemoteCtrlSessionState: Decodable {
-    case starting
-    case searching
-    case connecting
-    case pendingConfirmation(sessionCode: String)
-    case connected(sessionCode: String)
-}
-
-public enum RemoteCtrlStopReason: Decodable {
-    case discoveryFailed(chatError: ChatError)
-    case connectionFailed(chatError: ChatError)
-    case setupFailed(chatError: ChatError)
-    case disconnected
-}
-
-public struct CtrlAppInfo: Decodable {
-    public var appVersionRange: AppVersionRange
-    public var deviceName: String
-}
-
-public struct AppVersionRange: Decodable {
-    public var minVersion: String
-    public var maxVersion: String
-}
-
 public struct CoreVersionInfo: Decodable {
    public var version: String
    public var simplexmqVersion: String
@@ -1598,7 +1508,6 @@ public enum ChatError: Decodable {
    case errorAgent(agentError: AgentErrorType)
    case errorStore(storeError: StoreError)
    case errorDatabase(databaseError: DatabaseError)
-    case errorRemoteCtrl(remoteCtrlError: RemoteCtrlError)
    case invalidJSON(json: String)
 }

@@ -1758,7 +1667,6 @@ public enum AgentErrorType: Decodable {
    case SMP(smpErr: ProtocolErrorType)
    case NTF(ntfErr: ProtocolErrorType)
    case XFTP(xftpErr: XFTPErrorType)
-    case RCP(rcpErr: RCErrorType)
    case BROKER(brokerAddress: String, brokerErr: BrokerErrorType)
    case AGENT(agentErr: SMPAgentError)
    case INTERNAL(internalErr: String)
@@ -1816,22 +1724,6 @@ public enum XFTPErrorType: Decodable {
    case INTERNAL
 }

-public enum RCErrorType: Decodable {
-    case `internal`(internalErr: String)
-    case identity
-    case noLocalAddress
-    case tlsStartFailed
-    case exception(exception: String)
-    case ctrlAuth
-    case ctrlNotFound
-    case ctrlError(ctrlErr: String)
-    case version
-    case encrypt
-    case decrypt
-    case blockSize
-    case syntax(syntaxErr: String)
-}
-
 public enum ProtocolCommandError: Decodable {
    case UNKNOWN
    case SYNTAX
@@ -1867,14 +1759,3 @@ public enum ArchiveError: Decodable {
    case `import`(chatError: ChatError)
    case importFile(file: String, chatError: ChatError)
 }
-
-public enum RemoteCtrlError: Decodable {
-    case inactive
-    case badState
-    case busy
-    case timeout
-    case disconnected(remoteCtrlId: Int64, reason: String)
-    case badInvitation
-    case badVersion(appVersion: String)
-//    case protocolError(protocolError: RemoteProtocolError)
-}
@@ -9,16 +9,12 @@
 import Foundation
 import SwiftUI

-public let appSuspendTimeout: Int = 15 // seconds
-
 let GROUP_DEFAULT_APP_STATE = "appState"
-let GROUP_DEFAULT_NSE_STATE = "nseState"
 let GROUP_DEFAULT_DB_CONTAINER = "dbContainer"
 public let GROUP_DEFAULT_CHAT_LAST_START = "chatLastStart"
-public let GROUP_DEFAULT_CHAT_LAST_BACKGROUND_RUN = "chatLastBackgroundRun"
 let GROUP_DEFAULT_NTF_PREVIEW_MODE = "ntfPreviewMode"
-public let GROUP_DEFAULT_NTF_ENABLE_LOCAL = "ntfEnableLocal" // no longer used
-public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic" // no longer used
+public let GROUP_DEFAULT_NTF_ENABLE_LOCAL = "ntfEnableLocal"
+public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic"
 let GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 public let GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE = "privacyTransferImagesInline" // no longer used
 public let GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES = "privacyEncryptLocalFiles"
@@ -70,23 +66,13 @@ public func registerGroupDefaults() {
    ])
 }

-public enum AppState: String, Codable {
+public enum AppState: String {
    case active
-    case activating
    case bgRefresh
    case suspending
    case suspended
    case stopped

-    public var running: Bool {
-        switch self {
-        case .active: return true
-        case .activating: return true
-        case .bgRefresh: return true
-        default: return false
-        }
-    }
-
    public var inactive: Bool {
        switch self {
        case .suspending: return true
@@ -98,57 +84,23 @@ public enum AppState: String, Codable {
    public var canSuspend: Bool {
        switch self {
        case .active: return true
-        case .activating: return true
        case .bgRefresh: return true
        default: return false
        }
    }
 }

-public enum NSEState: String, Codable {
-    case created
-    case starting
-    case active
-    case suspending
-    case suspended
-
-    public var inactive: Bool {
-        switch self {
-        case .created: true
-        case .suspended: true
-        default: false
-        }
-    }
-
-    public var canSuspend: Bool {
-        if case .active = self { true } else { false }
-    }
-}
-
 public enum DBContainer: String {
    case documents
    case group
 }

-// appStateGroupDefault must not be used in the app directly, only via AppChatState singleton
 public let appStateGroupDefault = EnumDefault<AppState>(
    defaults: groupDefaults,
    forKey: GROUP_DEFAULT_APP_STATE,
    withDefault: .active
 )

-// nseStateGroupDefault must not be used in NSE directly, only via NSEChatState singleton
-public let nseStateGroupDefault = EnumDefault<NSEState>(
-    defaults: groupDefaults,
-    forKey: GROUP_DEFAULT_NSE_STATE,
-    withDefault: .suspended // so that NSE that was never launched does not delay the app from resuming
-)
-
-// inactive app states do not include "stopped" state
-public func allowBackgroundRefresh() -> Bool {
-    appStateGroupDefault.get().inactive && nseStateGroupDefault.get().inactive
-}
-
 public let dbContainerGroupDefault = EnumDefault<DBContainer>(
    defaults: groupDefaults,
    forKey: GROUP_DEFAULT_DB_CONTAINER,
@@ -157,8 +109,6 @@ public let dbContainerGroupDefault = EnumDefault<DBContainer>(

 public let chatLastStartGroupDefault = DateDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_CHAT_LAST_START)

-public let chatLastBackgroundRunGroupDefault = DateDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_CHAT_LAST_BACKGROUND_RUN)
-
 public let ntfPreviewModeGroupDefault = EnumDefault<NotificationPreviewMode>(
    defaults: groupDefaults,
    forKey: GROUP_DEFAULT_NTF_PREVIEW_MODE,
@@ -167,6 +117,10 @@ public let ntfPreviewModeGroupDefault = EnumDefault<NotificationPreviewMode>(

 public let incognitoGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_INCOGNITO)

+public let ntfEnableLocalGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_NTF_ENABLE_LOCAL)
+
+public let ntfEnablePeriodicGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_NTF_ENABLE_PERIODIC)
+
 public let privacyAcceptImagesGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES)

 public let privacyEncryptLocalFilesGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES)
@@ -1370,7 +1370,7 @@ public struct Contact: Identifiable, Decodable, NamedChat {
    public var contactId: Int64
    var localDisplayName: ContactName
    public var profile: LocalProfile
-    public var activeConn: Connection?
+    public var activeConn: Connection
    public var viaGroup: Int64?
    public var contactUsed: Bool
    public var contactStatus: ContactStatus
@@ -1384,10 +1384,10 @@ public struct Contact: Identifiable, Decodable, NamedChat {

    public var id: ChatId { get { "@\(contactId)" } }
    public var apiId: Int64 { get { contactId } }
-    public var ready: Bool { get { activeConn?.connStatus == .ready } }
+    public var ready: Bool { get { activeConn.connStatus == .ready } }
    public var active: Bool { get { contactStatus == .active } }
    public var sendMsgEnabled: Bool { get {
-        (ready && active && !(activeConn?.connectionStats?.ratchetSyncSendProhibited ?? false))
+        (ready && active && !(activeConn.connectionStats?.ratchetSyncSendProhibited ?? false))
        || nextSendGrpInv
    } }
    public var nextSendGrpInv: Bool { get { contactGroupMemberId != nil && !contactGrpInvSent } }
@@ -1396,18 +1396,14 @@ public struct Contact: Identifiable, Decodable, NamedChat {
    public var image: String? { get { profile.image } }
    public var contactLink: String? { get { profile.contactLink } }
    public var localAlias: String { profile.localAlias }
-    public var verified: Bool { activeConn?.connectionCode != nil }
+    public var verified: Bool { activeConn.connectionCode != nil }

    public var directOrUsed: Bool {
-        if let activeConn = activeConn {
-            (activeConn.connLevel == 0 && !activeConn.viaGroupLink) || contactUsed
-        } else {
-            true
-        }
+        (activeConn.connLevel == 0 && !activeConn.viaGroupLink) || contactUsed
    }

    public var contactConnIncognito: Bool {
-        activeConn?.customUserProfileId != nil
+        activeConn.customUserProfileId != nil
    }

    public func allowsFeature(_ feature: ChatFeature) -> Bool {
@@ -1847,7 +1843,7 @@ public struct GroupMember: Identifiable, Decodable {
    public func canChangeRoleTo(groupInfo: GroupInfo) -> [GroupMemberRole]? {
        if !canBeRemoved(groupInfo: groupInfo) { return nil }
        let userRole = groupInfo.membership.memberRole
-        return GroupMemberRole.allCases.filter { $0 <= userRole && $0 != .author }
+        return GroupMemberRole.allCases.filter { $0 <= userRole }
    }

    public var memberIncognito: Bool {
@@ -1887,7 +1883,6 @@ public struct GroupMemberIds: Decodable {

 public enum GroupMemberRole: String, Identifiable, CaseIterable, Comparable, Decodable {
    case observer = "observer"
-    case author = "author"
    case member = "member"
    case admin = "admin"
    case owner = "owner"
@@ -1897,7 +1892,6 @@ public enum GroupMemberRole: String, Identifiable, CaseIterable, Comparable, Dec
    public var text: String {
        switch self {
        case .observer: return NSLocalizedString("observer", comment: "member role")
-        case .author: return NSLocalizedString("author", comment: "member role")
        case .member: return NSLocalizedString("member", comment: "member role")
        case .admin: return NSLocalizedString("admin", comment: "member role")
        case .owner: return NSLocalizedString("owner", comment: "member role")
@@ -1907,10 +1901,9 @@ public enum GroupMemberRole: String, Identifiable, CaseIterable, Comparable, Dec
    private var comparisonValue: Int {
        switch self {
        case .observer: return 0
-        case .author: return 1
-        case .member: return 2
-        case .admin: return 3
-        case .owner: return 4
+        case .member: return 1
+        case .admin: return 2
+        case .owner: return 3
        }
    }

@@ -2016,8 +2009,7 @@ public enum ConnectionEntity: Decodable {
 }

 public struct NtfMsgInfo: Decodable {
-    public var msgId: String
-    public var msgTs: Date
+
 }

 public struct AChatItem: Decodable {
@@ -2680,7 +2672,6 @@ public enum MsgDecryptError: String, Decodable {
    case tooManySkipped
    case ratchetEarlier
    case other
-    case ratchetSync

    var text: String {
        switch self {
@@ -2688,7 +2679,6 @@ public enum MsgDecryptError: String, Decodable {
        case .tooManySkipped: return NSLocalizedString("Permanent decryption error", comment: "message decrypt error item")
        case .ratchetEarlier: return NSLocalizedString("Decryption error", comment: "message decrypt error item")
        case .other: return NSLocalizedString("Decryption error", comment: "message decrypt error item")
-        case .ratchetSync: return NSLocalizedString("Encryption re-negotiation error", comment: "message decrypt error item")
        }
    }
 }
@@ -17,7 +17,7 @@ public func writeCryptoFile(path: String, data: Data) throws -> CryptoFileArgs {
    let ptr: UnsafeMutableRawPointer = malloc(data.count)
    memcpy(ptr, (data as NSData).bytes, data.count)
    var cPath = path.cString(using: .utf8)!
-    let cjson = chat_write_file(getChatCtrl(), &cPath, ptr, Int32(data.count))!
+    let cjson = chat_write_file(&cPath, ptr, Int32(data.count))!
    let d = fromCString(cjson).data(using: .utf8)!
    switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
    case let .result(cfArgs): return cfArgs
@@ -50,7 +50,7 @@ public func readCryptoFile(path: String, cryptoArgs: CryptoFileArgs) throws -> D
 public func encryptCryptoFile(fromPath: String, toPath: String) throws -> CryptoFileArgs {
    var cFromPath = fromPath.cString(using: .utf8)!
    var cToPath = toPath.cString(using: .utf8)!
-    let cjson = chat_encrypt_file(getChatCtrl(), &cFromPath, &cToPath)!
+    let cjson = chat_encrypt_file(&cFromPath, &cToPath)!
    let d = fromCString(cjson).data(using: .utf8)!
    switch try jsonDecoder.decode(WriteFileResult.self, from: d) {
    case let .result(cfArgs): return cfArgs
@@ -146,13 +146,6 @@ public func createErrorNtf(_ dbStatus: DBMigrationResult) -> UNMutableNotificati
    )
 }

-public func createAppStoppedNtf() -> UNMutableNotificationContent {
-    return createNotification(
-        categoryIdentifier: ntfCategoryConnectionEvent,
-        title: NSLocalizedString("Encrypted message: app is stopped", comment: "notification")
-    )
-}
-
 private func groupMsgNtfTitle(_ groupInfo: GroupInfo, _ groupMember: GroupMember, hideContent: Bool) -> String {
    hideContent
    ? NSLocalizedString("Group message:", comment: "notification")
@@ -1,99 +0,0 @@
-//
-//  SharedFileSubscriber.swift
-//  SimpleXChat
-//
-//  Created by Evgeny on 09/12/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-
-public typealias AppSubscriber = SharedFileSubscriber<ProcessMessage<AppProcessMessage>>
-
-public typealias NSESubscriber = SharedFileSubscriber<ProcessMessage<NSEProcessMessage>>
-
-public class SharedFileSubscriber<Message: Codable>: NSObject, NSFilePresenter {
-    var fileURL: URL
-    public var presentedItemURL: URL?
-    public var presentedItemOperationQueue: OperationQueue = .main
-    var subscriber: (Message) -> Void
-
-    init(fileURL: URL, onMessage: @escaping (Message) -> Void) {
-        self.fileURL = fileURL
-        presentedItemURL = fileURL
-        subscriber = onMessage
-        super.init()
-        NSFileCoordinator.addFilePresenter(self)
-    }
-
-    public func presentedItemDidChange() {
-        do {
-            let data = try Data(contentsOf: fileURL)
-            let msg = try jsonDecoder.decode(Message.self, from: data)
-            subscriber(msg)
-        } catch let error {
-            logger.error("presentedItemDidChange error: \(error)")
-        }
-    }
-
-    static func notify(url: URL, message: Message) {
-        let fc = NSFileCoordinator(filePresenter: nil)
-        fc.coordinate(writingItemAt: url, options: [], error: nil) { newURL in
-            do {
-                let data = try jsonEncoder.encode(message)
-                try data.write(to: newURL, options: [.atomic])
-            } catch {
-                logger.error("notifyViaSharedFile error: \(error)")
-            }
-        }
-    }
-
-    deinit {
-        NSFileCoordinator.removeFilePresenter(self)
-    }
-}
-
-let appMessagesSharedFile = getGroupContainerDirectory().appendingPathComponent("chat.simplex.app.messages", isDirectory: false)
-
-let nseMessagesSharedFile = getGroupContainerDirectory().appendingPathComponent("chat.simplex.app.SimpleX-NSE.messages", isDirectory: false)
-
-public struct ProcessMessage<Message: Codable>: Codable {
-    var createdAt: Date = Date.now
-    var message: Message
-}
-
-public enum AppProcessMessage: Codable {
-    case state(state: AppState)
-}
-
-public enum NSEProcessMessage: Codable {
-    case state(state: NSEState)
-}
-
-public func sendAppProcessMessage(_ message: AppProcessMessage) {
-    SharedFileSubscriber.notify(url: appMessagesSharedFile, message: ProcessMessage(message: message))
-}
-
-public func sendNSEProcessMessage(_ message: NSEProcessMessage) {
-    SharedFileSubscriber.notify(url: nseMessagesSharedFile, message: ProcessMessage(message: message))
-}
-
-public func appMessageSubscriber(onMessage: @escaping (AppProcessMessage) -> Void) -> AppSubscriber {
-    SharedFileSubscriber(fileURL: appMessagesSharedFile) { (msg: ProcessMessage<AppProcessMessage>) in
-        onMessage(msg.message)
-    }
-}
-
-public func nseMessageSubscriber(onMessage: @escaping (NSEProcessMessage) -> Void) -> NSESubscriber {
-    SharedFileSubscriber(fileURL: nseMessagesSharedFile) { (msg: ProcessMessage<NSEProcessMessage>) in
-        onMessage(msg.message)
-    }
-}
-
-public func sendAppState(_ state: AppState) {
-    sendAppProcessMessage(.state(state: state))
-}
-
-public func sendNSEState(_ state: NSEState) {
-    sendNSEProcessMessage(.state(state: state))
-}
@@ -9,27 +9,27 @@
 #ifndef SimpleX_h
 #define SimpleX_h

-#include "hs_init.h"
+#endif /* SimpleX_h */

 extern void hs_init(int argc, char **argv[]);

 typedef void* chat_ctrl;

 // the last parameter is used to return the pointer to chat controller
-extern char *chat_migrate_init_key(char *path, char *key, int keepKey, char *confirm, int backgroundMode, chat_ctrl *ctrl);
+extern char *chat_migrate_init(char *path, char *key, char *confirm, chat_ctrl *ctrl);
 extern char *chat_close_store(chat_ctrl ctl);
-extern char *chat_reopen_store(chat_ctrl ctl);
 extern char *chat_send_cmd(chat_ctrl ctl, char *cmd);
+extern char *chat_recv_msg(chat_ctrl ctl);
 extern char *chat_recv_msg_wait(chat_ctrl ctl, int wait);
 extern char *chat_parse_markdown(char *str);
 extern char *chat_parse_server(char *str);
 extern char *chat_password_hash(char *pwd, char *salt);
 extern char *chat_valid_name(char *name);
-extern char *chat_encrypt_media(chat_ctrl ctl, char *key, char *frame, int len);
+extern char *chat_encrypt_media(char *key, char *frame, int len);
 extern char *chat_decrypt_media(char *key, char *frame, int len);

 // chat_write_file returns null-terminated string with JSON of WriteFileResult
-extern char *chat_write_file(chat_ctrl ctl, char *path, char *data, int len);
+extern char *chat_write_file(char *path, char *data, int len);

 // chat_read_file returns a buffer with:
 // result status (1 byte), then if
@@ -38,9 +38,7 @@ extern char *chat_write_file(chat_ctrl ctl, char *path, char *data, int len);
 extern char *chat_read_file(char *path, char *key, char *nonce);

 // chat_encrypt_file returns null-terminated string with JSON of WriteFileResult
-extern char *chat_encrypt_file(chat_ctrl ctl, char *fromPath, char *toPath);
+extern char *chat_encrypt_file(char *fromPath, char *toPath);

 // chat_decrypt_file returns null-terminated string with the error message
 extern char *chat_decrypt_file(char *fromPath, char *key, char *nonce, char *toPath);
-
-#endif /* SimpleX_h */
@@ -1,41 +0,0 @@
-//
-//  hs_init.c
-//  SimpleXChat
-//
-//  Created by Evgeny on 22/11/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-#include "hs_init.h"
-
-extern void hs_init_with_rtsopts(int * argc, char **argv[]);
-
-void haskell_init(void) {
-    int argc = 5;
-    char *argv[] = {
-        "simplex",
-        "+RTS", // requires `hs_init_with_rtsopts`
-        "-A16m", // chunk size for new allocations
-        "-H64m", // initial heap size
-        "-xn", // non-moving GC
-        0
-    };
-    char **pargv = argv;
-    hs_init_with_rtsopts(&argc, &pargv);
-}
-
-void haskell_init_nse(void) {
-    int argc = 7;
-    char *argv[] = {
-        "simplex",
-        "+RTS", // requires `hs_init_with_rtsopts`
-        "-A1m", // chunk size for new allocations
-        "-H1m", // initial heap size
-        "-F0.5", // heap growth triggering GC
-        "-Fd1", // memory return
-        "-c", // compacting garbage collector
-        0
-    };
-    char **pargv = argv;
-    hs_init_with_rtsopts(&argc, &pargv);
-}
@@ -1,16 +0,0 @@
-//
-//  hs_init.h
-//  SimpleXChat
-//
-//  Created by Evgeny on 22/11/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-#ifndef hs_init_h
-#define hs_init_h
-
-void haskell_init(void);
-
-void haskell_init_nse(void);
-
-#endif /* hs_init_h */
@@ -720,12 +720,21 @@
 /* server test step */
 "Connect" = "Свързване";

+/* No comment provided by engineer. */
+"Connect directly" = "Свързване директно";
+
 /* No comment provided by engineer. */
 "Connect incognito" = "Свързване инкогнито";

 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "свържете се с разработчиците на SimpleX Chat.";

+/* No comment provided by engineer. */
+"Connect via contact link" = "Свързване чрез линк на контакта";
+
+/* No comment provided by engineer. */
+"Connect via group link?" = "Свързване чрез групов линк?";
+
 /* No comment provided by engineer. */
 "Connect via link" = "Свърване чрез линк";

@@ -738,9 +747,6 @@
 /* No comment provided by engineer. */
 "connected" = "свързан";

-/* rcv group event chat item */
-"connected directly" = "свързан директно";
-
 /* No comment provided by engineer. */
 "connecting" = "свързване";

@@ -795,6 +801,9 @@
 /* No comment provided by engineer. */
 "Contact already exists" = "Контактът вече съществува";

+/* No comment provided by engineer. */
+"Contact and all messages will be deleted - this cannot be undone!" = "Контактът и всички съобщения ще бъдат изтрити - това не може да бъде отменено!";
+
 /* No comment provided by engineer. */
 "contact has e2e encryption" = "контактът има e2e криптиране";

@@ -999,6 +1008,9 @@
 /* No comment provided by engineer. */
 "Delete Contact" = "Изтрий контакт";

+/* No comment provided by engineer. */
+"Delete contact?" = "Изтрий контакт?";
+
 /* No comment provided by engineer. */
 "Delete database" = "Изтрий базата данни";

@@ -1155,6 +1167,12 @@
 /* No comment provided by engineer. */
 "Discover and join groups" = "Открийте и се присъединете към групи";

+/* No comment provided by engineer. */
+"Display name" = "Показвано Име";
+
+/* No comment provided by engineer. */
+"Display name:" = "Показвано име:";
+
 /* No comment provided by engineer. */
 "Do it later" = "Отложи";

@@ -1359,9 +1377,6 @@
 /* No comment provided by engineer. */
 "Error creating group link" = "Грешка при създаване на групов линк";

-/* No comment provided by engineer. */
-"Error creating member contact" = "Грешка при създаване на контакт с член";
-
 /* No comment provided by engineer. */
 "Error creating profile!" = "Грешка при създаване на профил!";

@@ -1440,9 +1455,6 @@
 /* No comment provided by engineer. */
 "Error sending email" = "Грешка при изпращане на имейл";

-/* No comment provided by engineer. */
-"Error sending member contact invitation" = "Грешка при изпращане на съобщение за покана за контакт";
-
 /* No comment provided by engineer. */
 "Error sending message" = "Грешка при изпращане на съобщение";

@@ -2215,8 +2227,7 @@
 "observer" = "наблюдател";

 /* enabled status
-   group pref value
-   time to disappear */
+   group pref value */
 "off" = "изключено";

 /* No comment provided by engineer. */
@@ -2297,9 +2308,6 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Само вашият контакт може да изпраща гласови съобщения.";

-/* No comment provided by engineer. */
-"Open" = "Отвори";
-
 /* No comment provided by engineer. */
 "Open chat" = "Отвори чат";

@@ -2318,6 +2326,12 @@
 /* No comment provided by engineer. */
 "Opening database…" = "Отваряне на база данни…";

+/* No comment provided by engineer. */
+"Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." = "Отварянето на линка в браузъра може да намали поверителността и сигурността на връзката. Несигурните SimpleX линкове ще бъдат червени.";
+
+/* No comment provided by engineer. */
+"or chat with the developers" = "или пишете на разработчиците";
+
 /* member role */
 "owner" = "собственик";

@@ -2768,15 +2782,9 @@
 /* No comment provided by engineer. */
 "Send delivery receipts to" = "Изпращайте потвърждениe за доставка на";

-/* No comment provided by engineer. */
-"send direct message" = "изпрати лично съобщение";
-
 /* No comment provided by engineer. */
 "Send direct message" = "Изпрати лично съобщение";

-/* No comment provided by engineer. */
-"Send direct message to connect" = "Изпрати лично съобщение за свързване";
-
 /* No comment provided by engineer. */
 "Send disappearing message" = "Изпрати изчезващо съобщение";

@@ -3107,6 +3115,9 @@
 /* No comment provided by engineer. */
 "The encryption is working and the new encryption agreement is not required. It may result in connection errors!" = "Криптирането работи и новото споразумение за криптиране не е необходимо. Това може да доведе до грешки при свързване!";

+/* No comment provided by engineer. */
+"The group is fully decentralized – it is visible only to the members." = "Групата е напълно децентрализирана – видима е само за членовете.";
+
 /* No comment provided by engineer. */
 "The hash of the previous message is different." = "Хешът на предишното съобщение е различен.";

@@ -3599,6 +3610,9 @@
 /* No comment provided by engineer. */
 "You will be required to authenticate when you start or resume the app after 30 seconds in background." = "Ще трябва да се идентифицирате, когато стартирате или възобновите приложението след 30 секунди във фонов режим.";

+/* No comment provided by engineer. */
+"You will join a group this link refers to and connect to its group members." = "Ще се присъедините към групата, към която този линк препраща, и ще се свържете с нейните членове.";
+
 /* No comment provided by engineer. */
 "You will still receive calls and notifications from muted profiles when they are active." = "Все още ще получавате обаждания и известия от заглушени профили, когато са активни.";

@@ -3629,6 +3643,9 @@
 /* No comment provided by engineer. */
 "Your chat database is not encrypted - set passphrase to encrypt it." = "Вашата чат база данни не е криптирана - задайте парола, за да я криптирате.";

+/* No comment provided by engineer. */
+"Your chat profile will be sent to group members" = "Вашият чат профил ще бъде изпратен на членовете на групата";
+
 /* No comment provided by engineer. */
 "Your chat profiles" = "Вашите чат профили";

@@ -19,9 +19,6 @@
 /* No comment provided by engineer. */
 "_italic_" = "\\_kurzíva_";

-/* No comment provided by engineer. */
-"- connect to [directory service](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!\n- delivery receipts (up to 20 members).\n- faster and more stable." = "- připojit k [adresářová služba](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.cibule) (BETA)!\n- doručenky (až 20 členů).\n- Rychlejší a stabilnější.";
-
 /* No comment provided by engineer. */
 "- more stable message delivery.\n- a bit better groups.\n- and more!" = "- více stabilní doručování zpráv.\n- o trochu lepší skupiny.\n- a více!";

@@ -184,9 +181,6 @@
 /* No comment provided by engineer. */
 "%lld minutes" = "%lld minut";

-/* No comment provided by engineer. */
-"%lld new interface languages" = "%d nové jazyky rozhraní";
-
 /* No comment provided by engineer. */
 "%lld second(s)" = "%lld vteřin";

@@ -449,9 +443,6 @@
 /* No comment provided by engineer. */
 "App build: %@" = "Sestavení aplikace: %@";

-/* No comment provided by engineer. */
-"App encrypts new local files (except videos)." = "Aplikace šifruje nové místní soubory (s výjimkou videí).";
-
 /* No comment provided by engineer. */
 "App icon" = "Ikona aplikace";

@@ -545,9 +536,6 @@
 /* No comment provided by engineer. */
 "Both you and your contact can send voice messages." = "Hlasové zprávy můžete posílat vy i váš kontakt.";

-/* No comment provided by engineer. */
-"Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Bulharský, finský, thajský a ukrajinský - díky uživatelům a [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";
-
 /* 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)." = "Podle chat profilu (výchozí) nebo [podle připojení](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).";

@@ -720,12 +708,21 @@
 /* server test step */
 "Connect" = "Připojit";

+/* No comment provided by engineer. */
+"Connect directly" = "Připojit přímo";
+
 /* No comment provided by engineer. */
 "Connect incognito" = "Spojit se inkognito";

 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "připojit se k vývojářům SimpleX Chat.";

+/* No comment provided by engineer. */
+"Connect via contact link" = "Připojit se přes odkaz";
+
+/* No comment provided by engineer. */
+"Connect via group link?" = "Připojit se přes odkaz skupiny?";
+
 /* No comment provided by engineer. */
 "Connect via link" = "Připojte se prostřednictvím odkazu";

@@ -738,9 +735,6 @@
 /* No comment provided by engineer. */
 "connected" = "připojeno";

-/* rcv group event chat item */
-"connected directly" = "připojeno přímo";
-
 /* No comment provided by engineer. */
 "connecting" = "připojování";

@@ -795,6 +789,9 @@
 /* No comment provided by engineer. */
 "Contact already exists" = "Kontakt již existuje";

+/* No comment provided by engineer. */
+"Contact and all messages will be deleted - this cannot be undone!" = "Kontakt a všechny zprávy budou smazány - nelze to vzít zpět!";
+
 /* No comment provided by engineer. */
 "contact has e2e encryption" = "kontakt má šifrování e2e";

@@ -846,9 +843,6 @@
 /* No comment provided by engineer. */
 "Create link" = "Vytvořit odkaz";

-/* No comment provided by engineer. */
-"Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" = "Vytvořit nový profil v [desktop app](https://simplex.chat/downloads/). 💻";
-
 /* No comment provided by engineer. */
 "Create one-time invitation link" = "Vytvořit jednorázovou pozvánku";

@@ -999,6 +993,9 @@
 /* No comment provided by engineer. */
 "Delete Contact" = "Smazat kontakt";

+/* No comment provided by engineer. */
+"Delete contact?" = "Smazat kontakt?";
+
 /* No comment provided by engineer. */
 "Delete database" = "Odstranění databáze";

@@ -1128,9 +1125,6 @@
 /* authentication reason */
 "Disable SimpleX Lock" = "Vypnutí zámku SimpleX";

-/* No comment provided by engineer. */
-"disabled" = "vypnut";
-
 /* No comment provided by engineer. */
 "Disappearing message" = "Mizící zpráva";

@@ -1153,7 +1147,10 @@
 "Disconnect" = "Odpojit";

 /* No comment provided by engineer. */
-"Discover and join groups" = "Objevte a připojte skupiny";
+"Display name" = "Zobrazované jméno";
+
+/* No comment provided by engineer. */
+"Display name:" = "Zobrazované jméno:";

 /* No comment provided by engineer. */
 "Do it later" = "Udělat později";
@@ -1245,12 +1242,6 @@
 /* No comment provided by engineer. */
 "Encrypt database?" = "Šifrovat databázi?";

-/* No comment provided by engineer. */
-"Encrypt local files" = "Šifrovat místní soubory";
-
-/* No comment provided by engineer. */
-"Encrypt stored files & media" = "Šifrovat uložené soubory a média";
-
 /* No comment provided by engineer. */
 "Encrypted database" = "Zašifrovaná databáze";

@@ -1359,15 +1350,9 @@
 /* No comment provided by engineer. */
 "Error creating group link" = "Chyba při vytváření odkazu skupiny";

-/* No comment provided by engineer. */
-"Error creating member contact" = "Chyba vytvoření kontaktu člena";
-
 /* No comment provided by engineer. */
 "Error creating profile!" = "Chyba při vytváření profilu!";

-/* No comment provided by engineer. */
-"Error decrypting file" = "Chyba dešifrování souboru";
-
 /* No comment provided by engineer. */
 "Error deleting chat database" = "Chyba při mazání databáze chatu";

@@ -1440,9 +1425,6 @@
 /* No comment provided by engineer. */
 "Error sending email" = "Chyba odesílání e-mailu";

-/* No comment provided by engineer. */
-"Error sending member contact invitation" = "Chyba odeslání pozvánky kontaktu";
-
 /* No comment provided by engineer. */
 "Error sending message" = "Chyba při odesílání zprávy";

@@ -2133,9 +2115,6 @@
 /* No comment provided by engineer. */
 "New database archive" = "Archiv nové databáze";

-/* No comment provided by engineer. */
-"New desktop app!" = "Nová desktopová aplikace!";
-
 /* No comment provided by engineer. */
 "New display name" = "Nově zobrazované jméno";

@@ -2172,9 +2151,6 @@
 /* No comment provided by engineer. */
 "No contacts to add" = "Žádné kontakty k přidání";

-/* No comment provided by engineer. */
-"No delivery information" = "Žádné informace o dodání";
-
 /* No comment provided by engineer. */
 "No device token!" = "Žádný token zařízení!";

@@ -2212,8 +2188,7 @@
 "observer" = "pozorovatel";

 /* enabled status
-   group pref value
-   time to disappear */
+   group pref value */
 "off" = "vypnuto";

 /* No comment provided by engineer. */
@@ -2294,9 +2269,6 @@
 /* No comment provided by engineer. */
 "Only your contact can send voice messages." = "Hlasové zprávy může odesílat pouze váš kontakt.";

-/* No comment provided by engineer. */
-"Open" = "Otevřít";
-
 /* No comment provided by engineer. */
 "Open chat" = "Otevřete chat";

@@ -2315,6 +2287,12 @@
 /* No comment provided by engineer. */
 "Opening database…" = "Otvírání databáze…";

+/* No comment provided by engineer. */
+"Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red." = "Otevření odkazu v prohlížeči může snížit soukromí a bezpečnost připojení. Nedůvěryhodné odkazy SimpleX budou červené.";
+
+/* No comment provided by engineer. */
+"or chat with the developers" = "nebo chat s vývojáři";
+
 /* member role */
 "owner" = "vlastník";

@@ -2504,9 +2482,6 @@
 /* No comment provided by engineer. */
 "Read more in our GitHub repository." = "Další informace najdete v našem repozitáři GitHub.";

-/* No comment provided by engineer. */
-"Receipts are disabled" = "Informace o dodání jsou zakázány";
-
 /* No comment provided by engineer. */
 "received answer…" = "obdržel odpověď…";

@@ -2765,15 +2740,9 @@
 /* No comment provided by engineer. */
 "Send delivery receipts to" = "Potvrzení o doručení zasílat na";

-/* No comment provided by engineer. */
-"send direct message" = "odeslat přímou zprávu";
-
 /* No comment provided by engineer. */
 "Send direct message" = "Odeslat přímou zprávu";

-/* No comment provided by engineer. */
-"Send direct message to connect" = "Odeslat přímou zprávu pro připojení";
-
 /* No comment provided by engineer. */
 "Send disappearing message" = "Poslat mizící zprávu";

@@ -2816,15 +2785,9 @@
 /* No comment provided by engineer. */
 "Sending receipts is disabled for %lld contacts" = "Odesílání potvrzení o doručení je vypnuto pro %lld kontakty";

-/* No comment provided by engineer. */
-"Sending receipts is disabled for %lld groups" = "Odesílání potvrzení o doručení vypnuto pro %lld skupiny";
-
 /* No comment provided by engineer. */
 "Sending receipts is enabled for %lld contacts" = "Odesílání potvrzení o doručení je povoleno pro %lld kontakty";

-/* No comment provided by engineer. */
-"Sending receipts is enabled for %lld groups" = "Odesílání potvrzení o doručení povoleno pro %lld skupiny";
-
 /* No comment provided by engineer. */
 "Sending via" = "Odesílání přes";

@@ -2909,9 +2872,6 @@
 /* No comment provided by engineer. */
 "Show developer options" = "Zobrazit možnosti vývojáře";

-/* No comment provided by engineer. */
-"Show last messages" = "Zobrazit poslední zprávy";
-
 /* No comment provided by engineer. */
 "Show preview" = "Zobrazení náhledu";

@@ -2954,18 +2914,12 @@
 /* simplex link type */
 "SimpleX one-time invitation" = "Jednorázová pozvánka SimpleX";

-/* No comment provided by engineer. */
-"Simplified incognito mode" = "Zjednodušený inkognito režim";
-
 /* No comment provided by engineer. */
 "Skip" = "Přeskočit";

 /* No comment provided by engineer. */
 "Skipped messages" = "Přeskočené zprávy";

-/* No comment provided by engineer. */
-"Small groups (max 20)" = "Malé skupiny (max. 20)";
-
 /* No comment provided by engineer. */
 "SMP servers" = "SMP servery";

@@ -3104,6 +3058,9 @@
 /* No comment provided by engineer. */
 "The encryption is working and the new encryption agreement is not required. It may result in connection errors!" = "Šifrování funguje a nové povolení šifrování není vyžadováno. To může vyvolat chybu v připojení!";

+/* No comment provided by engineer. */
+"The group is fully decentralized – it is visible only to the members." = "Skupina je plně decentralizovaná - je viditelná pouze pro členy.";
+
 /* No comment provided by engineer. */
 "The hash of the previous message is different." = "Hash předchozí zprávy se liší.";

@@ -3161,9 +3118,6 @@
 /* notification title */
 "this contact" = "tento kontakt";

-/* No comment provided by engineer. */
-"This group has over %lld members, delivery receipts are not sent." = "Tato skupina má více než %lld členů, potvrzení o doručení nejsou odesílány.";
-
 /* No comment provided by engineer. */
 "This group no longer exists." = "Tato skupina již neexistuje.";

@@ -3200,9 +3154,6 @@
 /* No comment provided by engineer. */
 "To verify end-to-end encryption with your contact compare (or scan) the code on your devices." = "Chcete-li ověřit koncové šifrování u svého kontaktu, porovnejte (nebo naskenujte) kód na svých zařízeních.";

-/* No comment provided by engineer. */
-"Toggle incognito when connecting." = "Změnit inkognito režim při připojení.";
-
 /* No comment provided by engineer. */
 "Transport isolation" = "Izolace transportu";

@@ -3311,18 +3262,12 @@
 /* No comment provided by engineer. */
 "Use chat" = "Použijte chat";

-/* No comment provided by engineer. */
-"Use current profile" = "Použít aktuální profil";
-
 /* No comment provided by engineer. */
 "Use for new connections" = "Použít pro nová připojení";

 /* No comment provided by engineer. */
 "Use iOS call interface" = "Použít rozhraní volání iOS";

-/* No comment provided by engineer. */
-"Use new incognito profile" = "Použít nový inkognito profil";
-
 /* No comment provided by engineer. */
 "Use server" = "Použít server";

@@ -3596,6 +3541,9 @@
 /* No comment provided by engineer. */
 "You will be required to authenticate when you start or resume the app after 30 seconds in background." = "Při spuštění nebo obnovení aplikace po 30 sekundách na pozadí budete požádáni o ověření.";

+/* No comment provided by engineer. */
+"You will join a group this link refers to and connect to its group members." = "Připojíte se ke skupině, na kterou tento odkaz odkazuje, a spojíte se s jejími členy.";
+
 /* No comment provided by engineer. */
 "You will still receive calls and notifications from muted profiles when they are active." = "Stále budete přijímat volání a upozornění od umlčených profilů pokud budou aktivní.";

@@ -3626,6 +3574,9 @@
 /* No comment provided by engineer. */
 "Your chat database is not encrypted - set passphrase to encrypt it." = "Vaše chat databáze není šifrována – nastavte přístupovou frázi pro její šifrování.";

+/* No comment provided by engineer. */
+"Your chat profile will be sent to group members" = "Váš chat profil bude zaslán členům skupiny";
+
 /* No comment provided by engineer. */
 "Your chat profiles" = "Vaše chat profily";

@@ -3659,9 +3610,6 @@
 /* No comment provided by engineer. */
 "Your privacy" = "Vaše soukromí";

-/* No comment provided by engineer. */
-"Your profile **%@** will be shared." = "Váš profil **%@** bude sdílen.";
-
 /* No comment provided by engineer. */
 "Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Váš profil je uložen ve vašem zařízení a sdílen pouze s vašimi kontakty.\nServery SimpleX nevidí váš profil.";

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
spaced4ndy	212f193a4c	core: group integrity status types (#3302 )	2023-11-02 20:07:14 +04:00
Evgeny Poberezkin	7473da36a6	core: group DAG types (#3286 ) * core: group DAG types * fix tests * schema, more types --------- Co-authored-by: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>	2023-11-01 17:27:34 +04:00