core: correct pagination (wip)

android, desktop: moving to single thread in api calls (#3670 )
* android, desktop: moving to single thread in api calls * more places * more changes * seconds * long running api into init function * changes * developer options * progress indicator * string * rename * progressIndicator for stop chat
2024-12-17 17:20:21 +01:00 · 2024-01-12 18:12:37 +04:00 · 2024-01-11 18:50:25 +00:00 · 2024-01-11 17:01:44 +00:00 · 2024-01-11 20:21:58 +04:00 · 2024-01-11 17:55:13 +04:00
470 changed files with 36806 additions and 13049 deletions
@@ -42,7 +42,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

  build:
-    name: build-${{ matrix.os }}
+    name: build-${{ matrix.os }}-${{ matrix.ghc }}
    if: always()
    needs: prepare-release
    runs-on: ${{ matrix.os }}
@@ -51,18 +51,25 @@ jobs:
      matrix:
        include:
          - os: ubuntu-20.04
+            ghc: "8.10.7"
+            cache_path: ~/.cabal/store
+          - os: ubuntu-20.04
+            ghc: "9.6.3"
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-ubuntu-20_04-x86-64
            desktop_asset_name: simplex-desktop-ubuntu-20_04-x86_64.deb
          - os: ubuntu-22.04
+            ghc: "9.6.3"
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-ubuntu-22_04-x86-64
            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
          - os: macos-latest
+            ghc: "9.6.3"
            cache_path: ~/.cabal/store
            asset_name: simplex-chat-macos-x86-64
            desktop_asset_name: simplex-desktop-macos-x86_64.dmg
          - os: windows-latest
+            ghc: "9.6.3"
            cache_path: C:/cabal
            asset_name: simplex-chat-windows-x86-64
            desktop_asset_name: simplex-desktop-windows-x86_64.msi
@@ -81,16 +88,17 @@ jobs:
      - name: Setup Haskell
        uses: haskell-actions/setup@v2
        with:
-          ghc-version: "9.6.3"
+          ghc-version: ${{ matrix.ghc }}
          cabal-version: "3.10.1.0"

-      - name: Cache dependencies
-        uses: actions/cache@v3
+      - name: Restore cached build
+        id: restore_cache
+        uses: actions/cache/restore@v3
        with:
          path: |
            ${{ matrix.cache_path }}
            dist-newstyle
-          key: ${{ matrix.os }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
+          key: ${{ matrix.os }}-ghc${{ matrix.ghc }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}

      # / Unix

@@ -105,7 +113,7 @@ jobs:
          echo "    flags: +openssl"                                        >> cabal.project.local

      - name: Install AppImage dependencies
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
        run: sudo apt install -y desktop-file-utils

      - name: Install pkg-config for Mac
@@ -131,7 +139,7 @@ jobs:
          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT

      - name: Unix upload CLI binary to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
        uses: svenstaro/upload-release-action@v2
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -140,7 +148,7 @@ jobs:
          tag: ${{ github.ref }}

      - name: Unix update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
        uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -150,7 +158,7 @@ jobs:
            ${{ steps.unix_cli_build.outputs.bin_hash }}

      - name: Setup Java
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name
        uses: actions/setup-java@v3
        with:
          distribution: 'corretto'
@@ -159,7 +167,7 @@ jobs:

      - name: Linux build desktop
        id: linux_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
        shell: bash
        run: |
          scripts/desktop/build-lib-linux.sh
@@ -168,10 +176,10 @@ jobs:
          path=$(echo $PWD/release/main/deb/simplex_*_amd64.deb)
          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
-      
+
      - name: Linux make AppImage
        id: linux_appimage_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
        shell: bash
        run: |
          scripts/desktop/make-appimage-linux.sh
@@ -194,7 +202,7 @@ jobs:
          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT

      - name: Linux upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
        uses: svenstaro/upload-release-action@v2
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -203,7 +211,7 @@ jobs:
          tag: ${{ github.ref }}

      - name: Linux update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
        uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -213,7 +221,7 @@ jobs:
            ${{ steps.linux_desktop_build.outputs.package_hash }}

      - name: Linux upload AppImage to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
        uses: svenstaro/upload-release-action@v2
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -222,7 +230,7 @@ jobs:
          tag: ${{ github.ref }}

      - name: Linux update AppImage hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
        uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -250,6 +258,15 @@ jobs:
          body: |
            ${{ steps.mac_desktop_build.outputs.package_hash }}

+      - name: Cache unix build
+        uses: actions/cache/save@v3
+        if: matrix.os != 'windows-latest'
+        with:
+          path: |
+            ${{ matrix.cache_path }}
+            dist-newstyle
+          key: ${{ steps.restore_cache.outputs.cache-primary-key }}
+
      - name: Unix test
        if: matrix.os != 'windows-latest'
        timeout-minutes: 30
@@ -262,7 +279,7 @@ jobs:
      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing

      - name: 'Setup MSYS2'
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        if: matrix.os == 'windows-latest'
        uses: msys2/setup-msys2@v2
        with:
          msystem: ucrt64
@@ -330,7 +347,7 @@ jobs:
          path=$(echo $PWD/release/main/msi/*imple*.msi | sed 's#/\([a-z]\)#\1:#' | sed 's#/#\\#g')
          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
-      
+
      - name: Windows upload desktop package to release
        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
        uses: svenstaro/upload-release-action@v2
@@ -350,4 +367,13 @@ jobs:
          body: |
            ${{ steps.windows_desktop_build.outputs.package_hash }}

+      - name: Cache windows build
+        uses: actions/cache/save@v3
+        if: matrix.os == 'windows-latest'
+        with:
+          path: |
+            ${{ matrix.cache_path }}
+            dist-newstyle
+          key: ${{ steps.restore_cache.outputs.cache-primary-key }}
+
      # Windows /
@@ -127,6 +127,7 @@ Join our translators to help SimpleX grow!
 |🇫🇮 fi|Suomi     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/fi/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fi/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fi/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fi/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fi/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fi/)||
 |🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi-sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
 |🇮🇱 he|עִברִית     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/he/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/he/)<br>-|||
+|🇭🇺 hu|Magyar    | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/hu/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/hu/)<br>-|||
 |🇮🇹 it|Italiano  |[unbranched](https://github.com/unbranched)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/it/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/it/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/it/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/it/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/it/)||
 |🇯🇵 ja|日本語     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/ja/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/ja/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ja/)||
 |🇳🇱 nl|Nederlands|[mika-nl](https://github.com/mika-nl)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/nl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/nl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/nl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/nl/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/nl/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/nl/)||
@@ -134,6 +135,7 @@ Join our translators to help SimpleX grow!
 |🇧🇷 pt-BR|Português||[![android app](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pt_BR/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/pt_BR/)||
 |🇷🇺 ru|Русский   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ru/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ru/)|||
 |🇹🇭 th|ภาษาไทย   |[titapa-punpun](https://github.com/titapa-punpun)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/th/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/th/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/th/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/th/)|||
+|🇹🇷 tr|Türkçe   | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/tr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/tr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/tr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/tr/)|||
 |🇺🇦 uk|Українська| |[![android app](https://hosted.weblate.org/widgets/simplex-chat/uk/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/uk/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/uk/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/uk/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/uk/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/uk/)||
 |🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)<br><br>[Float-hu](https://github.com/Float-hu)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)<br>&nbsp;|<br><br>[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||

@@ -232,6 +234,8 @@ 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).
@@ -366,13 +370,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.
+- ✅ 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.
 - 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.).
@@ -15,6 +15,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
        logger.debug("AppDelegate: didFinishLaunchingWithOptions")
        application.registerForRemoteNotifications()
        if #available(iOS 17.0, *) { trackKeyboard() }
+        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
        return true
    }

@@ -36,12 +37,17 @@ class AppDelegate: NSObject, UIApplicationDelegate {
        ChatModel.shared.keyboardHeight = 0
    }

+    @objc func pasteboardChanged() {
+        ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
+    }
+
    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
        let token = deviceToken.map { String(format: "%02hhx", $0) }.joined()
        logger.debug("AppDelegate: didRegisterForRemoteNotificationsWithDeviceToken \(token)")
        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)
        }
@@ -80,7 +86,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                }
            } else if let checkMessages = ntfData["checkMessages"] as? Bool, checkMessages {
                logger.debug("AppDelegate: didReceiveRemoteNotification: checkMessages")
-                if appStateGroupDefault.get().inactive && m.ntfEnablePeriodic {
+                if m.ntfEnablePeriodic && allowBackgroundRefresh() && BGManager.shared.lastRanLongAgo {
                    receiveMessages(completionHandler)
                } else {
                    completionHandler(.noData)
@@ -14,11 +14,14 @@ struct ContentView: View {
    @ObservedObject var alertManager = AlertManager.shared
    @ObservedObject var callController = CallController.shared
    @Environment(\.colorScheme) var colorScheme
-    @Binding var doAuthenticate: Bool
-    @Binding var userAuthorized: Bool?
-    @Binding var canConnectCall: Bool
-    @Binding var lastSuccessfulUnlock: TimeInterval?
-    @Binding var showInitializationView: Bool
+
+    var contentAccessAuthenticationExtended: Bool
+
+    @Environment(\.scenePhase) var scenePhase
+    @State private var automaticAuthenticationAttempted = false
+    @State private var canConnectViewCall = false
+    @State private var lastSuccessfulUnlock: TimeInterval? = nil
+
    @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
@@ -28,6 +31,7 @@ struct ContentView: View {
    @State private var showWhatsNew = false
    @State private var showChooseLAMode = false
    @State private var showSetPasscode = false
+    @State private var waitingForOrPassedAuth = true
    @State private var chatListActionSheet: ChatListActionSheet? = nil

    private enum ChatListActionSheet: Identifiable {
@@ -40,16 +44,31 @@ struct ContentView: View {
        }
    }

+    private var accessAuthenticated: Bool {
+        chatModel.contentViewAccessAuthenticated || contentAccessAuthenticationExtended
+    }
+
    var body: some View {
        ZStack {
-            contentView()
+            // 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()
+            }
            if chatModel.showCallView, let call = chatModel.activeCall {
                callView(call)
            }
            if !showSettings, let la = chatModel.laRequest {
                LocalAuthView(authRequest: la)
+                    .onDisappear {
+                        // this flag is separate from accessAuthenticated to show initializationView while we wait for authentication
+                        waitingForOrPassedAuth = accessAuthenticated
+                    }
            } else if showSetPasscode {
                SetAppPasscodeView {
+                    chatModel.contentViewAccessAuthenticated = true
                    prefPerformLA = true
                    showSetPasscode = false
                    privacyLocalAuthModeDefault.set(.passcode)
@@ -59,15 +78,10 @@ struct ContentView: View {
                    showSetPasscode = false
                    alertManager.showAlert(laPasscodeNotSetAlert())
                }
+            } else if chatModel.chatDbStatus == nil && AppChatState.shared.value != .stopped && waitingForOrPassedAuth {
+                initializationView()
            }
        }
-        .onAppear {
-            if prefPerformLA { requestNtfAuthorization() }
-            initAuthenticate()
-        }
-        .onChange(of: doAuthenticate) { _ in
-            initAuthenticate()
-        }
        .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
        .sheet(isPresented: $showSettings) {
            SettingsView(showSettings: $showSettings)
@@ -76,14 +90,44 @@ 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 prefPerformLA && userAuthorized != true {
-            lockButton()
-        } else if chatModel.chatDbStatus == nil && showInitializationView {
-            initializationView()
-        } else if let status = chatModel.chatDbStatus, status != .ok {
+        if let status = chatModel.chatDbStatus, status != .ok {
            DatabaseErrorView(status: status)
        } else if !chatModel.v3DBMigration.startChat {
            MigrateToAppGroupView()
@@ -106,11 +150,11 @@ struct ContentView: View {
        if CallController.useCallKit() {
            ActiveCallView(call: call, canConnectCall: Binding.constant(true))
                .onDisappear {
-                    if userAuthorized == false && doAuthenticate { runAuthenticate() }
+                    if prefPerformLA && !accessAuthenticated { authenticateContentViewAccess() }
                }
        } else {
-            ActiveCallView(call: call, canConnectCall: $canConnectCall)
-            if prefPerformLA && userAuthorized != true {
+            ActiveCallView(call: call, canConnectCall: $canConnectViewCall)
+            if prefPerformLA && !accessAuthenticated {
                Rectangle()
                    .fill(colorScheme == .dark ? .black : .white)
                    .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -120,22 +164,27 @@ struct ContentView: View {
    }

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

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

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

-    private func initAuthenticate() {
-        logger.debug("initAuthenticate")
-        if CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil {
-            userAuthorized = false
-        } else if doAuthenticate {
-            runAuthenticate()
-        }
-    }
-
-    private func runAuthenticate() {
-        logger.debug("DEBUGGING: runAuthenticate")
-        if !prefPerformLA {
-            userAuthorized = true
+    private func unlockedRecently() -> Bool {
+        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
+            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
        } else {
-            logger.debug("DEBUGGING: before dismissAllSheets")
-            dismissAllSheets(animated: false) {
-                logger.debug("DEBUGGING: in dismissAllSheets callback")
-                chatModel.chatId = nil
-                justAuthenticate()
-            }
+            return false
        }
    }

-    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())
+    private func authenticateContentViewAccess() {
+        logger.debug("DEBUGGING: authenticateContentViewAccess")
+        dismissAllSheets(animated: false) {
+            logger.debug("DEBUGGING: authenticateContentViewAccess, in dismissAllSheets callback")
+            chatModel.chatId = nil
+
+            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())
                }
-            case .unavailable:
-                userAuthorized = true
-                prefPerformLA = false
-                canConnectCall = true
-                AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
            }
        }
    }
@@ -259,6 +297,7 @@ 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:
@@ -15,7 +15,13 @@ private let receiveTaskId = "chat.simplex.app.receive"
 // TCP timeout + 2 sec
 private let waitForMessages: TimeInterval = 6

-private let bgRefreshInterval: TimeInterval = 450
+// 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 maxTimerCount = 9

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

-    func schedule() {
+    func schedule(interval: TimeInterval? = nil) {
        if !ChatModel.shared.ntfEnableLocal {
            logger.debug("BGManager.schedule: disabled")
            return
        }
        logger.debug("BGManager.schedule")
        let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
-        request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
+        request.earliestBeginDate = Date(timeIntervalSinceNow: interval ?? runInterval)
        do {
            try BGTaskScheduler.shared.submit(request)
        } catch {
@@ -48,20 +54,34 @@ 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")
-        schedule()
-        if appStateGroupDefault.get().inactive {
+        let shouldRun_ = lastRanLongAgo
+        if allowBackgroundRefresh() && shouldRun_ {
+            schedule()
            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)
        }
@@ -90,20 +110,22 @@ 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,9 +54,13 @@ final class ChatModel: ObservableObject {
    @Published var chatDbChanged = false
    @Published var chatDbEncrypted: Bool?
    @Published var chatDbStatus: DBMigrationResult?
+    @Published var ctrlInitInProgress: Bool = false
+    // local authentication
+    @Published var contentViewAccessAuthenticated: Bool = false
    @Published var laRequest: LocalAuthRequest?
    // list of chat "previews"
    @Published var chats: [Chat] = []
+    @Published var deletedChats: Set<String> = []
    // map of connections network statuses, key is agent connection id
    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
    // current chat
@@ -83,18 +87,19 @@ final class ChatModel: ObservableObject {
    // current WebRTC call
    @Published var callInvitations: Dictionary<ChatId, RcvCallInvitation> = [:]
    @Published var activeCall: Call?
-    @Published var callCommand: WCallCommand?
+    let callCommand: WebRTCCommandProcessor = WebRTCCommandProcessor()
    @Published var showCallView = false
    // remote desktop
    @Published var remoteCtrlSession: RemoteCtrlSession?
-    // currently showing QR code
-    @Published var connReqInv: String?
+    // currently showing invitation
+    @Published var showingInvitation: ShowingInvitation?
    // audio recording and playback
    @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
    @Published var draft: ComposeState?
    @Published var draftChatId: String?
    // tracks keyboard height via subscription in AppDelegate
    @Published var keyboardHeight: CGFloat = 0
+    @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings

    var messageDelivery: Dictionary<Int64, () -> Void> = [:]

@@ -104,12 +109,10 @@ final class ChatModel: ObservableObject {

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

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

    var ntfEnablePeriodic: Bool {
-        notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
+        notificationMode != .off
    }

    var activeRemoteCtrl: Bool {
@@ -267,7 +270,20 @@ final class ChatModel: ObservableObject {
    func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
        // update previews
        if let i = getChatIndex(cInfo.id) {
-            chats[i].chatItems = [cItem]
+            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]
+            }
            if case .rcvNew = cItem.meta.itemStatus {
                chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
                increaseUnreadCounter(user: currentUser!)
@@ -607,14 +623,16 @@ final class ChatModel: ObservableObject {
    }

    func dismissConnReqView(_ id: String) {
-        if let connReqInv = connReqInv,
-           let c = getChat(id),
-           case let .contactConnection(contactConnection) = c.chatInfo,
-           connReqInv == contactConnection.connReqInv {
+        if id == showingInvitation?.connId {
+            markShowingInvitationUsed()
            dismissAllSheets()
        }
    }

+    func markShowingInvitationUsed() {
+        showingInvitation?.connChatUsed = true
+    }
+
    func removeChat(_ id: String) {
        withAnimation {
            chats.removeAll(where: { $0.id == id })
@@ -691,6 +709,11 @@ final class ChatModel: ObservableObject {
    }
 }

+struct ShowingInvitation {
+    var connId: String
+    var connChatUsed: Bool
+}
+
 struct NTFContactRequest {
    var incognito: Bool
    var chatId: String
@@ -770,7 +793,7 @@ final class GMember: ObservableObject, Identifiable {
 }

 struct RemoteCtrlSession {
-    var ctrlAppInfo: CtrlAppInfo
+    var ctrlAppInfo: CtrlAppInfo?
    var appVersion: String
    var sessionState: UIRemoteCtrlSessionState

@@ -782,6 +805,10 @@ struct RemoteCtrlSession {
        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
@@ -793,6 +820,8 @@ struct RemoteCtrlSession {

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

-private func uniqueCombine(_ fileName: String) -> String {
+private func uniqueCombine(_ fileName: String, fullPath: Bool = false) -> 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: getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
+        return (FileManager.default.fileExists(atPath: fullPath ? f : getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
    }
    return tryCombine(fileName, 0)
 }
@@ -0,0 +1,83 @@
+//
+//  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(subscribe: true, expire: true, xftp: true))
+    let r = chatSendCmdSync(.startChat(mainApp: true))
    switch r {
    case .chatStarted: return true
    case .chatRunning: return false
@@ -228,7 +228,8 @@ func apiStopChat() async throws {
 }

 func apiActivateChat() {
-    let r = chatSendCmdSync(.apiActivateChat)
+    chatReopenStore()
+    let r = chatSendCmdSync(.apiActivateChat(restoreChat: true))
    if case .cmdOk = r { return }
    logger.error("apiActivateChat error: \(String(describing: r))")
 }
@@ -402,7 +403,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), privacy: .public)")
+        logger.debug("apiGetNtfToken response: \(String(describing: r))")
        return (nil, nil, .off)
    }
 }
@@ -580,15 +581,15 @@ func apiVerifyGroupMember(_ groupId: Int64, _ groupMemberId: Int64, connectionCo
    return nil
 }

-func apiAddContact(incognito: Bool) async -> (String, PendingContactConnection)? {
+func apiAddContact(incognito: Bool) async -> ((String, PendingContactConnection)?, Alert?) {
    guard let userId = ChatModel.shared.currentUser?.userId else {
        logger.error("apiAddContact: no current user")
-        return nil
+        return (nil, nil)
    }
    let r = await chatSendCmd(.apiAddContact(userId: userId, incognito: incognito), bgTask: false)
-    if case let .invitation(_, connReqInvitation, connection) = r { return (connReqInvitation, connection) }
-    AlertManager.shared.showAlert(connectionErrorAlert(r))
-    return nil
+    if case let .invitation(_, connReqInvitation, connection) = r { return ((connReqInvitation, connection), nil) }
+    let alert = connectionErrorAlert(r)
+    return (nil, alert)
 }

 func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> PendingContactConnection? {
@@ -605,27 +606,29 @@ func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
    throw r
 }

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

-func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert?) {
+func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, PendingContactConnection)?, 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 .sentConfirmation: return (.invitation, nil)
-    case .sentInvitation: return (.contact, nil)
+    case let .sentConfirmation(_, connection):
+        return ((.invitation, connection), nil)
+    case let .sentInvitation(_, connection):
+        return ((.contact, connection), nil)
    case let .contactAlreadyExists(_, contact):
-        let m = ChatModel.shared
        if let c = m.getContactChat(contact.contactId) {
            await MainActor.run { m.chatId = c.id }
        }
@@ -688,6 +691,9 @@ func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Co
 }

 func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
+    let chatId = type.rawValue + id.description
+    DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
+    defer { DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) } }
    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
    if case .direct = type, case .contactDeleted = r { return }
    if case .contactConnection = type, case .contactConnectionDeleted = r { return }
@@ -919,8 +925,10 @@ func findKnownRemoteCtrl() async throws {
    try await sendCommandOkResp(.findKnownRemoteCtrl)
 }

-func confirmRemoteCtrl(_ rcId: Int64) async throws {
-    try await sendCommandOkResp(.confirmRemoteCtrl(remoteCtrlId: rcId))
+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 {
@@ -1207,9 +1215,11 @@ private func currentUserId(_ funcName: String) throws -> Int64 {
    throw RuntimeError("\(funcName): no current user")
 }

-func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool = true, confirmMigrations: MigrationConfirmation? = nil) throws {
+func initializeChat(start: Bool, confirmStart: Bool = false, dbKey: String? = nil, refreshInvitations: Bool = true, confirmMigrations: MigrationConfirmation? = nil) throws {
    logger.debug("initializeChat")
    let m = ChatModel.shared
+    m.ctrlInitInProgress = true
+    defer { m.ctrlInitInProgress = false }
    (m.chatDbEncrypted, m.chatDbStatus) = chatMigrateInit(dbKey, confirmMigrations: confirmMigrations)
    if  m.chatDbStatus != .ok { return }
    // If we migrated successfully means previous re-encryption process on database level finished successfully too
@@ -1226,10 +1236,43 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
        onboardingStageDefault.set(.step1_SimpleXInfo)
        privacyDeliveryReceiptsSet.set(true)
        m.onboardingStage = .step1_SimpleXInfo
-    } else if start {
+    } else if confirmStart {
+        showStartChatAfterRestartAlert { start in
+            do {
+                if start { AppChatState.shared.set(.active) }
+                try chatInitialized(start: start, refreshInvitations: refreshInvitations)
+            } catch let error {
+                logger.error("ChatInitialized error: \(error)")
+            }
+        }
+    } else {
+        try chatInitialized(start: start, refreshInvitations: refreshInvitations)
+    }
+}
+
+func showStartChatAfterRestartAlert(result: @escaping (_ start: Bool) -> Void) {
+    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")) {
+            result(true)
+        },
+        secondaryButton: .cancel {
+            result(false)
+        }
+    ))
+}
+
+private func chatInitialized(start: Bool, refreshInvitations: Bool) throws {
+    let m = ChatModel.shared
+    if m.currentUser == nil { return }
+    if start {
        try startChat(refreshInvitations: refreshInvitations)
    } else {
        m.chatRunning = false
+        try getUserChatData()
+        NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
+        m.onboardingStage = onboardingStageDefault.get()
    }
 }

@@ -1246,6 +1289,8 @@ 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)
        }
@@ -1360,18 +1405,6 @@ 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 {
@@ -1664,36 +1697,40 @@ func processReceivedMsg(_ res: ChatResponse) async {
        activateCall(invitation)
    case let .callOffer(_, contact, callType, offer, sharedKey, _):
        await withCall(contact) { call in
-            call.callState = .offerReceived
-            call.peerMedia = callType.media
-            call.sharedKey = sharedKey
+            await MainActor.run {
+                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))")
-            m.callCommand = .offer(
+            await m.callCommand.processCommand(.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
-            call.callState = .answerReceived
-            m.callCommand = .answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates)
+            await MainActor.run {
+                call.callState = .answerReceived
+            }
+            await m.callCommand.processCommand(.answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates))
        }
    case let .callExtraInfo(_, contact, extraInfo):
        await withCall(contact) { _ in
-            m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
+            await m.callCommand.processCommand(.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
-            m.callCommand = .end
+            await m.callCommand.processCommand(.end)
            CallController.shared.reportCallRemoteEnded(call: call)
        }
    case .chatSuspended:
@@ -1714,9 +1751,17 @@ func processReceivedMsg(_ res: ChatResponse) async {
        await MainActor.run {
            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
        }
-    case let .remoteCtrlFound(remoteCtrl):
-        // TODO multicast
-        logger.debug("\(String(describing: remoteCtrl))")
+    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)
@@ -1731,16 +1776,23 @@ func processReceivedMsg(_ res: ChatResponse) async {
    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.
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-            switchToLocalSession()
+        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) -> Void) async {
+    func withCall(_ contact: Contact, _ perform: (Call) async -> Void) async {
        if let call = m.activeCall, call.contact.apiId == contact.apiId {
-            await MainActor.run { perform(call) }
+            await perform(call)
        } else {
            logger.debug("processReceivedMsg: ignoring \(res.responseType), not in call with the contact \(contact.id)")
        }
@@ -9,27 +9,30 @@
 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 = appStateGroupDefault.get()
+    let state = AppChatState.shared.value
    if !state.canSuspend {
-        logger.error("_suspendChat called, current state: \(state.rawValue, privacy: .public)")
+        logger.error("_suspendChat called, current state: \(state.rawValue)")
    } else if ChatModel.ok {
-        appStateGroupDefault.set(.suspending)
+        AppChatState.shared.set(.suspending)
        apiSuspendChat(timeoutMicroseconds: timeout * 1000000)
        let endTask = beginBGTask(chatSuspended)
        DispatchQueue.global().asyncAfter(deadline: .now() + Double(timeout) + 1, execute: endTask)
    } else {
-        appStateGroupDefault.set(.suspended)
+        AppChatState.shared.set(.suspended)
    }
 }

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

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

-private var terminating = false
-
 func terminateChat() {
    logger.debug("terminateChat")
    suspendLockQueue.sync {
-        switch appStateGroupDefault.get() {
+        switch AppChatState.shared.value {
        case .suspending:
            // suspend instantly if already suspending
            _chatSuspended()
@@ -64,7 +65,6 @@ 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 = appStateGroupDefault.get() {
+        if case .suspending = AppChatState.shared.value {
            _chatSuspended()
        }
    }
@@ -81,48 +81,111 @@ func chatSuspended() {

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

 func activateChat(appState: AppState = .active) {
    logger.debug("DEBUGGING: activateChat")
-    terminating = false
    suspendLockQueue.sync {
-        appStateGroupDefault.set(appState)
+        AppChatState.shared.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 && storeDBPassphraseGroupDefault.get() && kcDatabasePassword.get() != nil {
+            initialize(start: true, confirmStart: true)
+        } else {
+            initialize(start: true)
+        }
+    }
+
+    func initialize(start: Bool, confirmStart: Bool = false) {
        do {
-            m.v3DBMigration = v3DBMigrationDefault.get()
-            try initializeChat(start: m.v3DBMigration.startChat, refreshInvitations: refreshInvitations)
+            try initializeChat(start: m.v3DBMigration.startChat && start, confirmStart: m.v3DBMigration.startChat && confirmStart, refreshInvitations: refreshInvitations)
        } catch let error {
-            fatalError("Failed to start or load chats: \(responseError(error))")
+            AlertManager.shared.showAlertMsg(
+                title: start ? "Error starting chat" : "Error opening chat",
+                message: "Please contact developers.\nError: \(responseError(error))"
+            )
        }
    }
 }

-func startChatAndActivate() {
-    terminating = false
+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) {
    logger.debug("DEBUGGING: startChatAndActivate")
    if ChatModel.shared.chatRunning == true {
        ChatReceiver.shared.start()
        logger.debug("DEBUGGING: startChatAndActivate: after ChatReceiver.shared.start")
    }
-    if .active != appStateGroupDefault.get()  {
+    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() {
        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,17 +16,15 @@ struct SimpleXApp: App {
    @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
    @StateObject private var chatModel = ChatModel.shared
    @ObservedObject var alertManager = AlertManager.shared
+
    @Environment(\.scenePhase) var scenePhase
-    @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
+    @State private var enteredBackgroundAuthenticated: TimeInterval? = nil

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

    var body: some Scene {
-        return WindowGroup {
-            ContentView(
-                doAuthenticate: $doAuthenticate,
-                userAuthorized: $userAuthorized,
-                canConnectCall: $canConnectCall,
-                lastSuccessfulUnlock: $lastSuccessfulUnlock,
-                showInitializationView: $showInitializationView
-            )
+        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())
                .environmentObject(chatModel)
                .onOpenURL { url in
                    logger.debug("ContentView.onOpenURL: \(url)")
                    chatModel.appOpenUrl = url
                }
                .onAppear() {
-                    showInitializationView = true
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                        initChatAndMigrate()
+                    if kcAppPassword.get() == nil || kcSelfDestructPassword.get() == nil {
+                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
+                            initChatAndMigrate()
+                        }
                    }
                }
                .onChange(of: scenePhase) { phase in
                    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 = appStateGroupDefault.get()
-                        startChatAndActivate()
-                        if appState.inactive && chatModel.chatRunning == true {
-                            updateChats()
-                            if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                updateCallInvitations()
+                        let appState = AppChatState.shared.value
+
+                        if appState != .stopped {
+                            startChatAndActivate {
+                                if appState.inactive && chatModel.chatRunning == true {
+                                    updateChats()
+                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                        updateCallInvitations()
+                                    }
+                                }
                            }
                        }
-                        doAuthenticate = authenticationExpired()
-                        canConnectCall = !(doAuthenticate && prefPerformLA) || unlockedRecently()
                    default:
                        break
                    }
@@ -100,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(), privacy: .public)*.db")
+            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath())*.db")
        } else {
            dbContainerGroupDefault.set(.group)
            setMigrationState(.ready)
-            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")
+            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath())*.db")
+            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not") present")
        }
    }

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

    private func authenticationExpired() -> Bool {
-        if let enteredBackground = enteredBackground {
+        if let enteredBackgroundAuthenticated = enteredBackgroundAuthenticated {
            let delay = Double(UserDefaults.standard.integer(forKey: DEFAULT_LA_LOCK_DELAY))
-            return ProcessInfo.processInfo.systemUptime - enteredBackground >= delay
+            return ProcessInfo.processInfo.systemUptime - enteredBackgroundAuthenticated >= 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,21 @@ struct ActiveCallView: View {
            }
        }
        .onAppear {
-            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase), privacy: .public), canConnectCall \(canConnectCall)")
+            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase)), canConnectCall \(canConnectCall)")
            AppDelegate.keepScreenOn(true)
            createWebRTCClient()
            dismissAllSheets()
        }
        .onChange(of: canConnectCall) { _ in
-            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall, privacy: .public)")
+            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall)")
            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,19 +60,8 @@ 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 client.sendCallCommand(command: cmd)
+                await m.callCommand.setClient(client)
            }
        }
    }
@@ -168,8 +157,10 @@ 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)))
            }
        }
    }
@@ -255,7 +246,6 @@ 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), privacy: .public)")
+                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat))")
                if ChatModel.shared.activeCall == nil && self?.shouldSuspendChat == true {
                    self?.shouldSuspendChat = false
                    suspendChat()
@@ -142,33 +142,46 @@ 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, privacy: .public)")
+        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue)")
    }

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

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

    func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID), privacy: .public)")
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID))")
        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
            if invitation.callTs.timeIntervalSinceNow >= -180 {
                let update = cxCallUpdate(invitation: invitation)
@@ -350,7 +363,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, privacy: .public)")
+                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription)")
            } 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
-            m.callCommand = .capabilities(media: call.localMedia)
+            Task { await m.callCommand.processCommand(.capabilities(media: call.localMedia)) }
            return true
        }
        return false
@@ -57,19 +57,21 @@ class CallManager {
            m.activeCall = call
            m.showCallView = true

-            m.callCommand = .start(
+            Task {
+                await m.callCommand.processCommand(.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
-            m.callCommand = .media(media: media, enable: enable)
+            Task { await m.callCommand.processCommand(.media(media: media, enable: enable)) }
            return true
        }
        return false
@@ -94,11 +96,13 @@ 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,6 +335,50 @@ 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
@@ -358,26 +402,12 @@ 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,10 +18,11 @@ 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: [RTCIceCandidate]
+        var iceCandidates: IceCandidates
        var localMedia: CallMediaType
        var localCamera: RTCVideoCapturer?
        var localVideoSource: RTCVideoSource?
@@ -33,10 +34,24 @@ 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
-    private var activeCall: Binding<Call?>
+    var activeCall: Binding<Call?>
    private var localRendererAspectRatio: Binding<CGFloat?>

    @available(*, unavailable)
@@ -60,7 +75,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]?, _ remoteIceCandidates: [RTCIceCandidate], _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
+    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
        let connection = createPeerConnection(iceServers ?? getWebRTCIceServers() ?? defaultIceServers, relay)
        connection.delegate = self
        createAudioSender(connection)
@@ -87,7 +102,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        }
        return Call(
            connection: connection,
-            iceCandidates: remoteIceCandidates,
+            iceCandidates: IceCandidates(),
            localMedia: mediaType,
            localCamera: localCamera,
            localVideoSource: localVideoSource,
@@ -144,26 +159,18 @@ 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
-            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()
-                    }
-                }
-
+            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")")
            }
        case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay):
            if activeCall.wrappedValue != nil {
@@ -172,26 +179,21 @@ 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(), remoteIceCandidates, media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
+                let call = initializeCall(iceServers?.toWebRTCIceServers(), 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 {
-                        pc.answer { answer in
+                        let (answer, error) = await pc.answer()
+                        if let answer = answer {
                            self.addIceCandidates(pc, remoteIceCandidates)
-//                            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)
-                                )
-                            }
-//                            }
+                            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")")
                        }
                    } else {
                        resp = .error(message: "accept: remote description is not set")
@@ -234,6 +236,7 @@ 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()
        }
@@ -242,6 +245,33 @@ 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)
@@ -279,7 +309,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(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
+            logCrypto("encrypt", chat_encrypt_media(chat_ctrl, &key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
            return Data(bytes: pointer, count: unencrypted.count + WebRTCClient.ivTagBytes)
        } else {
            return nil
@@ -387,12 +417,13 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        audioSessionToDefaults()
    }

-    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()
+    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
    }
 }

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

-    func offer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void) {
-        offer(for: mediaConstraints()) { (sdp, error) in
-            guard let sdp = sdp else {
-                return
+    func offer() async -> (RTCSessionDescription?, Error?) {
+        await withCheckedContinuation { cont in
+            offer(for: mediaConstraints()) { (sdp, error) in
+                self.processSDP(cont, sdp, error)
            }
-            self.setLocalDescription(sdp, completionHandler: { (error) in
-                completion(sdp)
-            })
        }
    }

-    func answer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void)  {
-        answer(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
-                completion(sdp)
+                if let error = error {
+                    cont.resume(returning: (nil, error))
+                } else {
+                    cont.resume(returning: (sdp, nil))
+                }
            })
+        } else {
+            cont.resume(returning: (nil, error))
        }
    }
 }
@@ -479,6 +518,7 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                default: enableSpeaker = false
                }
                setSpeakerEnabledAndConfigureSession(enableSpeaker)
+            case .connected: sendConnectedEvent(connection)
            case .disconnected, .failed: endCall()
            default: do {}
            }
@@ -491,7 +531,9 @@ extension WebRTCClient: RTCPeerConnectionDelegate {

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

    func peerConnection(_ connection: RTCPeerConnection, didRemove candidates: [WebRTC.RTCIceCandidate]) {
@@ -506,10 +548,9 @@ 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, local: WebRTC.RTCIceCandidate, remote: WebRTC.RTCIceCandidate) {
+    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection) {
        connection.statistics { (stats: RTCStatisticsReport) in
            stats.statistics.values.forEach { stat in
 //                logger.debug("Stat \(stat.debugDescription)")
@@ -517,24 +558,25 @@ 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],
-                   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 ?? "--"))")
+                   let remoteStats = stats.statistics[remoteId]
                {
                    Task {
                        await self.sendCallResponse(.init(
                            corrId: nil,
                            resp: .connected(connectionInfo: ConnectionInfo(
-                                localCandidate: local.toCandidate(
-                                    RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
-                                    localStats.values["protocol"] as? String,
-                                    localStats.values["relayProtocol"] as? String
+                                localCandidate: RTCIceCandidate(
+                                    candidateType: RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
+                                    protocol: localStats.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
-                                ))),
+                                remoteCandidate: RTCIceCandidate(
+                                    candidateType: RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
+                                    protocol: remoteStats.values["protocol"] as? String,
+                                    sdpMid: nil,
+                                    sdpMLineIndex: nil,
+                                    candidate: ""))),
                            command: nil)
                        )
                    }
@@ -634,11 +676,10 @@ extension RTCIceCandidate {
 }

 extension WebRTC.RTCIceCandidate {
-    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?, _ relayProtocol: String?) -> RTCIceCandidate {
+    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?) -> RTCIceCandidate {
        RTCIceCandidate(
            candidateType: candidateType,
            protocol: `protocol`,
-            relayProtocol: relayProtocol,
            sdpMid: sdpMid,
            sdpMLineIndex: Int(sdpMLineIndex),
            candidate: sdp
@@ -28,7 +28,9 @@ struct FramedItemView: View {
    @State var metaColor = Color.secondary
    @State var showFullScreenImage = false
    @Binding var allowMenu: Bool
-    
+    @State private var showSecrets = false
+    @State private var showQuoteSecrets = false
+
    @Binding var audioPlayer: AudioPlayer?
    @Binding var playbackState: VoiceMessagePlaybackState
    @Binding var playbackTime: TimeInterval?
@@ -252,10 +254,12 @@ struct FramedItemView: View {
    }
    
    private func ciQuotedMsgTextView(_ qi: CIQuote, lines: Int) -> some View {
-        MsgContentView(chat: chat, text: qi.text, formattedText: qi.formattedText)
-            .lineLimit(lines)
-            .font(.subheadline)
-            .padding(.bottom, 6)
+        toggleSecrets(qi.formattedText, $showQuoteSecrets,
+            MsgContentView(chat: chat, text: qi.text, formattedText: qi.formattedText, showSecrets: showQuoteSecrets)
+                .lineLimit(lines)
+                .font(.subheadline)
+                .padding(.bottom, 6)
+        )
    }

    private func ciQuoteIconView(_ image: String) -> some View {
@@ -278,13 +282,15 @@ struct FramedItemView: View {
    @ViewBuilder private func ciMsgContentView(_ ci: ChatItem) -> some View {
        let text = ci.meta.isLive ? ci.content.msgContent?.text ?? ci.text : ci.text
        let rtl = isRightToLeft(text)
-        let v = MsgContentView(
+        let ft = text == "" ? [] : ci.formattedText
+        let v = toggleSecrets(ft, $showSecrets, MsgContentView(
            chat: chat,
            text: text,
-            formattedText: text == "" ? [] : ci.formattedText,
+            formattedText: ft,
            meta: ci.meta,
-            rightToLeft: rtl
-        )
+            rightToLeft: rtl,
+            showSecrets: showSecrets
+        ))
        .multilineTextAlignment(rtl ? .trailing : .leading)
        .padding(.vertical, 6)
        .padding(.horizontal, 12)
@@ -298,7 +304,7 @@ struct FramedItemView: View {
            v
        }
    }
-    
+
    @ViewBuilder private func ciFileView(_ ci: ChatItem, _ text: String) -> some View {
        CIFileView(file: chatItem.file, edited: chatItem.meta.itemEdited)
            .overlay(DetermineWidth())
@@ -318,6 +324,14 @@ struct FramedItemView: View {
    }
 }

+@ViewBuilder func toggleSecrets<V: View>(_ ft: [FormattedText]?, _ showSecrets: Binding<Bool>, _ v: V) -> some View {
+    if let ft = ft, ft.contains(where: { $0.isSecret }) {
+        v.onTapGesture { showSecrets.wrappedValue.toggle() }
+    } else {
+        v
+    }
+}
+
 func isRightToLeft(_ s: String) -> Bool {
    if let lang = CFStringTokenizerCopyBestStringLanguage(s as CFString, CFRange(location: 0, length: min(s.count, 80))) {
        return NSLocale.characterDirection(forLanguage: lang as String) == .rightToLeft
@@ -9,7 +9,7 @@
 import SwiftUI
 import SimpleXChat

-private let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
+let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)

 private let noTyping = Text("   ")

@@ -31,6 +31,7 @@ struct MsgContentView: View {
    var sender: String? = nil
    var meta: CIMeta? = nil
    var rightToLeft = false
+    var showSecrets: Bool
    @State private var typingIdx = 0
    @State private var timer: Timer?

@@ -62,7 +63,7 @@ struct MsgContentView: View {
    }

    private func msgContentView() -> Text {
-        var v = messageText(text, formattedText, sender)
+        var v = messageText(text, formattedText, sender, showSecrets: showSecrets)
        if let mt = meta {
            if mt.isLive {
                v = v + typingIndicator(mt.recent)
@@ -84,14 +85,14 @@ struct MsgContentView: View {
    }
 }

-func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false) -> Text {
+func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false, showSecrets: Bool) -> Text {
    let s = text
    var res: Text
    if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
-        res = formatText(ft[0], preview)
+        res = formatText(ft[0], preview, showSecret: showSecrets)
        var i = 1
        while i < ft.count {
-            res = res + formatText(ft[i], preview)
+            res = res + formatText(ft[i], preview, showSecret: showSecrets)
            i = i + 1
        }
    } else {
@@ -110,7 +111,7 @@ func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: St
    }
 }

-private func formatText(_ ft: FormattedText, _ preview: Bool) -> Text {
+private func formatText(_ ft: FormattedText, _ preview: Bool, showSecret: Bool) -> Text {
    let t = ft.text
    if let f = ft.format {
        switch (f) {
@@ -118,7 +119,13 @@ private func formatText(_ ft: FormattedText, _ preview: Bool) -> Text {
        case .italic: return Text(t).italic()
        case .strikeThrough: return Text(t).strikethrough()
        case .snippet: return Text(t).font(.body.monospaced())
-        case .secret: return Text(t).foregroundColor(.clear).underline(color: .primary)
+        case .secret: return
+            showSecret
+            ? Text(t)
+            : Text(AttributedString(t, attributes: AttributeContainer([
+                .foregroundColor: UIColor.clear as Any,
+                .backgroundColor: UIColor.secondarySystemFill as Any
+            ])))
        case let .colored(color): return Text(t).foregroundColor(color.uiColor)
        case .uri: return linkText(t, t, preview, prefix: "")
        case let .simplexLink(linkType, simplexUri, smpHosts):
@@ -144,7 +151,7 @@ private func linkText(_ s: String, _ link: String, _ preview: Bool, prefix: Stri
    ]))).underline()
 }

-private func simplexLinkText(_ linkType: SimplexLinkType, _ smpHosts: [String]) -> String {
+func simplexLinkText(_ linkType: SimplexLinkType, _ smpHosts: [String]) -> String {
    linkType.description + " " + "(via \(smpHosts.first ?? "?"))"
 }

@@ -156,7 +163,8 @@ struct MsgContentView_Previews: PreviewProvider {
            text: chatItem.text,
            formattedText: chatItem.formattedText,
            sender: chatItem.memberDisplayName,
-            meta: chatItem.meta
+            meta: chatItem.meta,
+            showSecrets: false
        )
        .environmentObject(Chat.sampleData)
    }
@@ -168,7 +168,6 @@ struct ChatItemInfoView: View {
    @ViewBuilder private func itemVersionView(_ itemVersion: ChatItemVersion, _ maxWidth: CGFloat, current: Bool) -> some View {
        VStack(alignment: .leading, spacing: 4) {
            textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil)
-                .allowsHitTesting(false)
                .padding(.horizontal, 12)
                .padding(.vertical, 6)
                .background(chatItemFrameColor(ci, colorScheme))
@@ -198,7 +197,7 @@ struct ChatItemInfoView: View {

    @ViewBuilder private func textBubble(_ text: String, _ formattedText: [FormattedText]?, _ sender: String? = nil) -> some View {
        if text != "" {
-            messageText(text, formattedText, sender)
+            TextBubble(text: text, formattedText: formattedText, sender: sender)
        } else {
            Text("no text")
                .italic()
@@ -206,6 +205,17 @@ struct ChatItemInfoView: View {
        }
    }

+    private struct TextBubble: View {
+        var text: String
+        var formattedText: [FormattedText]?
+        var sender: String? = nil
+        @State private var showSecrets = false
+
+        var body: some View {
+            toggleSecrets(formattedText, $showSecrets, messageText(text, formattedText, sender, showSecrets: showSecrets))
+        }
+    }
+
    @ViewBuilder private func quoteTab(_ qi: CIQuote) -> some View {
        GeometryReader { g in
            let maxWidth = (g.size.width - 32) * 0.84
@@ -227,7 +237,6 @@ struct ChatItemInfoView: View {
    @ViewBuilder private func quotedMsgView(_ qi: CIQuote, _ maxWidth: CGFloat) -> some View {
        VStack(alignment: .leading, spacing: 4) {
            textBubble(qi.text, qi.formattedText, qi.getSender(nil))
-                .allowsHitTesting(false)
                .padding(.horizontal, 12)
                .padding(.vertical, 6)
                .background(quotedMsgFrameColor(qi, colorScheme))
@@ -250,8 +250,8 @@ struct ChatView: View {
    }

    private func searchToolbar() -> some View {
-        HStack {
-            HStack {
+        HStack(spacing: 12) {
+            HStack(spacing: 4) {
                Image(systemName: "magnifyingglass")
                TextField("Search", text: $searchText)
                    .focused($searchFocussed)
@@ -264,9 +264,9 @@ struct ChatView: View {
                    Image(systemName: "xmark.circle.fill").opacity(searchText == "" ? 0 : 1)
                }
            }
-            .padding(EdgeInsets(top: 8, leading: 6, bottom: 8, trailing: 6))
+            .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
            .foregroundColor(.secondary)
-            .background(Color(.secondarySystemBackground))
+            .background(Color(.tertiarySystemFill))
            .cornerRadius(10.0)

            Button ("Cancel") {
@@ -723,9 +723,14 @@ struct ChatView: View {
                if ci.meta.itemDeleted == nil && !ci.isLiveDummy && !live {
                    menu.append(replyUIAction(ci))
                }
-                menu.append(shareUIAction(ci))
-                menu.append(copyUIAction(ci))
-                if let fileSource = getLoadedFileSource(ci.file) {
+                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 {
                    if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                        if image.imageData != nil {
                            menu.append(saveFileAction(fileSource))
@@ -104,7 +104,7 @@ struct ComposeState {

    var sendEnabled: Bool {
        switch preview {
-        case .mediaPreviews: return true
+        case let .mediaPreviews(media): return !media.isEmpty
        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(media: $chosenMedia, selectionLimit: 10) { itemsSelected in
-                showMediaPicker = false
-                if itemsSelected {
-                    DispatchQueue.main.async {
+            LibraryMediaListPicker(addMedia: addMediaContent, selectionLimit: 10, finishedPreprocessing: finishedPreprocessingMediaContent) { itemsSelected in
+                await MainActor.run {
+                    showMediaPicker = false
+                    if itemsSelected {
                        composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: []))
                    }
                }
@@ -488,6 +488,30 @@ 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)
    }
@@ -51,7 +51,8 @@ struct ContextItemView: View {
        MsgContentView(
            chat: chat,
            text: contextItem.text,
-            formattedText: contextItem.formattedText
+            formattedText: contextItem.formattedText,
+            showSecrets: false
        )
        .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
        .lineLimit(lines)
@@ -116,7 +116,6 @@ struct ContactPreferencesView: View {

    private func featureFooter(_ feature: ChatFeature, _ enabled: FeatureEnabled) -> some View {
        Text(feature.enabledDescription(enabled))
-        .frame(height: 36, alignment: .topLeading)
    }

    private func savePreferences() {
@@ -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 {
+                if role <= groupInfo.membership.memberRole && role != .author {
                    Text(role.text)
                }
            }
@@ -16,7 +16,6 @@ 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,17 +188,19 @@ struct GroupMemberInfoView: View {
                        // this condition prevents re-setting picker
                        if !justOpened { return }
                    }
-                    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
+                    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))")
+                        }
+                    }
                }
                .onChange(of: newRole) { newRole in
                    if newRole != member.memberRole {
@@ -28,6 +28,7 @@ struct GroupPreferencesView: View {
                featureSection(.reactions, $preferences.reactions.enable)
                featureSection(.voice, $preferences.voice.enable)
                featureSection(.files, $preferences.files.enable)
+                featureSection(.history, $preferences.history.enable)

                if groupInfo.canEdit {
                    Section {
@@ -96,7 +97,6 @@ struct GroupPreferencesView: View {
            }
        } footer: {
            Text(feature.enableDescription(enableFeature.wrappedValue, groupInfo.canEdit))
-                .frame(height: 36, alignment: .topLeading)
        }
    }

@@ -103,8 +103,10 @@ struct GroupProfileView: View {
            }
        }
        .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) {
-                didSelectItem in showImagePicker = false
+            LibraryImagePicker(image: $chosenImage) { _ in
+                await MainActor.run {
+                    showImagePicker = false
+                }
            }
        }
        .onChange(of: chosenImage) { image in
@@ -53,8 +53,7 @@ struct GroupWelcomeView: View {
    }

    private func textPreview() -> some View {
-        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil)
-            .allowsHitTesting(false)
+        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false)
            .frame(minHeight: 140, alignment: .topLeading)
            .frame(maxWidth: .infinity, alignment: .leading)
    }
@@ -17,7 +17,7 @@ struct ScanCodeView: View {

    var body: some View {
        VStack(alignment: .leading) {
-            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
                .aspectRatio(1, contentMode: .fit)
                .cornerRadius(12)
            Text("Scan security code from your contact's app.")
@@ -11,7 +11,7 @@ import SwiftUI
 struct ChatHelp: View {
    @EnvironmentObject var chatModel: ChatModel
    @Binding var showSettings: Bool
-    @State private var showAddChat = false
+    @State private var newChatMenuOption: NewChatMenuOption? = nil

    var body: some View {
        ScrollView { chatHelp() }
@@ -39,13 +39,12 @@ struct ChatHelp: View {

                HStack(spacing: 8) {
                    Text("Tap button ")
-                    NewChatButton(showAddChat: $showAddChat)
+                    NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
                    Text("above, then choose:")
                }

-                Text("**Create link / QR code** for your contact to use.")
-                Text("**Paste received link** or open it in the browser and tap **Open in mobile app**.")
-                Text("**Scan QR code**: to connect to your contact in person or via video call.")
+                Text("**Add contact**: to create a new invitation link, or connect via a link you received.")
+                Text("**Create group**: to create a new group.")
            }
            .padding(.top, 24)

@@ -12,8 +12,12 @@ import SimpleXChat
 struct ChatListView: View {
    @EnvironmentObject var chatModel: ChatModel
    @Binding var showSettings: Bool
+    @State private var searchMode = false
+    @FocusState private var searchFocussed
    @State private var searchText = ""
-    @State private var showAddChat = false
+    @State private var searchShowingSimplexLink = false
+    @State private var searchChatFilteredBySimplexLink: String? = nil
+    @State private var newChatMenuOption: NewChatMenuOption? = nil
    @State private var userPickerVisible = false
    @State private var showConnectDesktop = false
    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
@@ -62,11 +66,7 @@ struct ChatListView: View {

    private var chatListView: some View {
        VStack {
-            if chatModel.chats.count > 0 {
-                chatList.searchable(text: $searchText)
-            } else {
-                chatList
-            }
+            chatList
        }
        .onDisappear() { withAnimation { userPickerVisible = false } }
        .refreshable {
@@ -85,9 +85,9 @@ struct ChatListView: View {
                secondaryButton: .cancel()
            ))
        }
-        .offset(x: -8)
        .listStyle(.plain)
        .navigationBarTitleDisplayMode(.inline)
+        .navigationBarHidden(searchMode)
        .toolbar {
            ToolbarItem(placement: .navigationBarLeading) {
                let user = chatModel.currentUser ?? User.sampleData
@@ -124,7 +124,7 @@ struct ChatListView: View {
            }
            ToolbarItem(placement: .navigationBarTrailing) {
                switch chatModel.chatRunning {
-                case .some(true): NewChatButton(showAddChat: $showAddChat)
+                case .some(true): NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
                case .some(false): chatStoppedIcon()
                case .none: EmptyView()
                }
@@ -144,11 +144,25 @@ struct ChatListView: View {
    @ViewBuilder private var chatList: some View {
        let cs = filteredChats()
        ZStack {
-            List {
-                ForEach(cs, id: \.viewId) { chat in
-                    ChatListNavLink(chat: chat)
-                        .padding(.trailing, -16)
-                        .disabled(chatModel.chatRunning != true)
+            VStack {
+                List {
+                    if !chatModel.chats.isEmpty {
+                        ChatListSearchBar(
+                            searchMode: $searchMode,
+                            searchFocussed: $searchFocussed,
+                            searchText: $searchText,
+                            searchShowingSimplexLink: $searchShowingSimplexLink,
+                            searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
+                        )
+                        .listRowSeparator(.hidden)
+                        .frame(maxWidth: .infinity)
+                    }
+                    ForEach(cs, id: \.viewId) { chat in
+                        ChatListNavLink(chat: chat)
+                            .padding(.trailing, -16)
+                            .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
+                    }
+                    .offset(x: -8)
                }
            }
            .onChange(of: chatModel.chatId) { _ in
@@ -182,7 +196,7 @@ struct ChatListView: View {
            .padding(.trailing, 12)

            connectButton("Tap to start a new chat") {
-                showAddChat = true
+                newChatMenuOption = .newContact
            }

            Spacer()
@@ -214,22 +228,25 @@ struct ChatListView: View {
    }

    private func filteredChats() -> [Chat] {
-        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-        return s == "" && !showUnreadAndFavorites
+        if let linkChatId = searchChatFilteredBySimplexLink {
+            return chatModel.chats.filter { $0.id == linkChatId }
+        } else {
+            let s = searchString()
+            return s == "" && !showUnreadAndFavorites
            ? chatModel.chats
            : chatModel.chats.filter { chat in
                let cInfo = chat.chatInfo
                switch cInfo {
                case let .direct(contact):
                    return s == ""
-                            ? filtered(chat)
-                            : (viewNameContains(cInfo, s) ||
-                               contact.profile.displayName.localizedLowercase.contains(s) ||
-                               contact.fullName.localizedLowercase.contains(s))
+                    ? filtered(chat)
+                    : (viewNameContains(cInfo, s) ||
+                       contact.profile.displayName.localizedLowercase.contains(s) ||
+                       contact.fullName.localizedLowercase.contains(s))
                case let .group(gInfo):
                    return s == ""
-                            ? (filtered(chat) || gInfo.membership.memberStatus == .memInvited)
-                            : viewNameContains(cInfo, s)
+                    ? (filtered(chat) || gInfo.membership.memberStatus == .memInvited)
+                    : viewNameContains(cInfo, s)
                case .contactRequest:
                    return s == "" || viewNameContains(cInfo, s)
                case let .contactConnection(conn):
@@ -238,6 +255,11 @@ struct ChatListView: View {
                    return false
                }
            }
+        }
+
+        func searchString() -> String {
+            searchShowingSimplexLink ? "" : searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
+        }

        func filtered(_ chat: Chat) -> Bool {
            (chat.chatInfo.chatSettings?.favorite ?? false) || chat.chatStats.unreadCount > 0 || chat.chatStats.unreadChat
@@ -249,6 +271,121 @@ struct ChatListView: View {
    }
 }

+struct ChatListSearchBar: View {
+    @EnvironmentObject var m: ChatModel
+    @Binding var searchMode: Bool
+    @FocusState.Binding var searchFocussed: Bool
+    @Binding var searchText: String
+    @Binding var searchShowingSimplexLink: Bool
+    @Binding var searchChatFilteredBySimplexLink: String?
+    @State private var ignoreSearchTextChange = false
+    @State private var showScanCodeSheet = false
+    @State private var alert: PlanAndConnectAlert?
+    @State private var sheet: PlanAndConnectActionSheet?
+
+    var body: some View {
+        VStack(spacing: 12) {
+            HStack(spacing: 12) {
+                HStack(spacing: 4) {
+                    Image(systemName: "magnifyingglass")
+                    TextField("Search or paste SimpleX link", text: $searchText)
+                        .foregroundColor(searchShowingSimplexLink ? .secondary : .primary)
+                        .disabled(searchShowingSimplexLink)
+                        .focused($searchFocussed)
+                        .frame(maxWidth: .infinity)
+                    if !searchText.isEmpty {
+                        Image(systemName: "xmark.circle.fill")
+                            .onTapGesture {
+                                searchText = ""
+                            }
+                    } else if !searchFocussed {
+                        HStack(spacing: 24) {
+                            if m.pasteboardHasStrings {
+                                Image(systemName: "doc")
+                                    .onTapGesture {
+                                        if let str = UIPasteboard.general.string {
+                                            searchText = str
+                                        }
+                                    }
+                            }
+
+                            Image(systemName: "qrcode")
+                                .resizable()
+                                .scaledToFit()
+                                .frame(width: 20, height: 20)
+                                .onTapGesture {
+                                    showScanCodeSheet = true
+                                }
+                        }
+                        .padding(.trailing, 2)
+                    }
+                }
+                .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
+                .foregroundColor(.secondary)
+                .background(Color(.tertiarySystemFill))
+                .cornerRadius(10.0)
+
+                if searchFocussed {
+                    Text("Cancel")
+                        .foregroundColor(.accentColor)
+                        .onTapGesture {
+                            searchText = ""
+                            searchFocussed = false
+                        }
+                }
+            }
+            Divider()
+        }
+        .sheet(isPresented: $showScanCodeSheet) {
+            NewChatView(selection: .connect, showQRCodeScanner: true)
+                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil) // fixes .refreshable in ChatListView affecting nested view
+        }
+        .onChange(of: searchFocussed) { sf in
+            withAnimation { searchMode = sf }
+        }
+        .onChange(of: searchText) { t in
+            if ignoreSearchTextChange {
+                ignoreSearchTextChange = false
+            } else {
+                if let link = strHasSingleSimplexLink(t.trimmingCharacters(in: .whitespaces)) { // if SimpleX link is pasted, show connection dialogue
+                    searchFocussed = false
+                    if case let .simplexLink(linkType, _, smpHosts) = link.format {
+                        ignoreSearchTextChange = true
+                        searchText = simplexLinkText(linkType, smpHosts)
+                    }
+                    searchShowingSimplexLink = true
+                    searchChatFilteredBySimplexLink = nil
+                    connect(link.text)
+                } else {
+                    if t != "" { // if some other text is pasted, enter search mode
+                        searchFocussed = true
+                    }
+                    searchShowingSimplexLink = false
+                    searchChatFilteredBySimplexLink = nil
+                }
+            }
+        }
+        .alert(item: $alert) { a in
+            planAndConnectAlert(a, dismiss: true, cleanup: { searchText = "" })
+        }
+        .actionSheet(item: $sheet) { s in
+            planAndConnectActionSheet(s, dismiss: true, cleanup: { searchText = "" })
+        }
+    }
+
+    private func connect(_ link: String) {
+        planAndConnect(
+            link,
+            showAlert: { alert = $0 },
+            showActionSheet: { sheet = $0 },
+            dismiss: false,
+            incognito: nil,
+            filterKnownContact: { searchChatFilteredBySimplexLink = $0.id },
+            filterKnownGroup: { searchChatFilteredBySimplexLink = $0.id }
+        )
+    }
+}
+
 func chatStoppedIcon() -> some View {
    Button {
        AlertManager.shared.showAlertMsg(
@@ -13,6 +13,7 @@ struct ChatPreviewView: View {
    @EnvironmentObject var chatModel: ChatModel
    @ObservedObject var chat: Chat
    @Binding var progressByTimeout: Bool
+    @State var deleting: Bool = false
    @Environment(\.colorScheme) var colorScheme
    var darkGreen = Color(red: 0, green: 0.5, blue: 0)

@@ -55,6 +56,9 @@ struct ChatPreviewView: View {
            .frame(maxHeight: .infinity)
        }
        .padding(.bottom, -8)
+        .onChange(of: chatModel.deletedChats.contains(chat.chatInfo.id)) { contains in
+            deleting = contains
+        }
    }

    @ViewBuilder private func chatPreviewImageOverlayIcon() -> some View {
@@ -87,13 +91,13 @@ struct ChatPreviewView: View {
        let t = Text(chat.chatInfo.chatViewName).font(.title3).fontWeight(.bold)
        switch chat.chatInfo {
        case let .direct(contact):
-            previewTitle(contact.verified == true ? verifiedIcon + t : t)
+            previewTitle(contact.verified == true ? verifiedIcon + t : t).foregroundColor(deleting ? Color.secondary : nil)
        case let .group(groupInfo):
-            let v = previewTitle(t)
+            let v = previewTitle(t).foregroundColor(deleting ? Color.secondary : nil)
            switch (groupInfo.membership.memberStatus) {
-            case .memInvited: v.foregroundColor(chat.chatInfo.incognito ? .indigo : .accentColor)
+            case .memInvited: v.foregroundColor(deleting ? .secondary : chat.chatInfo.incognito ? .indigo : .accentColor)
            case .memAccepted: v.foregroundColor(.secondary)
-            default: v
+            default: v.foregroundColor(deleting ? Color.secondary : nil)
            }
        default: previewTitle(t)
        }
@@ -150,7 +154,7 @@ struct ChatPreviewView: View {
        let msg = draft.message
        return image("rectangle.and.pencil.and.ellipsis", color: .accentColor)
                + attachment()
-                + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true)
+                + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true, showSecrets: false)

        func image(_ s: String, color: Color = Color(uiColor: .tertiaryLabel)) -> Text {
            Text(Image(systemName: s)).foregroundColor(color) + Text(" ")
@@ -169,7 +173,7 @@ struct ChatPreviewView: View {
    func chatItemPreview(_ cItem: ChatItem) -> Text {
        let itemText = cItem.meta.itemDeleted == nil ? cItem.text : NSLocalizedString("marked deleted", comment: "marked deleted chat item preview text")
        let itemFormattedText = cItem.meta.itemDeleted == nil ? cItem.formattedText : nil
-        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: attachment(), preview: true)
+        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: attachment(), preview: true, showSecrets: false)

        func attachment() -> String? {
            switch cItem.content.msgContent {
@@ -164,6 +164,28 @@ struct ContactConnectionInfo: View {
    }
 }

+private func shareLinkButton(_ connReqInvitation: String) -> some View {
+    Button {
+        showShareSheet(items: [simplexChatLink(connReqInvitation)])
+    } label: {
+        settingsRow("square.and.arrow.up") {
+            Text("Share 1-time link")
+        }
+    }
+}
+
+private func oneTimeLinkLearnMoreButton() -> some View {
+    NavigationLink {
+        AddContactLearnMore(showTitle: false)
+            .navigationTitle("One-time invitation link")
+            .navigationBarTitleDisplayMode(.large)
+    } label: {
+        settingsRow("info.circle") {
+            Text("Learn more")
+        }
+    }
+}
+
 struct ContactConnectionInfo_Previews: PreviewProvider {
    static var previews: some View {
        ContactConnectionInfo(contactConnection: PendingContactConnection.getSampleData())
@@ -149,7 +149,7 @@ struct DatabaseErrorView: View {
    private func runChatSync(confirmMigrations: MigrationConfirmation? = nil) {
        do {
            resetChatCtrl()
-            try initializeChat(start: m.v3DBMigration.startChat, dbKey: useKeychain ? nil : dbKey, confirmMigrations: confirmMigrations)
+            try initializeChat(start: m.v3DBMigration.startChat, confirmStart: m.v3DBMigration.startChat && AppChatState.shared.value == .stopped, dbKey: useKeychain ? nil : dbKey, confirmMigrations: confirmMigrations)
            if let s = m.chatDbStatus {
                status = s
                let am = AlertManager.shared
@@ -415,7 +415,7 @@ struct DatabaseView: View {
                do {
                    try initializeChat(start: true)
                    m.chatDbChanged = false
-                    appStateGroupDefault.set(.active)
+                    AppChatState.shared.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)
-                appStateGroupDefault.set(.active)
+                AppChatState.shared.set(.active)
            } catch let error {
                runChat = false
                alert = .error(title: "Error starting chat", error: responseError(error))
@@ -477,13 +477,14 @@ func stopChatAsync() async throws {
    try await apiStopChat()
    ChatReceiver.shared.stop()
    await MainActor.run { ChatModel.shared.chatRunning = false }
-    appStateGroupDefault.set(.stopped)
+    AppChatState.shared.set(.stopped)
 }

 func deleteChatAsync() async throws {
    try await apiDeleteStorage()
    _ = kcDatabasePassword.remove()
    storeDBPassphraseGroupDefault.set(true)
+    deleteAppDatabaseAndFiles()
 }

 struct DatabaseView_Previews: PreviewProvider {
@@ -13,112 +13,130 @@ import SimpleXChat

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

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

 struct LibraryMediaListPicker: UIViewControllerRepresentable {
    typealias UIViewControllerType = PHPickerViewController
-    @Binding var media: [UploadContent]
+    var addMedia: (_ content: UploadContent) async -> Void
    var selectionLimit: Int
-    var didFinishPicking: (_ didSelectItems: Bool) -> Void
+    var finishedPreprocessing: () -> Void = {}
+    var didFinishPicking: (_ didSelectItems: Bool) async -> 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]) {
-            parent.didFinishPicking(!results.isEmpty)
-            guard !results.isEmpty else {
-                return
+            Task {
+                await parent.didFinishPicking(!results.isEmpty)
+                if results.isEmpty { return }
+                for r in results {
+                    await loadItem(r.itemProvider)
+                }
+                parent.finishedPreprocessing()
            }
+        }

-            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)
+        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)
                            }
+                            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)
-                        }
-                    }
+                }
+            }
+        }
+
+        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 {
-                    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
-                    }
-                }
-            }
-        }
-
-        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 = []
+                    completion(url)
                }
            }
        }
@@ -0,0 +1,26 @@
+//
+//  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
+}
@@ -13,19 +13,28 @@ struct LocalAuthView: View {
    @EnvironmentObject var m: ChatModel
    var authRequest: LocalAuthRequest
    @State private var password = ""
+    @State private var allowToReact = true

    var body: some View {
-        PasscodeView(passcode: $password, title: authRequest.title ?? "Enter Passcode", reason: authRequest.reason, submitLabel: "Submit") {
+        PasscodeView(passcode: $password, title: authRequest.title ?? "Enter Passcode", reason: authRequest.reason, submitLabel: "Submit",
+                     buttonsEnabled: $allowToReact) {
            if let sdPassword = kcSelfDestructPassword.get(), authRequest.selfDestruct && password == sdPassword {
+                allowToReact = false
                deleteStorageAndRestart(sdPassword) { r in
                    m.laRequest = nil
                    authRequest.completed(r)
                }
                return
            }
-            let r: LAResult = password == authRequest.password
-                            ? .success
-                            : .failed(authError: NSLocalizedString("Incorrect passcode", comment: "PIN entry"))
+            let r: LAResult
+            if password == authRequest.password {
+                if authRequest.selfDestruct && kcSelfDestructPassword.get() != nil && !m.chatInitialized {
+                    initChatAndMigrate()
+                }
+                r = .success
+            } else {
+                r = .failed(authError: NSLocalizedString("Incorrect passcode", comment: "PIN entry"))
+            }
            m.laRequest = nil
            authRequest.completed(r)
        } cancel: {
@@ -37,8 +46,27 @@ struct LocalAuthView: View {
    private func deleteStorageAndRestart(_ password: String, completed: @escaping (LAResult) -> Void) {
        Task {
            do {
-                try await stopChatAsync()
-                try await deleteChatAsync()
+                /** Waiting until [initializeChat] finishes */
+                while (m.ctrlInitInProgress) {
+                    try await Task.sleep(nanoseconds: 50_000000)
+                }
+                if m.chatRunning == true {
+                    try await stopChatAsync()
+                }
+                if m.chatInitialized {
+                    /**
+                     * The following sequence can bring a user here:
+                     * the user opened the app, entered app passcode, went to background, returned back, entered self-destruct code.
+                     * In this case database should be closed to prevent possible situation when OS can deny database removal command
+                     * */
+                    chatCloseStore()
+                }
+                deleteAppDatabaseAndFiles()
+                // Clear sensitive data on screen just in case app fails to hide its views while new database is created
+                m.chatId = nil
+                m.reversedChatItems = []
+                m.chats = []
+                m.users = []
                _ = kcAppPassword.set(password)
                _ = kcSelfDestructPassword.remove()
                await NtfManager.shared.removeAllNotifications()
@@ -52,8 +80,8 @@ struct LocalAuthView: View {
                resetChatCtrl()
                try initializeChat(start: true)
                m.chatDbChanged = false
-                appStateGroupDefault.set(.active)
-                if m.currentUser != nil { return }
+                AppChatState.shared.set(.active)
+                if m.currentUser != nil || !m.chatInitialized { return }
                var profile: Profile? = nil
                if let displayName = displayName, displayName != "" {
                    profile = Profile(displayName: displayName, fullName: "")
@@ -14,6 +14,8 @@ struct PasscodeView: View {
    var reason: String? = nil
    var submitLabel: LocalizedStringKey
    var submitEnabled: ((String) -> Bool)?
+    @Binding var buttonsEnabled: Bool
+
    var submit: () -> Void
    var cancel: () -> Void

@@ -70,11 +72,11 @@ struct PasscodeView: View {
    @ViewBuilder private func buttonsView() -> some View {
        Button(action: cancel) {
            Label("Cancel", systemImage: "multiply")
-        }
+        }.disabled(!buttonsEnabled)
        Button(action: submit) {
            Label(submitLabel, systemImage: "checkmark")
        }
-        .disabled(submitEnabled?(passcode) == false || passcode.count < 4)
+        .disabled(submitEnabled?(passcode) == false || passcode.count < 4 || !buttonsEnabled)
    }
 }

@@ -85,6 +87,7 @@ struct PasscodeViewView_Previews: PreviewProvider {
            title: "Enter Passcode",
            reason: "Unlock app",
            submitLabel: "Submit",
+            buttonsEnabled: Binding.constant(true),
            submit: {},
            cancel: {}
        )
@@ -11,6 +11,7 @@ import SimpleXChat

 struct SetAppPasscodeView: View {
    var passcodeKeychain: KeyChainItem = kcAppPassword
+    var prohibitedPasscodeKeychain: KeyChainItem = kcSelfDestructPassword
    var title: LocalizedStringKey = "New Passcode"
    var reason: String?
    var submit: () -> Void
@@ -41,7 +42,10 @@ struct SetAppPasscodeView: View {
                    }
                }
            } else {
-                setPasswordView(title: title, submitLabel: "Save") {
+                setPasswordView(title: title,
+                                submitLabel: "Save",
+                                // Do not allow to set app passcode == selfDestruct passcode
+                                submitEnabled: { pwd in pwd != prohibitedPasscodeKeychain.get() }) {
                    enteredPassword = passcode
                    passcode = ""
                    confirming = true
@@ -54,7 +58,7 @@ struct SetAppPasscodeView: View {
    }

    private func setPasswordView(title: LocalizedStringKey, submitLabel: LocalizedStringKey, submitEnabled: (((String) -> Bool))? = nil, submit: @escaping () -> Void) -> some View {
-        PasscodeView(passcode: $passcode, title: title, reason: reason, submitLabel: submitLabel, submitEnabled: submitEnabled, submit: submit) {
+        PasscodeView(passcode: $passcode, title: title, reason: reason, submitLabel: submitLabel, submitEnabled: submitEnabled, buttonsEnabled: Binding.constant(true), submit: submit) {
            dismiss()
            cancel()
        }
@@ -9,8 +9,20 @@
 import SwiftUI

 struct AddContactLearnMore: View {
+    var showTitle: Bool
+
    var body: some View {
        List {
+            if showTitle {
+                Text("One-time invitation link")
+                    .font(.largeTitle)
+                    .bold()
+                    .fixedSize(horizontal: false, vertical: true)
+                    .padding(.vertical)
+                    .listRowBackground(Color.clear)
+                    .listRowSeparator(.hidden)
+                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+            }
            VStack(alignment: .leading, spacing: 18) {
                Text("To connect, your contact can scan QR code or use the link in the app.")
                Text("If you can't meet in person, show QR code in a video call, or share the link.")
@@ -23,6 +35,6 @@ struct AddContactLearnMore: View {

 struct AddContactLearnMore_Previews: PreviewProvider {
    static var previews: some View {
-        AddContactLearnMore()
+        AddContactLearnMore(showTitle: true)
    }
 }
@@ -1,129 +0,0 @@
-//
-//  AddContactView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 29/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import CoreImage.CIFilterBuiltins
-import SimpleXChat
-
-struct AddContactView: View {
-    @EnvironmentObject private var chatModel: ChatModel
-    @Binding var contactConnection: PendingContactConnection?
-    var connReqInvitation: String
-    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
-
-    var body: some View {
-        VStack {
-            List {
-                Section {
-                    if connReqInvitation != "" {
-                        SimpleXLinkQRCode(uri: connReqInvitation)
-                    } else {
-                        ProgressView()
-                            .progressViewStyle(.circular)
-                            .scaleEffect(2)
-                            .frame(maxWidth: .infinity)
-                            .padding(.vertical)
-                    }
-                    IncognitoToggle(incognitoEnabled: $incognitoDefault)
-                        .disabled(contactConnection == nil)
-                    shareLinkButton(connReqInvitation)
-                    oneTimeLinkLearnMoreButton()
-                } header: {
-                    Text("1-time link")
-                } footer: {
-                    sharedProfileInfo(incognitoDefault)
-                }
-            }
-        }
-        .onAppear { chatModel.connReqInv = connReqInvitation }
-        .onChange(of: incognitoDefault) { incognito in
-            Task {
-                do {
-                    if let contactConn = contactConnection,
-                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
-                        await MainActor.run {
-                            contactConnection = conn
-                            chatModel.updateContactConnection(conn)
-                        }
-                    }
-                } catch {
-                    logger.error("apiSetConnectionIncognito error: \(responseError(error))")
-                }
-            }
-        }
-    }
-}
-
-struct IncognitoToggle: View {
-    @Binding var incognitoEnabled: Bool
-    @State private var showIncognitoSheet = false
-
-    var body: some View {
-        ZStack(alignment: .leading) {
-            Image(systemName: incognitoEnabled ? "theatermasks.fill" : "theatermasks")
-                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
-                .foregroundColor(incognitoEnabled ? Color.indigo : .secondary)
-                .font(.system(size: 14))
-            Toggle(isOn: $incognitoEnabled) {
-                HStack(spacing: 6) {
-                    Text("Incognito")
-                    Image(systemName: "info.circle")
-                        .foregroundColor(.accentColor)
-                        .font(.system(size: 14))
-                }
-                .onTapGesture {
-                    showIncognitoSheet = true
-                }
-            }
-            .padding(.leading, 36)
-        }
-        .sheet(isPresented: $showIncognitoSheet) {
-            IncognitoHelp()
-        }
-    }
-}
-
-func sharedProfileInfo(_ incognito: Bool) -> Text {
-    let name = ChatModel.shared.currentUser?.displayName ?? ""
-    return Text(
-        incognito
-        ? "A new random profile will be shared."
-        : "Your profile **\(name)** will be shared."
-    )
-}
-
-func shareLinkButton(_ connReqInvitation: String) -> some View {
-    Button {
-        showShareSheet(items: [simplexChatLink(connReqInvitation)])
-    } label: {
-        settingsRow("square.and.arrow.up") {
-            Text("Share 1-time link")
-        }
-    }
-}
-
-func oneTimeLinkLearnMoreButton() -> some View {
-    NavigationLink {
-        AddContactLearnMore()
-            .navigationTitle("One-time invitation link")
-            .navigationBarTitleDisplayMode(.large)
-    } label: {
-        settingsRow("info.circle") {
-            Text("Learn more")
-        }
-    }
-}
-
-struct AddContactView_Previews: PreviewProvider {
-    static var previews: some View {
-        AddContactView(
-            contactConnection: Binding.constant(PendingContactConnection.getSampleData()),
-            connReqInvitation: "https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FFe5ICmvrm4wkrr6X1LTMii-lhBqLeB76%23MCowBQYDK2VuAyEAdhZZsHpuaAk3Hh1q0uNb_6hGTpuwBIrsp2z9U2T0oC0%3D&e2e=v%3D1%26x3dh%3DMEIwBQYDK2VvAzkAcz6jJk71InuxA0bOX7OUhddfB8Ov7xwQIlIDeXBRZaOntUU4brU5Y3rBzroZBdQJi0FKdtt_D7I%3D%2CMEIwBQYDK2VvAzkA-hDvk1duBi1hlOr08VWSI-Ou4JNNSQjseY69QyKm7Kgg1zZjbpGfyBqSZ2eqys6xtoV4ZtoQUXQ%3D"
-        )
-    }
-}
@@ -130,8 +130,10 @@ struct AddGroupView: View {
            }
        }
        .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) {
-                didSelectItem in showImagePicker = false
+            LibraryImagePicker(image: $chosenImage) { _ in
+                await MainActor.run {
+                    showImagePicker = false
+                }
            }
        }
        .alert(isPresented: $showInvalidNameAlert) {
@@ -185,6 +187,7 @@ struct AddGroupView: View {
        hideKeyboard()
        do {
            profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
+            profile.groupPreferences = GroupPreferences(history: GroupPreference(enable: .on))
            let gInfo = try apiNewGroup(incognito: incognitoDefault, groupProfile: profile)
            Task {
                let groupMembers = await apiListMembers(gInfo.groupId)
@@ -1,42 +0,0 @@
-//
-//  ConnectViaLinkView.swift
-//  SimpleX (iOS)
-//
-//  Created by Evgeny on 21/09/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-enum ConnectViaLinkTab: String {
-    case scan
-    case paste
-}
-
-struct ConnectViaLinkView: View {
-    @State private var selection: ConnectViaLinkTab = connectViaLinkTabDefault.get()
-
-    var body: some View {
-        TabView(selection: $selection) {
-            ScanToConnectView()
-                .tabItem {
-                    Label("Scan QR code", systemImage: "qrcode")
-                }
-                .tag(ConnectViaLinkTab.scan)
-            PasteToConnectView()
-                .tabItem {
-                    Label("Paste received link", systemImage: "doc.plaintext")
-                }
-                .tag(ConnectViaLinkTab.paste)
-        }
-        .onChange(of: selection) { _ in
-            connectViaLinkTabDefault.set(selection)
-        }
-    }
-}
-
-struct ConnectViaLinkView_Previews: PreviewProvider {
-    static var previews: some View {
-        ConnectViaLinkView()
-    }
-}
@@ -1,93 +0,0 @@
-//
-//  CreateLinkView.swift
-//  SimpleX (iOS)
-//
-//  Created by Evgeny on 21/09/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-enum CreateLinkTab {
-    case oneTime
-    case longTerm
-
-    var title: LocalizedStringKey {
-        switch self {
-        case .oneTime: return "One-time invitation link"
-        case .longTerm: return "Your SimpleX address"
-        }
-    }
-}
-
-struct CreateLinkView: View {
-    @EnvironmentObject var m: ChatModel
-    @State var selection: CreateLinkTab
-    @State var connReqInvitation: String = ""
-    @State var contactConnection: PendingContactConnection? = nil
-    @State private var creatingConnReq = false
-    var viaNavLink = false
-
-    var body: some View {
-        if viaNavLink {
-            createLinkView()
-        } else {
-            NavigationView {
-                createLinkView()
-            }
-        }
-    }
-
-    private func createLinkView() -> some View {
-        TabView(selection: $selection) {
-            AddContactView(contactConnection: $contactConnection, connReqInvitation: connReqInvitation)
-                .tabItem {
-                    Label(
-                        connReqInvitation == ""
-                        ? "Create one-time invitation link"
-                        : "One-time invitation link",
-                        systemImage: "1.circle"
-                    )
-                }
-                .tag(CreateLinkTab.oneTime)
-            UserAddressView(viaCreateLinkView: true)
-                .tabItem {
-                    Label("Your SimpleX address", systemImage: "infinity.circle")
-                }
-                .tag(CreateLinkTab.longTerm)
-        }
-        .onChange(of: selection) { _ in
-            if case .oneTime = selection, connReqInvitation == "", contactConnection == nil && !creatingConnReq {
-                createInvitation()
-            }
-        }
-        .onAppear { m.connReqInv = connReqInvitation }
-        .onDisappear { m.connReqInv = nil }
-        .navigationTitle(selection.title)
-        .navigationBarTitleDisplayMode(.large)
-    }
-
-    private func createInvitation() {
-        creatingConnReq = true
-        Task {
-            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
-                await MainActor.run {
-                    connReqInvitation = connReq
-                    contactConnection = pcc
-                    m.connReqInv = connReq
-                }
-            } else {
-                await MainActor.run {
-                    creatingConnReq = false
-                }
-            }
-        }
-    }
-}
-
-struct CreateLinkView_Previews: PreviewProvider {
-    static var previews: some View {
-        CreateLinkView(selection: CreateLinkTab.oneTime)
-    }
-}
@@ -1,460 +0,0 @@
-//
-//  NewChatButton.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 31/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-enum NewChatAction: Identifiable {
-    case createLink(link: String, connection: PendingContactConnection)
-    case connectViaLink
-    case createGroup
-
-    var id: String {
-        switch self {
-        case let .createLink(link, _): return "createLink \(link)"
-        case .connectViaLink: return "connectViaLink"
-        case .createGroup: return "createGroup"
-        }
-    }
-}
-
-struct NewChatButton: View {
-    @Binding var showAddChat: Bool
-    @State private var actionSheet: NewChatAction?
-
-    var body: some View {
-        Button { showAddChat = true } label: {
-            Image(systemName: "square.and.pencil")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 24, height: 24)
-        }
-        .confirmationDialog("Start a new chat", isPresented: $showAddChat, titleVisibility: .visible) {
-            Button("Share one-time invitation link") { addContactAction() }
-            Button("Connect via link / QR code") { actionSheet = .connectViaLink }
-            Button("Create secret group") { actionSheet = .createGroup }
-        }
-        .sheet(item: $actionSheet) { sheet in
-            switch sheet {
-            case let .createLink(link, pcc):
-                CreateLinkView(selection: .oneTime, connReqInvitation: link, contactConnection: pcc)
-            case .connectViaLink: ConnectViaLinkView()
-            case .createGroup: AddGroupView()
-            }
-        }
-    }
-
-    func addContactAction() {
-        Task {
-            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
-                actionSheet = .createLink(link: connReq, connection: pcc)
-            }
-        }
-    }
-}
-
-enum PlanAndConnectAlert: Identifiable {
-    case ownInvitationLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case invitationLinkConnecting(connectionLink: String)
-    case ownContactAddressConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case contactAddressConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnecting(connectionLink: String, groupInfo: GroupInfo?)
-
-    var id: String {
-        switch self {
-        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink)"
-        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink)"
-        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink)"
-        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink)"
-        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink)"
-        }
-    }
-}
-
-func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool) -> Alert {
-    switch alert {
-    case let .ownInvitationLinkConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Connect to yourself?"),
-            message: Text("This is your own one-time link!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case .invitationLinkConnecting:
-        return Alert(
-            title: Text("Already connecting!"),
-            message: Text("You are already connecting via this one-time link!")
-        )
-    case let .ownContactAddressConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Connect to yourself?"),
-            message: Text("This is your own SimpleX address!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .contactAddressConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Repeat connection request?"),
-            message: Text("You have already requested connection via this address!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .groupLinkConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Join group?"),
-            message: Text("You will connect to all group members."),
-            primaryButton: .default(
-                Text(incognito ? "Join incognito" : "Join"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .groupLinkConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Repeat join request?"),
-            message: Text("You are already joining the group via this link!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Join incognito" : "Join"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
-            ),
-            secondaryButton: .cancel()
-        )
-    case let .groupLinkConnecting(_, groupInfo):
-        if let groupInfo = groupInfo {
-            return Alert(
-                title: Text("Group already exists!"),
-                message: Text("You are already joining the group \(groupInfo.displayName).")
-            )
-        } else {
-            return Alert(
-                title: Text("Already joining the group!"),
-                message: Text("You are already joining the group via this link.")
-            )
-        }
-    }
-}
-
-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)"
-        }
-    }
-}
-
-func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool) -> ActionSheet {
-    switch sheet {
-    case let .askCurrentOrIncognitoProfile(connectionLink, connectionPlan, title):
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .default(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
-                .default(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
-                .cancel()
-            ]
-        )
-    case let .askCurrentOrIncognitoProfileDestructive(connectionLink, connectionPlan, title):
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
-                .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
-                .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(
-                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
-                buttons: [
-                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
-                    .destructive(Text(incognito ? "Join incognito" : "Join with current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) },
-                    .cancel()
-                ]
-            )
-        } else {
-            return ActionSheet(
-                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
-                buttons: [
-                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
-                    .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
-                    .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
-                    .cancel()
-                ]
-            )
-        }
-    }
-}
-
-func planAndConnect(
-    _ connectionLink: String,
-    showAlert: @escaping (PlanAndConnectAlert) -> Void,
-    showActionSheet: @escaping (PlanAndConnectActionSheet) -> Void,
-    dismiss: Bool,
-    incognito: Bool?
-) {
-    Task {
-        do {
-            let connectionPlan = try await apiConnectPlan(connReq: connectionLink)
-            switch connectionPlan {
-            case let .invitationLink(ilp):
-                switch ilp {
-                case .ok:
-                    logger.debug("planAndConnect, .invitationLink, .ok, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
-                    }
-                case .ownLink:
-                    logger.debug("planAndConnect, .invitationLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownInvitationLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own one-time link!"))
-                    }
-                case let .connecting(contact_):
-                    logger.debug("planAndConnect, .invitationLink, .connecting, incognito=\(incognito?.description ?? "nil")")
-                    if let contact = contact_ {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
-                    } else {
-                        showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
-                    }
-                case let .known(contact):
-                    logger.debug("planAndConnect, .invitationLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
-                }
-            case let .contactAddress(cap):
-                switch cap {
-                case .ok:
-                    logger.debug("planAndConnect, .contactAddress, .ok, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
-                    }
-                case .ownLink:
-                    logger.debug("planAndConnect, .contactAddress, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownContactAddressConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own SimpleX address!"))
-                    }
-                case .connectingConfirmReconnect:
-                    logger.debug("planAndConnect, .contactAddress, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.contactAddressConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You have already requested connection!\nRepeat connection request?"))
-                    }
-                case let .connectingProhibit(contact):
-                    logger.debug("planAndConnect, .contactAddress, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
-                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 {
-                case .ok:
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Join group"))
-                    }
-                case let .ownLink(groupInfo):
-                    logger.debug("planAndConnect, .groupLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    showActionSheet(.ownGroupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito, groupInfo: groupInfo))
-                case .connectingConfirmReconnect:
-                    logger.debug("planAndConnect, .groupLink, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You are already joining the group!\nRepeat join request?"))
-                    }
-                case let .connectingProhibit(groupInfo_):
-                    logger.debug("planAndConnect, .groupLink, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
-                case let .known(groupInfo):
-                    logger.debug("planAndConnect, .groupLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    openKnownGroup(groupInfo, dismiss: dismiss) { AlertManager.shared.showAlert(groupAlreadyExistsAlert(groupInfo)) }
-                }
-            }
-        } catch {
-            logger.debug("planAndConnect, plan error")
-            if let incognito = incognito {
-                connectViaLink(connectionLink, connectionPlan: nil, dismiss: dismiss, incognito: incognito)
-            } else {
-                showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: nil, title: "Connect via link"))
-            }
-        }
-    }
-}
-
-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 = await apiConnect(incognito: incognito, connReq: connectionLink) {
-            let crt: ConnReqType
-            if let plan = connectionPlan {
-                crt = planToConnReqType(plan)
-            } else {
-                crt = connReqType
-            }
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        AlertManager.shared.showAlert(connReqSentAlert(crt))
-                    }
-                } else {
-                    AlertManager.shared.showAlert(connReqSentAlert(crt))
-                }
-            }
-        } else {
-            if dismiss {
-                DispatchQueue.main.async {
-                    dismissAllSheets(animated: true)
-                }
-            }
-        }
-    }
-}
-
-func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let c = m.getContactChat(contact.contactId) {
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        m.chatId = c.id
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    m.chatId = c.id
-                    showAlreadyExistsAlert?()
-                }
-            }
-        }
-    }
-}
-
-func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let g = m.getGroupChat(groupInfo.groupId) {
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        m.chatId = g.id
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    m.chatId = g.id
-                    showAlreadyExistsAlert?()
-                }
-            }
-        }
-    }
-}
-
-func contactAlreadyConnectingAlert(_ contact: Contact) -> Alert {
-    mkAlert(
-        title: "Contact already exists",
-        message: "You are already connecting to \(contact.displayName)."
-    )
-}
-
-func groupAlreadyExistsAlert(_ groupInfo: GroupInfo) -> Alert {
-    mkAlert(
-        title: "Group already exists",
-        message: "You are already in group \(groupInfo.displayName)."
-    )
-}
-
-enum ConnReqType: Equatable {
-    case invitation
-    case contact
-    case groupLink
-
-    var connReqSentText: LocalizedStringKey {
-        switch self {
-        case .invitation: return "You will be connected when your contact's device is online, please wait or check later!"
-        case .contact: return "You will be connected when your connection request is accepted, please wait or check later!"
-        case .groupLink: return "You will be connected when group link host's device is online, please wait or check later!"
-        }
-    }
-}
-
-private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType {
-    switch connectionPlan {
-    case .invitationLink: return .invitation
-    case .contactAddress: return .contact
-    case .groupLink: return .groupLink
-    }
-}
-
-func connReqSentAlert(_ type: ConnReqType) -> Alert {
-    return mkAlert(
-        title: "Connection request sent!",
-        message: type.connReqSentText
-    )
-}
-
-struct NewChatButton_Previews: PreviewProvider {
-    static var previews: some View {
-        NewChatButton(showAddChat: Binding.constant(false))
-    }
-}
@@ -0,0 +1,52 @@
+//
+//  NewChatMenuButton.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 28.11.2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+enum NewChatMenuOption: Identifiable {
+    case newContact
+    case newGroup
+
+    var id: Self { self }
+}
+
+struct NewChatMenuButton: View {
+    @Binding var newChatMenuOption: NewChatMenuOption?
+
+    var body: some View {
+        Menu {
+            Button {
+                newChatMenuOption = .newContact
+            } label: {
+                Text("Add contact")
+            }
+            Button {
+                newChatMenuOption = .newGroup
+            } label: {
+                Text("Create group")
+            }
+        } label: {
+            Image(systemName: "square.and.pencil")
+                .resizable()
+                .scaledToFit()
+                .frame(width: 24, height: 24)
+        }
+        .sheet(item: $newChatMenuOption) { opt in
+            switch opt {
+            case .newContact: NewChatView(selection: .invite)
+            case .newGroup: AddGroupView()
+            }
+        }
+    }
+}
+
+#Preview {
+    NewChatMenuButton(
+        newChatMenuOption: Binding.constant(nil)
+    )
+}
@@ -0,0 +1,959 @@
+//
+//  NewChatView.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 28.11.2023.
+//  Copyright © 2023 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+import CodeScanner
+import AVFoundation
+
+enum SomeAlert: Identifiable {
+    case someAlert(alert: Alert, id: String)
+
+    var id: String {
+        switch self {
+        case let .someAlert(_, id): return id
+        }
+    }
+}
+
+private enum NewChatViewAlert: Identifiable {
+    case planAndConnectAlert(alert: PlanAndConnectAlert)
+    case newChatSomeAlert(alert: SomeAlert)
+
+    var id: String {
+        switch self {
+        case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
+        case let .newChatSomeAlert(alert): return "newChatSomeAlert \(alert.id)"
+        }
+    }
+}
+
+enum NewChatOption: Identifiable {
+    case invite
+    case connect
+
+    var id: Self { self }
+}
+
+struct NewChatView: View {
+    @EnvironmentObject var m: ChatModel
+    @State var selection: NewChatOption
+    @State var showQRCodeScanner = false
+    @State private var invitationUsed: Bool = false
+    @State private var contactConnection: PendingContactConnection? = nil
+    @State private var connReqInvitation: String = ""
+    @State private var creatingConnReq = false
+    @State private var pastedLink: String = ""
+    @State private var alert: NewChatViewAlert?
+
+    var body: some View {
+        VStack(alignment: .leading) {
+            HStack {
+                Text("New chat")
+                    .font(.largeTitle)
+                    .bold()
+                    .fixedSize(horizontal: false, vertical: true)
+                Spacer()
+                InfoSheetButton {
+                    AddContactLearnMore(showTitle: true)
+                }
+            }
+            .padding()
+            .padding(.top)
+
+            Picker("New chat", selection: $selection) {
+                Label("Add contact", systemImage: "link")
+                    .tag(NewChatOption.invite)
+                Label("Connect via link", systemImage: "qrcode")
+                    .tag(NewChatOption.connect)
+            }
+            .pickerStyle(.segmented)
+            .padding()
+
+            VStack {
+                // it seems there's a bug in iOS 15 if several views in switch (or if-else) statement have different transitions
+                // https://developer.apple.com/forums/thread/714977?answerId=731615022#731615022
+                if case .invite = selection {
+                    prepareAndInviteView()
+                        .transition(.move(edge: .leading))
+                        .onAppear {
+                            createInvitation()
+                        }
+                }
+                if case .connect = selection {
+                    ConnectView(showQRCodeScanner: showQRCodeScanner, pastedLink: $pastedLink, alert: $alert)
+                        .transition(.move(edge: .trailing))
+                }
+            }
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
+            .background(
+                // Rectangle is needed for swipe gesture to work on mostly empty views (creatingLinkProgressView and retryButton)
+                Rectangle()
+                    .fill(Color(uiColor: .systemGroupedBackground))
+            )
+            .animation(.easeInOut(duration: 0.3333), value: selection)
+            .gesture(DragGesture(minimumDistance: 20.0, coordinateSpace: .local)
+                .onChanged { value in
+                    switch(value.translation.width, value.translation.height) {
+                    case (...0, -30...30): // left swipe
+                        if selection == .invite {
+                            selection = .connect
+                        }
+                    case (0..., -30...30): // right swipe
+                        if selection == .connect {
+                            selection = .invite
+                        }
+                    default: ()
+                    }
+                }
+            )
+        }
+        .background(Color(.systemGroupedBackground))
+        .onChange(of: invitationUsed) { used in
+            if used && !(m.showingInvitation?.connChatUsed ?? true) {
+                m.markShowingInvitationUsed()
+            }
+        }
+        .onDisappear {
+            if !(m.showingInvitation?.connChatUsed ?? true),
+               let conn = contactConnection {
+                AlertManager.shared.showAlert(Alert(
+                    title: Text("Keep unused invitation?"),
+                    message: Text("You can view invitation link again in connection details."),
+                    primaryButton: .default(Text("Keep")) {},
+                    secondaryButton: .destructive(Text("Delete")) {
+                        Task {
+                            await deleteChat(Chat(
+                                chatInfo: .contactConnection(contactConnection: conn),
+                                chatItems: []
+                            ))
+                        }
+                    }
+                ))
+            }
+            m.showingInvitation = nil
+        }
+        .alert(item: $alert) { a in
+            switch(a) {
+            case let .planAndConnectAlert(alert):
+                return planAndConnectAlert(alert, dismiss: true, cleanup: { pastedLink = "" })
+            case let .newChatSomeAlert(.someAlert(alert, _)):
+                return alert
+            }
+        }
+    }
+
+    private func prepareAndInviteView() -> some View {
+        ZStack { // ZStack is needed for views to not make transitions between each other
+            if connReqInvitation != "" {
+                InviteView(
+                    invitationUsed: $invitationUsed,
+                    contactConnection: $contactConnection,
+                    connReqInvitation: connReqInvitation
+                )
+            } else if creatingConnReq {
+                creatingLinkProgressView()
+            } else {
+                retryButton()
+            }
+        }
+    }
+
+    private func createInvitation() {
+        if connReqInvitation == "" && contactConnection == nil && !creatingConnReq {
+            creatingConnReq = true
+            Task {
+                _ = try? await Task.sleep(nanoseconds: 250_000000)
+                let (r, apiAlert) = await apiAddContact(incognito: incognitoGroupDefault.get())
+                if let (connReq, pcc) = r {
+                    await MainActor.run {
+                        m.updateContactConnection(pcc)
+                        m.showingInvitation = ShowingInvitation(connId: pcc.id, connChatUsed: false)
+                        connReqInvitation = connReq
+                        contactConnection = pcc
+                    }
+                } else {
+                    await MainActor.run {
+                        creatingConnReq = false
+                        if let apiAlert = apiAlert {
+                            alert = .newChatSomeAlert(alert: .someAlert(alert: apiAlert, id: "createInvitation error"))
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // Rectangle here and in retryButton are needed for gesture to work
+    private func creatingLinkProgressView() -> some View {
+        ProgressView("Creating link…")
+            .progressViewStyle(.circular)
+    }
+
+    private func retryButton() -> some View {
+        Button(action: createInvitation) {
+            VStack(spacing: 6) {
+                Image(systemName: "arrow.counterclockwise")
+                Text("Retry")
+            }
+        }
+    }
+}
+
+private struct InviteView: View {
+    @EnvironmentObject var chatModel: ChatModel
+    @Binding var invitationUsed: Bool
+    @Binding var contactConnection: PendingContactConnection?
+    var connReqInvitation: String
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+
+    var body: some View {
+        List {
+            Section("Share this 1-time invite link") {
+                shareLinkView()
+            }
+            .listRowInsets(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 10))
+
+            qrCodeView()
+
+            Section {
+                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+            } footer: {
+                sharedProfileInfo(incognitoDefault)
+            }
+        }
+        .onChange(of: incognitoDefault) { incognito in
+            Task {
+                do {
+                    if let contactConn = contactConnection,
+                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
+                        await MainActor.run {
+                            contactConnection = conn
+                            chatModel.updateContactConnection(conn)
+                        }
+                    }
+                } catch {
+                    logger.error("apiSetConnectionIncognito error: \(responseError(error))")
+                }
+            }
+            setInvitationUsed()
+        }
+    }
+
+    private func shareLinkView() -> some View {
+        HStack {
+            let link = simplexChatLink(connReqInvitation)
+            linkTextView(link)
+            Button {
+                showShareSheet(items: [link])
+                setInvitationUsed()
+            } label: {
+                Image(systemName: "square.and.arrow.up")
+                    .padding(.top, -7)
+            }
+        }
+        .frame(maxWidth: .infinity)
+    }
+
+    private func qrCodeView() -> some View {
+        Section("Or show this code") {
+            SimpleXLinkQRCode(uri: connReqInvitation, onShare: setInvitationUsed)
+                .padding()
+                .background(
+                    RoundedRectangle(cornerRadius: 12, style: .continuous)
+                        .fill(Color(uiColor: .secondarySystemGroupedBackground))
+                )
+                .padding(.horizontal)
+                .listRowBackground(Color.clear)
+                .listRowSeparator(.hidden)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+        }
+    }
+
+    private func setInvitationUsed() {
+        if !invitationUsed {
+            invitationUsed = true
+        }
+    }
+}
+
+private struct ConnectView: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
+    @State var showQRCodeScanner = false
+    @State private var cameraAuthorizationStatus: AVAuthorizationStatus?
+    @Binding var pastedLink: String
+    @Binding var alert: NewChatViewAlert?
+    @State private var sheet: PlanAndConnectActionSheet?
+
+    var body: some View {
+        List {
+            Section("Paste the link you received") {
+                pasteLinkView()
+            }
+
+            scanCodeView()
+        }
+        .actionSheet(item: $sheet) { s in
+            planAndConnectActionSheet(s, dismiss: true, cleanup: { pastedLink = "" })
+        }
+        .onAppear {
+            let status = AVCaptureDevice.authorizationStatus(for: .video)
+            cameraAuthorizationStatus = status
+            if showQRCodeScanner {
+                switch status {
+                case .notDetermined: askCameraAuthorization()
+                case .restricted: showQRCodeScanner = false
+                case .denied: showQRCodeScanner = false
+                case .authorized: ()
+                @unknown default: askCameraAuthorization()
+                }
+            }
+        }
+    }
+
+    func askCameraAuthorization(_ cb: (() -> Void)? = nil) {
+        AVCaptureDevice.requestAccess(for: .video) { allowed in
+            cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)
+            if allowed { cb?() }
+        }
+    }
+
+    @ViewBuilder private func pasteLinkView() -> some View {
+        if pastedLink == "" {
+            Button {
+                if let str = UIPasteboard.general.string {
+                    if let link = strHasSingleSimplexLink(str.trimmingCharacters(in: .whitespaces)) {
+                        pastedLink = link.text
+                        // It would be good to hide it, but right now it is not clear how to release camera in CodeScanner
+                        // https://github.com/twostraws/CodeScanner/issues/121
+                        // No known tricks worked (changing view ID, wrapping it in another view, etc.)
+                        // showQRCodeScanner = false
+                        connect(pastedLink)
+                    } else {
+                        alert = .newChatSomeAlert(alert: .someAlert(
+                            alert: mkAlert(title: "Invalid link", message: "The text you pasted is not a SimpleX link."),
+                            id: "pasteLinkView: code is not a SimpleX link"
+                        ))
+                    }
+                }
+            } label: {
+                Text("Tap to paste link")
+            }
+            .disabled(!ChatModel.shared.pasteboardHasStrings)
+            .frame(maxWidth: .infinity, alignment: .center)
+        } else {
+            linkTextView(pastedLink)
+        }
+    }
+
+    private func scanCodeView() -> some View {
+        Section("Or scan QR code") {
+            if showQRCodeScanner, case .authorized = cameraAuthorizationStatus {
+                CodeScannerView(codeTypes: [.qr], scanMode: .continuous, completion: processQRCode)
+                    .aspectRatio(1, contentMode: .fit)
+                    .cornerRadius(12)
+                    .listRowBackground(Color.clear)
+                    .listRowSeparator(.hidden)
+                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+                    .padding(.horizontal)
+            } else {
+                Button {
+                    switch cameraAuthorizationStatus {
+                    case .notDetermined: askCameraAuthorization { showQRCodeScanner = true }
+                    case .restricted: ()
+                    case .denied: UIApplication.shared.open(appSettingsURL)
+                    case .authorized: showQRCodeScanner = true
+                    default: askCameraAuthorization { showQRCodeScanner = true }
+                    }
+                } label: {
+                    ZStack {
+                        Rectangle()
+                            .aspectRatio(contentMode: .fill)
+                            .frame(maxWidth: .infinity, maxHeight: .infinity)
+                            .foregroundColor(Color.clear)
+                        switch cameraAuthorizationStatus {
+                        case .restricted: Text("Camera not available")
+                        case .denied:  Label("Enable camera access", systemImage: "camera")
+                        default: Label("Tap to scan", systemImage: "qrcode")
+                        }
+                    }
+                }
+                .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
+                .padding()
+                .background(
+                    RoundedRectangle(cornerRadius: 12, style: .continuous)
+                        .fill(Color(uiColor: .secondarySystemGroupedBackground))
+                )
+                .padding(.horizontal)
+                .listRowBackground(Color.clear)
+                .listRowSeparator(.hidden)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+                .disabled(cameraAuthorizationStatus == .restricted)
+            }
+        }
+    }
+
+    private func processQRCode(_ resp: Result<ScanResult, ScanError>) {
+        switch resp {
+        case let .success(r):
+            let link = r.string
+            if strIsSimplexLink(r.string) {
+                connect(link)
+            } else {
+                alert = .newChatSomeAlert(alert: .someAlert(
+                    alert: mkAlert(title: "Invalid QR code", message: "The code you scanned is not a SimpleX link QR code."),
+                    id: "processQRCode: code is not a SimpleX link"
+                ))
+            }
+        case let .failure(e):
+            logger.error("processQRCode QR code error: \(e.localizedDescription)")
+            alert = .newChatSomeAlert(alert: .someAlert(
+                alert: mkAlert(title: "Invalid QR code", message: "Error scanning code: \(e.localizedDescription)"),
+                id: "processQRCode: failure"
+            ))
+        }
+    }
+
+    private func connect(_ link: String) {
+        planAndConnect(
+            link,
+            showAlert: { alert = .planAndConnectAlert(alert: $0) },
+            showActionSheet: { sheet = $0 },
+            dismiss: true,
+            incognito: nil
+        )
+    }
+}
+
+private func linkTextView(_ link: String) -> some View {
+    Text(link)
+        .lineLimit(1)
+        .font(.caption)
+        .truncationMode(.middle)
+}
+
+struct InfoSheetButton<Content: View>: View {
+    @ViewBuilder let content: Content
+    @State private var showInfoSheet = false
+
+    var body: some View {
+        Button {
+            showInfoSheet = true
+        } label: {
+            Image(systemName: "info.circle")
+                .resizable()
+                .scaledToFit()
+                .frame(width: 24, height: 24)
+        }
+        .sheet(isPresented: $showInfoSheet) {
+            content
+        }
+    }
+}
+
+func strIsSimplexLink(_ str: String) -> Bool {
+    if let parsedMd = parseSimpleXMarkdown(str),
+       parsedMd.count == 1,
+       case .simplexLink = parsedMd[0].format {
+        return true
+    } else {
+        return false
+    }
+}
+
+func strHasSingleSimplexLink(_ str: String) -> FormattedText? {
+    if let parsedMd = parseSimpleXMarkdown(str) {
+       let parsedLinks = parsedMd.filter({ $0.format?.isSimplexLink ?? false })
+        if parsedLinks.count == 1 {
+            return parsedLinks[0]
+        } else {
+            return nil
+        }
+    } else {
+        return nil
+    }
+}
+
+struct IncognitoToggle: View {
+    @Binding var incognitoEnabled: Bool
+    @State private var showIncognitoSheet = false
+
+    var body: some View {
+        ZStack(alignment: .leading) {
+            Image(systemName: incognitoEnabled ? "theatermasks.fill" : "theatermasks")
+                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+                .foregroundColor(incognitoEnabled ? Color.indigo : .secondary)
+                .font(.system(size: 14))
+            Toggle(isOn: $incognitoEnabled) {
+                HStack(spacing: 6) {
+                    Text("Incognito")
+                    Image(systemName: "info.circle")
+                        .foregroundColor(.accentColor)
+                        .font(.system(size: 14))
+                }
+                .onTapGesture {
+                    showIncognitoSheet = true
+                }
+            }
+            .padding(.leading, 36)
+        }
+        .sheet(isPresented: $showIncognitoSheet) {
+            IncognitoHelp()
+        }
+    }
+}
+
+func sharedProfileInfo(_ incognito: Bool) -> Text {
+    let name = ChatModel.shared.currentUser?.displayName ?? ""
+    return Text(
+        incognito
+        ? "A new random profile will be shared."
+        : "Your profile **\(name)** will be shared."
+    )
+}
+
+enum PlanAndConnectAlert: Identifiable {
+    case ownInvitationLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case invitationLinkConnecting(connectionLink: String)
+    case ownContactAddressConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case contactAddressConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConnecting(connectionLink: String, groupInfo: GroupInfo?)
+
+    var id: String {
+        switch self {
+        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink)"
+        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink)"
+        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink)"
+        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink)"
+        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink)"
+        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink)"
+        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink)"
+        }
+    }
+}
+
+func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool, cleanup: (() -> Void)? = nil) -> Alert {
+    switch alert {
+    case let .ownInvitationLinkConfirmConnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Connect to yourself?"),
+            message: Text("This is your own one-time link!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Connect incognito" : "Connect"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
+            ),
+            secondaryButton: .cancel() { cleanup?() }
+        )
+    case .invitationLinkConnecting:
+        return Alert(
+            title: Text("Already connecting!"),
+            message: Text("You are already connecting via this one-time link!"),
+            dismissButton: .default(Text("OK")) { cleanup?() }
+        )
+    case let .ownContactAddressConfirmConnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Connect to yourself?"),
+            message: Text("This is your own SimpleX address!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Connect incognito" : "Connect"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
+            ),
+            secondaryButton: .cancel() { cleanup?() }
+        )
+    case let .contactAddressConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Repeat connection request?"),
+            message: Text("You have already requested connection via this address!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Connect incognito" : "Connect"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
+            ),
+            secondaryButton: .cancel() { cleanup?() }
+        )
+    case let .groupLinkConfirmConnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Join group?"),
+            message: Text("You will connect to all group members."),
+            primaryButton: .default(
+                Text(incognito ? "Join incognito" : "Join"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
+            ),
+            secondaryButton: .cancel() { cleanup?() }
+        )
+    case let .groupLinkConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Repeat join request?"),
+            message: Text("You are already joining the group via this link!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Join incognito" : "Join"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
+            ),
+            secondaryButton: .cancel() { cleanup?() }
+        )
+    case let .groupLinkConnecting(_, groupInfo):
+        if let groupInfo = groupInfo {
+            return Alert(
+                title: Text("Group already exists!"),
+                message: Text("You are already joining the group \(groupInfo.displayName)."),
+                dismissButton: .default(Text("OK")) { cleanup?() }
+            )
+        } else {
+            return Alert(
+                title: Text("Already joining the group!"),
+                message: Text("You are already joining the group via this link."),
+                dismissButton: .default(Text("OK")) { cleanup?() }
+            )
+        }
+    }
+}
+
+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)"
+        }
+    }
+}
+
+func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool, cleanup: (() -> Void)? = nil) -> ActionSheet {
+    switch sheet {
+    case let .askCurrentOrIncognitoProfile(connectionLink, connectionPlan, title):
+        return ActionSheet(
+            title: Text(title),
+            buttons: [
+                .default(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false, cleanup: cleanup) },
+                .default(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true, cleanup: cleanup) },
+                .cancel() { cleanup?() }
+            ]
+        )
+    case let .askCurrentOrIncognitoProfileDestructive(connectionLink, connectionPlan, title):
+        return ActionSheet(
+            title: Text(title),
+            buttons: [
+                .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false, cleanup: cleanup) },
+                .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true, cleanup: cleanup) },
+                .cancel() { cleanup?() }
+            ]
+        )
+    case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact):
+        return ActionSheet(
+            title: Text("Connect with \(contact.chatViewName)"),
+            buttons: [
+                .default(Text("Use current profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: false, cleanup: cleanup) },
+                .default(Text("Use new incognito profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: true, cleanup: cleanup) },
+                .cancel() { cleanup?() }
+            ]
+        )
+    case let .ownGroupLinkConfirmConnect(connectionLink, connectionPlan, incognito, groupInfo):
+        if let incognito = incognito {
+            return ActionSheet(
+                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
+                buttons: [
+                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
+                    .destructive(Text(incognito ? "Join incognito" : "Join with current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) },
+                    .cancel() { cleanup?() }
+                ]
+            )
+        } else {
+            return ActionSheet(
+                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
+                buttons: [
+                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
+                    .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false, cleanup: cleanup) },
+                    .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true, cleanup: cleanup) },
+                    .cancel() { cleanup?() }
+                ]
+            )
+        }
+    }
+}
+
+func planAndConnect(
+    _ connectionLink: String,
+    showAlert: @escaping (PlanAndConnectAlert) -> Void,
+    showActionSheet: @escaping (PlanAndConnectActionSheet) -> Void,
+    dismiss: Bool,
+    incognito: Bool?,
+    cleanup: (() -> Void)? = nil,
+    filterKnownContact: ((Contact) -> Void)? = nil,
+    filterKnownGroup: ((GroupInfo) -> Void)? = nil
+) {
+    Task {
+        do {
+            let connectionPlan = try await apiConnectPlan(connReq: connectionLink)
+            switch connectionPlan {
+            case let .invitationLink(ilp):
+                switch ilp {
+                case .ok:
+                    logger.debug("planAndConnect, .invitationLink, .ok, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
+                    }
+                case .ownLink:
+                    logger.debug("planAndConnect, .invitationLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.ownInvitationLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own one-time link!"))
+                    }
+                case let .connecting(contact_):
+                    logger.debug("planAndConnect, .invitationLink, .connecting, incognito=\(incognito?.description ?? "nil")")
+                    if let contact = contact_ {
+                        if let f = filterKnownContact {
+                            f(contact)
+                        } else {
+                            openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
+                        }
+                    } else {
+                        showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
+                    }
+                case let .known(contact):
+                    logger.debug("planAndConnect, .invitationLink, .known, incognito=\(incognito?.description ?? "nil")")
+                    if let f = filterKnownContact {
+                        f(contact)
+                    } else {
+                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
+                    }
+                }
+            case let .contactAddress(cap):
+                switch cap {
+                case .ok:
+                    logger.debug("planAndConnect, .contactAddress, .ok, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
+                    }
+                case .ownLink:
+                    logger.debug("planAndConnect, .contactAddress, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.ownContactAddressConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own SimpleX address!"))
+                    }
+                case .connectingConfirmReconnect:
+                    logger.debug("planAndConnect, .contactAddress, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.contactAddressConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You have already requested connection!\nRepeat connection request?"))
+                    }
+                case let .connectingProhibit(contact):
+                    logger.debug("planAndConnect, .contactAddress, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
+                    if let f = filterKnownContact {
+                        f(contact)
+                    } else {
+                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
+                    }
+                case let .known(contact):
+                    logger.debug("planAndConnect, .contactAddress, .known, incognito=\(incognito?.description ?? "nil")")
+                    if let f = filterKnownContact {
+                        f(contact)
+                    } else {
+                        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, cleanup: cleanup)
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileConnectContactViaAddress(contact: contact))
+                    }
+                }
+            case let .groupLink(glp):
+                switch glp {
+                case .ok:
+                    if let incognito = incognito {
+                        showAlert(.groupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Join group"))
+                    }
+                case let .ownLink(groupInfo):
+                    logger.debug("planAndConnect, .groupLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    if let f = filterKnownGroup {
+                        f(groupInfo)
+                    }
+                    showActionSheet(.ownGroupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito, groupInfo: groupInfo))
+                case .connectingConfirmReconnect:
+                    logger.debug("planAndConnect, .groupLink, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.groupLinkConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You are already joining the group!\nRepeat join request?"))
+                    }
+                case let .connectingProhibit(groupInfo_):
+                    logger.debug("planAndConnect, .groupLink, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
+                    showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
+                case let .known(groupInfo):
+                    logger.debug("planAndConnect, .groupLink, .known, incognito=\(incognito?.description ?? "nil")")
+                    if let f = filterKnownGroup {
+                        f(groupInfo)
+                    } else {
+                        openKnownGroup(groupInfo, dismiss: dismiss) { AlertManager.shared.showAlert(groupAlreadyExistsAlert(groupInfo)) }
+                    }
+                }
+            }
+        } catch {
+            logger.debug("planAndConnect, plan error")
+            if let incognito = incognito {
+                connectViaLink(connectionLink, connectionPlan: nil, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
+            } else {
+                showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: nil, title: "Connect via link"))
+            }
+        }
+    }
+}
+
+private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incognito: Bool, cleanup: (() -> Void)? = nil) {
+    Task {
+        if dismiss {
+            DispatchQueue.main.async {
+                dismissAllSheets(animated: true)
+            }
+        }
+        _ = await connectContactViaAddress(contact.contactId, incognito)
+        cleanup?()
+    }
+}
+
+private func connectViaLink(
+    _ connectionLink: String,
+    connectionPlan: ConnectionPlan?,
+    dismiss: Bool,
+    incognito: Bool,
+    cleanup: (() -> Void)?
+) {
+    Task {
+        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connReq: connectionLink) {
+            await MainActor.run {
+                ChatModel.shared.updateContactConnection(pcc)
+            }
+            let crt: ConnReqType
+            if let plan = connectionPlan {
+                crt = planToConnReqType(plan)
+            } else {
+                crt = connReqType
+            }
+            DispatchQueue.main.async {
+                if dismiss {
+                    dismissAllSheets(animated: true) {
+                        AlertManager.shared.showAlert(connReqSentAlert(crt))
+                    }
+                } else {
+                    AlertManager.shared.showAlert(connReqSentAlert(crt))
+                }
+            }
+        } else {
+            if dismiss {
+                DispatchQueue.main.async {
+                    dismissAllSheets(animated: true)
+                }
+            }
+        }
+        cleanup?()
+    }
+}
+
+func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
+    Task {
+        let m = ChatModel.shared
+        if let c = m.getContactChat(contact.contactId) {
+            DispatchQueue.main.async {
+                if dismiss {
+                    dismissAllSheets(animated: true) {
+                        m.chatId = c.id
+                        showAlreadyExistsAlert?()
+                    }
+                } else {
+                    m.chatId = c.id
+                    showAlreadyExistsAlert?()
+                }
+            }
+        }
+    }
+}
+
+func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
+    Task {
+        let m = ChatModel.shared
+        if let g = m.getGroupChat(groupInfo.groupId) {
+            DispatchQueue.main.async {
+                if dismiss {
+                    dismissAllSheets(animated: true) {
+                        m.chatId = g.id
+                        showAlreadyExistsAlert?()
+                    }
+                } else {
+                    m.chatId = g.id
+                    showAlreadyExistsAlert?()
+                }
+            }
+        }
+    }
+}
+
+func contactAlreadyConnectingAlert(_ contact: Contact) -> Alert {
+    mkAlert(
+        title: "Contact already exists",
+        message: "You are already connecting to \(contact.displayName)."
+    )
+}
+
+func groupAlreadyExistsAlert(_ groupInfo: GroupInfo) -> Alert {
+    mkAlert(
+        title: "Group already exists",
+        message: "You are already in group \(groupInfo.displayName)."
+    )
+}
+
+enum ConnReqType: Equatable {
+    case invitation
+    case contact
+    case groupLink
+
+    var connReqSentText: LocalizedStringKey {
+        switch self {
+        case .invitation: return "You will be connected when your contact's device is online, please wait or check later!"
+        case .contact: return "You will be connected when your connection request is accepted, please wait or check later!"
+        case .groupLink: return "You will be connected when group link host's device is online, please wait or check later!"
+        }
+    }
+}
+
+private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType {
+    switch connectionPlan {
+    case .invitationLink: return .invitation
+    case .contactAddress: return .contact
+    case .groupLink: return .groupLink
+    }
+}
+
+func connReqSentAlert(_ type: ConnReqType) -> Alert {
+    return mkAlert(
+        title: "Connection request sent!",
+        message: type.connReqSentText
+    )
+}
+
+#Preview {
+    NewChatView(
+        selection: .invite
+    )
+}
@@ -1,106 +0,0 @@
-//
-//  PasteToConnectView.swift
-//  SimpleX (iOS)
-//
-//  Created by Ian Davies on 22/04/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct PasteToConnectView: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @State private var connectionLink: String = ""
-    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
-    @FocusState private var linkEditorFocused: Bool
-    @State private var alert: PlanAndConnectAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
-
-    var body: some View {
-        List {
-            Text("Connect via link")
-                .font(.largeTitle)
-                .bold()
-                .fixedSize(horizontal: false, vertical: true)
-                .listRowBackground(Color.clear)
-                .listRowSeparator(.hidden)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                .onTapGesture { linkEditorFocused = false }
-
-            Section {
-                linkEditor()
-
-                Button {
-                    if connectionLink == "" {
-                        connectionLink = UIPasteboard.general.string ?? ""
-                    } else {
-                        connectionLink = ""
-                    }
-                } label: {
-                    if connectionLink == "" {
-                        settingsRow("doc.plaintext") { Text("Paste") }
-                    } else {
-                        settingsRow("multiply") { Text("Clear") }
-                    }
-                }
-                
-                Button {
-                    connect()
-                } label: {
-                    settingsRow("link") { Text("Connect") }
-                }
-                .disabled(connectionLink == "" || connectionLink.trimmingCharacters(in: .whitespaces).firstIndex(of: " ") != nil)
-                
-                IncognitoToggle(incognitoEnabled: $incognitoDefault)
-            } footer: {
-                VStack(alignment: .leading, spacing: 4) {
-                    sharedProfileInfo(incognitoDefault)
-                    Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
-                }
-                .frame(maxWidth: .infinity, alignment: .leading)
-            }
-        }
-        .alert(item: $alert) { a in planAndConnectAlert(a, dismiss: true) }
-        .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
-    }
-
-    private func linkEditor() -> some View {
-        ZStack {
-            Group {
-                if connectionLink.isEmpty {
-                    TextEditor(text: Binding.constant(NSLocalizedString("Paste the link you received to connect with your contact.", comment: "placeholder")))
-                        .foregroundColor(.secondary)
-                        .disabled(true)
-                }
-                TextEditor(text: $connectionLink)
-                    .onSubmit(connect)
-                    .textInputAutocapitalization(.never)
-                    .disableAutocorrection(true)
-                    .focused($linkEditorFocused)
-            }
-            .allowsTightening(false)
-            .padding(.horizontal, -5)
-            .padding(.top, -8)
-            .frame(height: 180, alignment: .topLeading)
-            .frame(maxWidth: .infinity, alignment: .leading)
-        }
-    }
-
-    private func connect() {
-        let link = connectionLink.trimmingCharacters(in: .whitespaces)
-        planAndConnect(
-            link,
-            showAlert: { alert = $0 },
-            showActionSheet: { sheet = $0 },
-            dismiss: true,
-            incognito: incognitoDefault
-        )
-    }
-}
-
-struct PasteToConnectView_Previews: PreviewProvider {
-    static var previews: some View {
-        PasteToConnectView()
-    }
-}
@@ -11,20 +11,12 @@ import CoreImage.CIFilterBuiltins

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

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

@@ -32,9 +24,10 @@ struct SimpleXLinkQRCode: View {
    let uri: String
    var withLogo: Bool = true
    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
+    var onShare: (() -> Void)? = nil

    var body: some View {
-        QRCode(uri: simplexChatLink(uri), withLogo: withLogo, tintColor: tintColor)
+        QRCode(uri: simplexChatLink(uri), withLogo: withLogo, tintColor: tintColor, onShare: onShare)
    }
 }

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

    var body: some View {
        ZStack {
@@ -70,18 +64,20 @@ struct QRCode: View {
                    }
                }
                .onAppear {
-                    makeScreenshotBinding = {
+                    makeScreenshotFunc = {
                        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)])
+                        onShare?()
+                    }
                }
                .frame(width: geo.size.width, height: geo.size.height)
            }
        }
-        .onTapGesture(perform: makeScreenshotBinding)
+        .onTapGesture(perform: makeScreenshotFunc)
        .onAppear {
-            image = image ?? generateImage(uri)?.replaceColor(UIColor.black, tintColor)
+            image = image ?? generateImage(uri, tintColor: tintColor)
        }
-
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
    }
 }

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

-private func generateImage(_ uri: String) -> UIImage? {
+private func generateImage(_ uri: String, tintColor: UIColor) -> 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)
+        return UIImage(cgImage: cgImage).replaceColor(UIColor.black, tintColor)
    }
    return nil
 }
@@ -1,79 +0,0 @@
-//
-//  ConnectContactView.swift
-//  SimpleX
-//
-//  Created by Evgeny Poberezkin on 29/01/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-import CodeScanner
-
-struct ScanToConnectView: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
-    @State private var alert: PlanAndConnectAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
-
-    var body: some View {
-        ScrollView {
-            VStack(alignment: .leading) {
-                Text("Scan QR code")
-                    .font(.largeTitle)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                    .padding(.vertical)
-
-                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
-                    .aspectRatio(1, contentMode: .fit)
-                    .cornerRadius(12)
-
-                IncognitoToggle(incognitoEnabled: $incognitoDefault)
-                    .padding(.horizontal)
-                    .padding(.vertical, 6)
-                    .background(
-                        RoundedRectangle(cornerRadius: 12, style: .continuous)
-                            .fill(Color(uiColor: .systemBackground))
-                    )
-                    .padding(.top)
-
-                VStack(alignment: .leading, spacing: 4) {
-                    sharedProfileInfo(incognitoDefault)
-                    Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
-                }
-                .frame(maxWidth: .infinity, alignment: .leading)
-                .font(.footnote)
-                .foregroundColor(.secondary)
-                .padding(.horizontal)
-            }
-            .padding()
-            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
-        }
-        .background(Color(.systemGroupedBackground))
-        .alert(item: $alert) { a in planAndConnectAlert(a, dismiss: true) }
-        .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
-    }
-
-    func processQRCode(_ resp: Result<ScanResult, ScanError>) {
-        switch resp {
-        case let .success(r):
-            planAndConnect(
-                r.string,
-                showAlert: { alert = $0 },
-                showActionSheet: { sheet = $0 },
-                dismiss: true,
-                incognito: incognitoDefault
-            )
-        case let .failure(e):
-            logger.error("ConnectContactView.processQRCode QR code error: \(e.localizedDescription)")
-            dismiss()
-        }
-    }
-}
-
-struct ConnectContactView_Previews: PreviewProvider {
-    static var previews: some View {
-        ScanToConnectView()
-    }
-}
@@ -11,12 +11,14 @@ import SimpleXChat

 enum UserProfileAlert: Identifiable {
    case duplicateUserError
+    case invalidDisplayNameError
    case createUserError(error: LocalizedStringKey)
    case invalidNameError(validName: String)

    var id: String {
        switch self {
        case .duplicateUserError: return "duplicateUserError"
+        case .invalidDisplayNameError: return "invalidDisplayNameError"
        case .createUserError: return "createUserError"
        case let .invalidNameError(validName): return "invalidNameError \(validName)"
        }
@@ -187,6 +189,12 @@ private func createProfile(_ displayName: String, showAlert: (UserProfileAlert)
            } else {
                showAlert(.duplicateUserError)
            }
+        case .chatCmdError(_, .error(.invalidDisplayName)):
+            if m.currentUser == nil {
+                AlertManager.shared.showAlert(invalidDisplayNameAlert)
+            } else {
+                showAlert(.invalidDisplayNameError)
+            }
        default:
            let err: LocalizedStringKey = "Error: \(responseError(error))"
            if m.currentUser == nil {
@@ -207,6 +215,7 @@ private func canCreateProfile(_ displayName: String) -> Bool {
 func userProfileAlert(_ alert: UserProfileAlert, _ displayName: Binding<String>) -> Alert {
    switch alert {
    case .duplicateUserError: return duplicateUserAlert
+    case .invalidDisplayNameError: return invalidDisplayNameAlert
    case let .createUserError(err): return creatUserErrorAlert(err)
    case let .invalidNameError(name): return createInvalidNameAlert(name, displayName)
    }
@@ -219,6 +228,13 @@ private var duplicateUserAlert: Alert {
    )
 }

+private var invalidDisplayNameAlert: Alert {
+    Alert(
+        title: Text("Invalid display name!"),
+        message: Text("This display name is invalid. Please choose another name.")
+    )
+}
+
 private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
    Alert(
        title: Text("Error creating profile!"),
@@ -81,11 +81,6 @@ 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))")
@@ -100,7 +95,7 @@ struct CreateSimpleXAddress: View {
            } label: {
                Text("Create SimpleX address").font(.title)
            }
-            Text("Your contacts in SimpleX will see it.\nYou can change it in Settings.")
+            Text("You can make it visible to your SimpleX contacts via Settings.")
                .multilineTextAlignment(.center)
                .font(.footnote)
                .padding(.horizontal, 32)
@@ -283,6 +283,37 @@ 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
@@ -16,12 +16,19 @@ struct ConnectDesktopView: View {
    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 = false
-    @AppStorage(DEFAULT_OFFER_REMOTE_MULTICAST) private var offerRemoteMulticast = true
+    @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)
@@ -67,9 +74,14 @@ struct ConnectDesktopView: View {

    var viewBody: some View {
        Group {
-            if let session = m.remoteCtrlSession {
+            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 {
@@ -81,16 +93,35 @@ struct ConnectDesktopView: View {
                    }
                case let .connected(rc, _): activeSessionView(session, rc)
                }
-            } else {
+            // 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()
            }
        }
@@ -134,12 +165,14 @@ struct ConnectDesktopView: View {
        .interactiveDismissDisabled(m.activeRemoteCtrl)
    }

-    private func connectDesktopView() -> some View {
+    private func connectDesktopView(showScanner: Bool = true) -> some View {
        List {
            Section("This device name") {
                devicesView()
            }
-            scanDesctopAddressView()
+            if showScanner {
+                scanDesctopAddressView()
+            }
            if developerTools {
                desktopAddressView()
            }
@@ -167,6 +200,56 @@ struct ConnectDesktopView: View {
        .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") {
@@ -191,7 +274,7 @@ struct ConnectDesktopView: View {
    }

    private func ctrlDeviceNameText(_ session: RemoteCtrlSession, _ rc: RemoteCtrlInfo?) -> Text {
-        var t = Text(rc?.deviceViewName ?? session.ctrlAppInfo.deviceName)
+        var t = Text(rc?.deviceViewName ?? session.ctrlAppInfo?.deviceName ?? "")
        if (rc == nil) {
            t = t + Text(" ") + Text("(new)").italic()
        }
@@ -199,8 +282,8 @@ struct ConnectDesktopView: View {
    }

    private func ctrlDeviceVersionText(_ session: RemoteCtrlSession) -> Text {
-        let v = session.ctrlAppInfo.appVersionRange.maxVersion
-        var t = Text("v\(v)")
+        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()
        }
@@ -249,7 +332,7 @@ struct ConnectDesktopView: View {

    private func scanDesctopAddressView() -> some View {
        Section("Scan QR code from desktop") {
-            CodeScannerView(codeTypes: [.qr], completion: processDesktopQRCode)
+            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processDesktopQRCode)
                .aspectRatio(1, contentMode: .fit)
                .cornerRadius(12)
                .listRowBackground(Color.clear)
@@ -301,7 +384,10 @@ struct ConnectDesktopView: View {

            Section("Linked desktop options") {
                Toggle("Verify connections", isOn: $confirmRemoteSessions)
-                Toggle("Discover on network", isOn: $connectRemoteViaMulticast).disabled(true)
+                Toggle("Discover via local network", isOn: $connectRemoteViaMulticast)
+                if connectRemoteViaMulticast {
+                    Toggle("Connect automatically", isOn: $connectRemoteViaMulticastAuto)
+                }
            }
        }
        .navigationTitle("Linked desktops")
@@ -335,10 +421,42 @@ struct ConnectDesktopView: View {
        }
    }

-    private func connectDesktopAddress(_ addr: String) {
+    private func findKnownDesktop() {
        Task {
            do {
-                let (rc_, ctrlAppInfo, v) = try await connectRemoteCtrl(desktopAddress: addr)
+                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(
@@ -380,11 +498,11 @@ struct ConnectDesktopView: View {
        }
    }

-    private func disconnectButton() -> some View {
+    private func disconnectButton(_ label: LocalizedStringKey = "Disconnect") -> some View {
        Button {
-            disconnectDesktop()
+            disconnectDesktop(.dismiss)
        } label: {
-            Label("Disconnect", systemImage: "multiply")
+            Label(label, systemImage: "multiply")
        }
    }

@@ -393,7 +511,11 @@ struct ConnectDesktopView: View {
            do {
                try await stopRemoteCtrl()
                await MainActor.run {
-                    switchToLocalSession()
+                    if case .connected = m.remoteCtrlSession?.sessionState {
+                        switchToLocalSession()
+                    } else {
+                        m.remoteCtrlSession = nil
+                    }
                    switch action {
                    case .back: dismiss()
                    case .dismiss: dismiss()
@@ -51,9 +51,9 @@ struct AdvancedNetworkSettings: View {
                    }
                    .disabled(currentNetCfg == NetCfg.proxyDefaults)

-                    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("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("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)
@@ -10,24 +10,23 @@ import SwiftUI

 struct IncognitoHelp: View {
    var body: some View {
-        VStack(alignment: .leading) {
+        List {
            Text("Incognito mode")
                .font(.largeTitle)
                .bold()
+                .fixedSize(horizontal: false, vertical: true)
                .padding(.vertical)
-            ScrollView {
-                VStack(alignment: .leading) {
-                    Group {
-                    Text("Incognito mode protects your privacy by using a new random profile for each contact.")
-                    Text("It allows having many anonymous connections without any shared data between them in a single chat profile.")
-                    Text("When you share an incognito profile with somebody, this profile will be used for the groups they invite you to.")
-                    }
-                    .padding(.bottom)
-                }
+                .listRowBackground(Color.clear)
+                .listRowSeparator(.hidden)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+            VStack(alignment: .leading, spacing: 18) {
+                Text("Incognito mode protects your privacy by using a new random profile for each contact.")
+                Text("It allows having many anonymous connections without any shared data between them in a single chat profile.")
+                Text("When you share an incognito profile with somebody, this profile will be used for the groups they invite you to.")
+                Text("Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).")
            }
+            .listRowBackground(Color.clear)
        }
-        .frame(maxWidth: .infinity)
-        .padding()
    }
 }

@@ -14,9 +14,6 @@ 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 {
@@ -88,13 +85,6 @@ 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)
    }
@@ -119,7 +109,7 @@ struct NotificationsView: View {

    private func ntfModeAlertTitle(_ mode: NotificationsMode) -> LocalizedStringKey {
        switch mode {
-        case .off: return "Turn off notifications?"
+        case .off: return "Use only local notifications?"
        case .periodic: return "Enable periodic notifications?"
        case .instant: return "Enable instant notifications?"
        }
@@ -63,7 +63,6 @@ struct PreferencesView: View {

    private func featureFooter(_ feature: ChatFeature, _ allowFeature: Binding<FeatureAllowed>) -> some View {
        Text(feature.allowDescription(allowFeature.wrappedValue))
-            .frame(height: 36, alignment: .topLeading)
    }

    private func savePreferences() {
@@ -467,6 +467,7 @@ struct SimplexLockView: View {
            switch a {
            case .enableAuth:
                SetAppPasscodeView {
+                    m.contentViewAccessAuthenticated = true
                    laLockDelay = 30
                    prefPerformLA = true
                    showChangePassword = true
@@ -490,14 +491,23 @@ struct SimplexLockView: View {
                    showLAAlert(.laPasscodeNotChangedAlert)
                }
            case .enableSelfDestruct:
-                SetAppPasscodeView(passcodeKeychain: kcSelfDestructPassword, title: "Set passcode", reason: NSLocalizedString("Enable self-destruct passcode", comment: "set passcode view")) {
+                SetAppPasscodeView(
+                    passcodeKeychain: kcSelfDestructPassword,
+                    prohibitedPasscodeKeychain: kcAppPassword,
+                    title: "Set passcode",
+                    reason: NSLocalizedString("Enable self-destruct passcode", comment: "set passcode view")
+                ) {
                    updateSelfDestruct()
                    showLAAlert(.laSelfDestructPasscodeSetAlert)
                } cancel: {
                    revertSelfDestruct()
                }
            case .changeSelfDestructPasscode:
-                SetAppPasscodeView(passcodeKeychain: kcSelfDestructPassword, reason: NSLocalizedString("Change self-destruct passcode", comment: "set passcode view")) {
+                SetAppPasscodeView(
+                    passcodeKeychain: kcSelfDestructPassword,
+                    prohibitedPasscodeKeychain: kcAppPassword,
+                    reason: NSLocalizedString("Change self-destruct passcode", comment: "set passcode view")
+                ) {
                    showLAAlert(.laSelfDestructPasscodeChangedAlert)
                } cancel: {
                    showLAAlert(.laPasscodeNotChangedAlert)
@@ -619,6 +629,7 @@ 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], completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
                .aspectRatio(1, contentMode: .fit)
                .cornerRadius(12)
                .padding(.top)
@@ -56,7 +56,7 @@ 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_OFFER_REMOTE_MULTICAST = "offerRemoteMulticast"
+let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "connectRemoteViaMulticastAuto"

 let appDefaults: [String: Any] = [
    DEFAULT_SHOW_LA_NOTICE: false,
@@ -91,10 +91,16 @@ let appDefaults: [String: Any] = [
    DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME: 300,
    DEFAULT_SHOW_UNREAD_AND_FAVORITES: false,
    DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
-    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: false,
-    DEFAULT_OFFER_REMOTE_MULTICAST: true
+    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
+    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
 ]

+// not used anymore
+enum ConnectViaLinkTab: String {
+    case scan
+    case paste
+}
+
 enum SimpleXLinkMode: String, Identifiable {
    case description
    case full
@@ -190,7 +190,8 @@ struct UserAddressView: View {

    @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
        Section {
-            MutableQRCode(uri: Binding.constant(simplexChatLink(userAddress.connReqContact)))
+            SimpleXLinkQRCode(uri: userAddress.connReqContact)
+                .id("simplex-contact-address-qrcode-\(userAddress.connReqContact)")
            shareQRCodeButton(userAddress)
            if MFMailComposeViewController.canSendMail() {
                shareViaEmailButton(userAddress)
@@ -120,8 +120,10 @@ struct UserProfile: View {
            }
        }
        .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) {
-                didSelectItem in showImagePicker = false
+            LibraryImagePicker(image: $chosenImage) { _ in
+                await MainActor.run {
+                    showImagePicker = false
+                }
            }
        }
        .onChange(of: chosenImage) { image in
@@ -89,6 +89,7 @@
      </trans-unit>
      <trans-unit id="%@ and %@" xml:space="preserve">
        <source>%@ and %@</source>
+        <target>%@ a %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%@ and %@ connected" xml:space="preserve">
@@ -103,6 +104,7 @@
      </trans-unit>
      <trans-unit id="%@ connected" xml:space="preserve">
        <source>%@ connected</source>
+        <target>%@ připojen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -303,14 +305,17 @@
        <target>)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve">
+        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve">
        <source>**Add new contact**: to create your one-time QR Code or link for your contact.</source>
        <target>**Přidat nový kontakt**: pro vytvoření jednorázového QR kódu nebo odkazu pro váš kontakt.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve">
-        <source>**Create link / QR code** for your contact to use.</source>
-        <target>**Vytvořte odkaz / QR kód** pro váš kontakt.</target>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve">
+        <source>**Create group**: to create a new group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve">
@@ -323,11 +328,6 @@
        <target>**Nejsoukromější**: nepoužívejte server oznámení SimpleX Chat, pravidelně kontrolujte zprávy na pozadí (závisí na tom, jak často aplikaci používáte).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve">
-        <source>**Paste received link** or open it in the browser and tap **Open in mobile app**.</source>
-        <target>**Vložte přijatý odkaz** nebo jej otevřete v prohlížeči a klepněte na **Otevřít v mobilní aplikaci**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
        <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
        <target>**Upozornění**: Pokud heslo ztratíte, NEBUDETE jej moci obnovit ani změnit.</target>
@@ -338,11 +338,6 @@
        <target>**Doporučeno**: Token zařízení a oznámení se odesílají na oznamovací server SimpleX Chat, ale nikoli obsah, velikost nebo od koho jsou zprávy.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Scan QR code**: to connect to your contact in person or via video call." xml:space="preserve">
-        <source>**Scan QR code**: to connect to your contact in person or via video call.</source>
-        <target>** Naskenujte QR kód**: pro připojení ke kontaktu osobně nebo prostřednictvím videohovoru.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
        <source>**Warning**: Instant push notifications require passphrase saved in Keychain.</source>
        <target>**Upozornění**: Okamžitě doručovaná oznámení vyžadují přístupové heslo uložené v Klíčence.</target>
@@ -386,6 +381,12 @@
 - a více!</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.
@@ -434,11 +435,6 @@
        <target>1 týden</target>
        <note>time interval</note>
      </trans-unit>
-      <trans-unit id="1-time link" xml:space="preserve">
-        <source>1-time link</source>
-        <target>Jednorázový odkaz</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="5 minutes" xml:space="preserve">
        <source>5 minutes</source>
        <target>5 minut</target>
@@ -554,6 +550,10 @@
        <target>Přidejte adresu do svého profilu, aby ji vaše kontakty mohly sdílet s dalšími lidmi. Aktualizace profilu bude zaslána vašim kontaktům.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve">
+        <source>Add contact</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Add preset servers" xml:space="preserve">
        <source>Add preset servers</source>
        <target>Přidejte přednastavené servery</target>
@@ -658,9 +658,9 @@
        <target>Povolte mizící zprávy, pouze pokud vám to váš kontakt dovolí.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you." xml:space="preserve">
-        <source>Allow irreversible message deletion only if your contact allows it to you.</source>
-        <target>Povolte nevratné smazání zprávy pouze v případě, že vám to váš kontakt dovolí.</target>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
+        <target>Povolte nevratné smazání zprávy pouze v případě, že vám to váš kontakt dovolí. (24 hodin)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve">
@@ -683,9 +683,9 @@
        <target>Povolit odesílání mizících zpráv.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow to irreversibly delete sent messages.</source>
-        <target>Povolit nevratné smazání odeslaných zpráv.</target>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
+        <target>Povolit nevratné smazání odeslaných zpráv. (24 hodin)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -718,9 +718,9 @@
        <target>Povolte svým kontaktům vám volat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow your contacts to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow your contacts to irreversibly delete sent messages.</source>
-        <target>Umožněte svým kontaktům nevratně odstranit odeslané zprávy.</target>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
+        <target>Umožněte svým kontaktům nevratně odstranit odeslané zprávy. (24 hodin)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve">
@@ -880,6 +880,10 @@
        <target>Špatný hash zprávy</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>Lepší zprávy</target>
@@ -889,6 +893,10 @@
        <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>
@@ -902,9 +910,9 @@
        <target>Vy i váš kontakt můžete přidávat reakce na zprávy.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Both you and your contact can irreversibly delete sent messages." xml:space="preserve">
-        <source>Both you and your contact can irreversibly delete sent messages.</source>
-        <target>Vy i váš kontakt můžete nevratně mazat odeslané zprávy.</target>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
+        <target>Vy i váš kontakt můžete nevratně mazat odeslané zprávy. (24 hodin)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Both you and your contact can make calls." xml:space="preserve">
@@ -942,6 +950,10 @@
        <target>Hovory</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve">
+        <source>Camera not available</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Can't delete user profile!" xml:space="preserve">
        <source>Can't delete user profile!</source>
        <target>Nemohu smazat uživatelský profil!</target>
@@ -1058,6 +1070,10 @@
        <target>Chat je zastaven</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve">
+        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat preferences" xml:space="preserve">
        <source>Chat preferences</source>
        <target>Předvolby chatu</target>
@@ -1158,6 +1174,10 @@
        <target>Připojit</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Connect automatically" xml:space="preserve">
+        <source>Connect automatically</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
        <source>Connect incognito</source>
        <target>Spojit se inkognito</target>
@@ -1190,11 +1210,6 @@ This is your own one-time link!</source>
        <target>Připojte se prostřednictvím odkazu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via link / QR code" xml:space="preserve">
-        <source>Connect via link / QR code</source>
-        <target>Připojit se prostřednictvím odkazu / QR kódu</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connect via one-time link" xml:space="preserve">
        <source>Connect via one-time link</source>
        <target>Připojit se jednorázovým odkazem</target>
@@ -1329,6 +1344,10 @@ This is your own one-time link!</source>
        <target>Vytvořit SimpleX adresu</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>Vytvořit adresu, aby se s vámi lidé mohli spojit.</target>
@@ -1358,11 +1377,6 @@ This is your own one-time link!</source>
        <target>Vytvořit nový profil v [desktop app](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">
-        <source>Create one-time invitation link</source>
-        <target>Vytvořit jednorázovou pozvánku</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>
@@ -1387,6 +1401,10 @@ This is your own one-time link!</source>
        <target>Vytvořeno na %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Creating link…" xml:space="preserve">
+        <source>Creating link…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Current Passcode" xml:space="preserve">
        <source>Current Passcode</source>
        <target>Aktuální heslo</target>
@@ -1844,8 +1862,8 @@ This cannot be undone!</source>
        <target>Objevte a připojte skupiny</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Discover via local network" xml:space="preserve">
+        <source>Discover via local network</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1858,6 +1876,10 @@ This cannot be undone!</source>
        <target>Udělat později</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not send history to new members." xml:space="preserve">
+        <source>Do not send history to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Nevytvářet adresu</target>
@@ -1928,6 +1950,10 @@ This cannot be undone!</source>
        <target>Povolit automatické mazání zpráv?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enable camera access" xml:space="preserve">
+        <source>Enable camera access</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
        <target>Povolit pro všechny</target>
@@ -1993,6 +2019,10 @@ This cannot be undone!</source>
        <target>Šifrovaná zpráva nebo jiná událost</target>
        <note>notification</note>
      </trans-unit>
+      <trans-unit id="Encrypted message: app is stopped" xml:space="preserve">
+        <source>Encrypted message: app is stopped</source>
+        <note>notification</note>
+      </trans-unit>
      <trans-unit id="Encrypted message: database error" xml:space="preserve">
        <source>Encrypted message: database error</source>
        <target>Šifrovaná zpráva: chyba databáze</target>
@@ -2218,6 +2248,10 @@ This cannot be undone!</source>
        <target>Chyba načítání %@ serverů</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error opening chat" xml:space="preserve">
+        <source>Error opening chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Chyba při příjmu souboru</target>
@@ -2258,6 +2292,10 @@ This cannot be undone!</source>
        <target>Chyba ukládání hesla uživatele</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error scanning code: %@" xml:space="preserve">
+        <source>Error scanning code: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error sending email" xml:space="preserve">
        <source>Error sending email</source>
        <target>Chyba odesílání e-mailu</target>
@@ -2382,6 +2420,10 @@ This cannot be undone!</source>
        <target>Rychle a bez čekání, než bude odesílatel online!</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>Oblíbené</target>
@@ -2477,6 +2519,10 @@ This cannot be undone!</source>
        <target>Pro konzoli</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>Francouzské rozhraní</target>
@@ -2574,9 +2620,9 @@ This cannot be undone!</source>
        <target>Členové skupin mohou přidávat reakce na zprávy.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group members can irreversibly delete sent messages." xml:space="preserve">
-        <source>Group members can irreversibly delete sent messages.</source>
-        <target>Členové skupiny mohou nevratně mazat odeslané zprávy.</target>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Členové skupiny mohou nevratně mazat odeslané zprávy. (24 hodin)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group members can send direct messages." xml:space="preserve">
@@ -2684,6 +2730,10 @@ This cannot be undone!</source>
        <target>Historie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="History is not sent to new members." xml:space="preserve">
+        <source>History is not sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
        <target>Jak SimpleX funguje</target>
@@ -2719,11 +2769,6 @@ This cannot be undone!</source>
        <target>Pokud se nemůžete setkat osobně, zobrazte QR kód ve videohovoru nebo sdílejte odkaz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link." xml:space="preserve">
-        <source>If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.</source>
-        <target>Pokud se nemůžete setkat osobně, můžete **naskenovat QR kód během videohovoru**, nebo váš kontakt může sdílet odkaz na pozvánku.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="If you enter this passcode when opening the app, all app data will be irreversibly removed!" xml:space="preserve">
        <source>If you enter this passcode when opening the app, all app data will be irreversibly removed!</source>
        <target>Pokud tento přístupový kód zadáte při otevření aplikace, všechna data budou nenávratně smazána!</target>
@@ -2799,6 +2844,10 @@ This cannot be undone!</source>
        <target>Inkognito</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>Režim inkognito</target>
@@ -2875,15 +2924,31 @@ This cannot be undone!</source>
        <target>Rozhranní</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid QR code" xml:space="preserve">
+        <source>Invalid QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid connection link" xml:space="preserve">
        <source>Invalid connection link</source>
        <target>Neplatný odkaz na spojení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid display name!" xml:space="preserve">
+        <source>Invalid display name!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Invalid link" xml:space="preserve">
+        <source>Invalid link</source>
+        <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 response" xml:space="preserve">
+        <source>Invalid response</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>Neplatná adresa serveru!</target>
@@ -2998,10 +3063,18 @@ This is your link for group %@!</source>
        <target>Připojování ke skupině</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep" xml:space="preserve">
+        <source>Keep</source>
+        <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 unused invitation?" xml:space="preserve">
+        <source>Keep unused invitation?</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>Zachovat vaše připojení</target>
@@ -3062,6 +3135,10 @@ This is your link for group %@!</source>
        <target>Omezení</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>
@@ -3080,6 +3157,11 @@ This is your link for group %@!</source>
        <target>Živé zprávy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Local" xml:space="preserve">
+        <source>Local</source>
+        <target>Místní</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Local name" xml:space="preserve">
        <source>Local name</source>
        <target>Místní název</target>
@@ -3319,6 +3401,10 @@ This is your link for group %@!</source>
        <target>Nové heslo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New chat" xml:space="preserve">
+        <source>New chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New contact request" xml:space="preserve">
        <source>New contact request</source>
        <target>Žádost o nový kontakt</target>
@@ -3419,6 +3505,10 @@ This is your link for group %@!</source>
        <target>Žádné přijaté ani odeslané soubory</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>Oznámení</target>
@@ -3438,16 +3528,15 @@ This is your link for group %@!</source>
 - zakázat členy (role "pozorovatel")</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="OK" xml:space="preserve">
+        <source>OK</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Off" xml:space="preserve">
        <source>Off</source>
        <target>Vypnout</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Off (Local)" xml:space="preserve">
-        <source>Off (Local)</source>
-        <target>Vypnuto (místní)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
@@ -3508,9 +3597,9 @@ This is your link for group %@!</source>
        <target>Reakce na zprávy můžete přidávat pouze vy.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion)." xml:space="preserve">
-        <source>Only you can irreversibly delete messages (your contact can mark them for deletion).</source>
-        <target>Nevratně mazat zprávy můžete pouze vy (váš kontakt je může označit ke smazání).</target>
+      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)</source>
+        <target>Nevratně mazat zprávy můžete pouze vy (váš kontakt je může označit ke smazání). (24 hodin)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only you can make calls." xml:space="preserve">
@@ -3533,9 +3622,9 @@ This is your link for group %@!</source>
        <target>Reakce na zprávy může přidávat pouze váš kontakt.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion)." xml:space="preserve">
-        <source>Only your contact can irreversibly delete messages (you can mark them for deletion).</source>
-        <target>Nevratně mazat zprávy může pouze váš kontakt (vy je můžete označit ke smazání).</target>
+      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)</source>
+        <target>Nevratně mazat zprávy může pouze váš kontakt (vy je můžete označit ke smazání). (24 hodin)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only your contact can make calls." xml:space="preserve">
@@ -3587,9 +3676,16 @@ This is your link for group %@!</source>
        <target>Protokol a kód s otevřeným zdrojovým kódem - servery může provozovat kdokoli.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Opening database…" xml:space="preserve">
-        <source>Opening database…</source>
-        <target>Otvírání databáze…</target>
+      <trans-unit id="Opening app…" xml:space="preserve">
+        <source>Opening app…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or scan QR code" xml:space="preserve">
+        <source>Or scan QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or show this code" xml:space="preserve">
+        <source>Or show this code</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
@@ -3632,11 +3728,6 @@ This is your link for group %@!</source>
        <target>Heslo k zobrazení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste" xml:space="preserve">
-        <source>Paste</source>
-        <target>Vložit</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>
@@ -3646,16 +3737,10 @@ This is your link for group %@!</source>
        <target>Vložit obrázek</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste received link" xml:space="preserve">
-        <source>Paste received link</source>
-        <target>Vložení přijatého odkazu</target>
+      <trans-unit id="Paste the link you received" xml:space="preserve">
+        <source>Paste the link you received</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received to connect with your contact.</source>
-        <target>Vložte odkaz, který jste obdrželi, do pole níže a spojte se se svým kontaktem.</target>
-        <note>placeholder</note>
-      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
        <target>Lidé se s vámi mohou spojit pouze prostřednictvím odkazů, které sdílíte.</target>
@@ -3691,6 +3776,11 @@ This is your link for group %@!</source>
        <target>Zkontrolujte prosím nastavení své i svého kontaktu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
+        <source>Please contact developers.
+Error: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Please contact group admin." xml:space="preserve">
        <source>Please contact group admin.</source>
        <target>Kontaktujte prosím správce skupiny.</target>
@@ -3894,6 +3984,10 @@ This is your link for group %@!</source>
        <target>Další informace naleznete v [Uživatelské příručce](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode)." xml:space="preserve">
+        <source>Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends)." xml:space="preserve">
        <source>Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</source>
        <target>Přečtěte si více v [Uživatelské příručce](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</target>
@@ -4102,6 +4196,10 @@ This is your link for group %@!</source>
        <target>Chyba obnovení databáze</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Retry" xml:space="preserve">
+        <source>Retry</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Reveal" xml:space="preserve">
        <source>Reveal</source>
        <target>Odhalit</target>
@@ -4256,6 +4354,10 @@ This is your link for group %@!</source>
        <target>Hledat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Search or paste SimpleX link" xml:space="preserve">
+        <source>Search or paste SimpleX link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Secure queue" xml:space="preserve">
        <source>Secure queue</source>
        <target>Zabezpečit frontu</target>
@@ -4361,6 +4463,10 @@ This is your link for group %@!</source>
        <target>Odeslat je z galerie nebo vlastní klávesnice.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
+        <source>Send up to 100 last messages to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Odesílatel zrušil přenos souboru.</target>
@@ -4530,9 +4636,8 @@ This is your link for group %@!</source>
        <target>Sdílet odkaz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Share one-time invitation link" xml:space="preserve">
-        <source>Share one-time invitation link</source>
-        <target>Jednorázový zvací odkaz</target>
+      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
+        <source>Share this 1-time invite link</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share with contacts" xml:space="preserve">
@@ -4655,16 +4760,15 @@ This is your link for group %@!</source>
        <target>Někdo</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="Start a new chat" xml:space="preserve">
-        <source>Start a new chat</source>
-        <target>Začít nový chat</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
        <source>Start chat</source>
        <target>Začít chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Start chat?" xml:space="preserve">
+        <source>Start chat?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Start migration" xml:space="preserve">
        <source>Start migration</source>
        <target>Zahájit přenesení</target>
@@ -4789,6 +4893,14 @@ This is your link for group %@!</source>
        <target>Klepnutím se připojíte inkognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tap to paste link" xml:space="preserve">
+        <source>Tap to paste link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Tap to scan" xml:space="preserve">
+        <source>Tap to scan</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Tap to start a new chat" xml:space="preserve">
        <source>Tap to start a new chat</source>
        <target>Klepnutím na zahájíte nový chat</target>
@@ -4851,6 +4963,10 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
        <target>Pokus o změnu přístupové fráze databáze nebyl dokončen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The code you scanned is not a SimpleX link QR code." xml:space="preserve">
+        <source>The code you scanned is not a SimpleX link QR code.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
        <source>The connection you accepted will be cancelled!</source>
        <target>Připojení, které jste přijali, bude zrušeno!</target>
@@ -4916,6 +5032,10 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
        <target>Servery pro nová připojení vašeho aktuálního chat profilu **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The text you pasted is not a SimpleX link." xml:space="preserve">
+        <source>The text you pasted is not a SimpleX link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Theme" xml:space="preserve">
        <source>Theme</source>
        <target>Téma</target>
@@ -4960,6 +5080,10 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
        <source>This device name</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
+        <source>This display name is invalid. Please choose another 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>Tato skupina má více než %lld členů, potvrzení o doručení nejsou odesílány.</target>
@@ -4993,6 +5117,10 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
        <target>Pro připojení může váš kontakt naskenovat QR kód, nebo použít odkaz v aplikaci.</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>Vytvoření nového připojení</target>
@@ -5060,11 +5188,6 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
        <target>Vypnout</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Turn off notifications?" xml:space="preserve">
-        <source>Turn off notifications?</source>
-        <target>Vypnout upozornění?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Turn on" xml:space="preserve">
        <source>Turn on</source>
        <target>Zapnout</target>
@@ -5177,6 +5300,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Nepřečtený</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
+        <source>Up to 100 last messages are sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Update" xml:space="preserve">
        <source>Update</source>
        <target>Aktualizovat</target>
@@ -5261,6 +5388,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Použít nový inkognito profil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use only local notifications?" xml:space="preserve">
+        <source>Use only local notifications?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Použít server</target>
@@ -5308,6 +5439,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Prostřednictvím prohlížeče</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>Videohovor</target>
@@ -5333,6 +5468,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Zobrazení bezpečnostního kódu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Visible history" xml:space="preserve">
+        <source>Visible history</source>
+        <note>chat feature</note>
+      </trans-unit>
      <trans-unit id="Voice messages" xml:space="preserve">
        <source>Voice messages</source>
        <target>Hlasové zprávy</target>
@@ -5358,6 +5497,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Hlasová zpráva…</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>Čekání na soubor</target>
@@ -5502,11 +5645,6 @@ Repeat join request?</source>
        <target>Můžete přijímat hovory z obrazovky zámku, bez ověření zařízení a aplikace.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button." xml:space="preserve">
-        <source>You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.</source>
-        <target>Můžete se také připojit kliknutím na odkaz. Pokud se otevře v prohlížeči, klikněte na tlačítko **Otevřít v mobilní aplikaci**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You can create it later" xml:space="preserve">
        <source>You can create it later</source>
        <target>Můžete vytvořit později</target>
@@ -5527,6 +5665,10 @@ Repeat join request?</source>
        <target>Profil uživatele můžete skrýt nebo ztlumit - přejeďte prstem doprava.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
+        <source>You can make it visible to your SimpleX contacts via Settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can now send messages to %@" xml:space="preserve">
        <source>You can now send messages to %@</source>
        <target>Nyní můžete posílat zprávy %@</target>
@@ -5567,6 +5709,10 @@ Repeat join request?</source>
        <target>K formátování zpráv můžete použít markdown:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can view invitation link again in connection details." xml:space="preserve">
+        <source>You can view invitation link again in connection details.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can't send messages!" xml:space="preserve">
        <source>You can't send messages!</source>
        <target>Nemůžete posílat zprávy!</target>
@@ -5751,13 +5897,6 @@ Toto připojení můžete zrušit a kontakt odebrat (a zkusit to později s nov
        <target>Vaše kontakty mohou povolit úplné mazání zpráv.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your contacts in SimpleX will see it.&#10;You can change it in Settings." xml:space="preserve">
-        <source>Your contacts in SimpleX will see it.
-You can change it in Settings.</source>
-        <target>Vaše kontakty v SimpleX ji uvidí.
-Můžete ji změnit v Nastavení.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your contacts will remain connected." xml:space="preserve">
        <source>Your contacts will remain connected.</source>
        <target>Vaše kontakty zůstanou připojeny.</target>
@@ -5888,6 +6027,10 @@ Servery SimpleX nevidí váš profil.</target>
        <target>zvukový hovor (nešifrovaný 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>špatné ID zprávy</target>
@@ -31,48 +31,59 @@ Available in v5.1</source>
        <source> (</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id=" (can be copied)" xml:space="preserve">
+      <trans-unit id=" (can be copied)" xml:space="preserve" approved="no">
        <source> (can be copied)</source>
+        <target state="translated"> (μπορεί να αντιγραφή)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="!1 colored!" xml:space="preserve">
+      <trans-unit id="!1 colored!" xml:space="preserve" approved="no">
        <source>!1 colored!</source>
+        <target state="translated">!1 έγχρωμο!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="#secret#" xml:space="preserve">
+      <trans-unit id="#secret#" xml:space="preserve" approved="no">
        <source>#secret#</source>
+        <target state="translated">#μυστικό#</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@" xml:space="preserve">
+      <trans-unit id="%@" xml:space="preserve" approved="no">
        <source>%@</source>
+        <target state="translated">%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ %@" xml:space="preserve">
+      <trans-unit id="%@ %@" xml:space="preserve" approved="no">
        <source>%@ %@</source>
+        <target state="translated">%@ %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ / %@" xml:space="preserve">
+      <trans-unit id="%@ / %@" xml:space="preserve" approved="no">
        <source>%@ / %@</source>
+        <target state="translated">%@ / %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ is connected!" xml:space="preserve">
+      <trans-unit id="%@ is connected!" xml:space="preserve" approved="no">
        <source>%@ is connected!</source>
+        <target state="translated">%@ είναι συνδεδεμένο!</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="%@ is not verified" xml:space="preserve">
+      <trans-unit id="%@ is not verified" xml:space="preserve" approved="no">
        <source>%@ is not verified</source>
+        <target state="translated">%@ δεν είναι επαληθευμένο</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ is verified" xml:space="preserve">
+      <trans-unit id="%@ is verified" xml:space="preserve" approved="no">
        <source>%@ is verified</source>
+        <target state="translated">%@ είναι επαληθευμένο</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ servers" xml:space="preserve">
+      <trans-unit id="%@ servers" xml:space="preserve" approved="no">
        <source>%@ servers</source>
+        <target state="translated">%@ διακομιστές</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%@ wants to connect!" xml:space="preserve">
+      <trans-unit id="%@ wants to connect!" xml:space="preserve" approved="no">
        <source>%@ wants to connect!</source>
+        <target state="translated">%@ θέλει να συνδεθεί!</target>
        <note>notification title</note>
      </trans-unit>
      <trans-unit id="%d days" xml:space="preserve">
@@ -4162,6 +4173,66 @@ SimpleX servers cannot see your profile.</source>
        <source>\~strike~</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ connected" xml:space="preserve" approved="no">
+        <source>%@ connected</source>
+        <target state="translated">%@ συνδεδεμένο</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve" approved="no">
+        <source># %@</source>
+        <target state="translated"># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="%@ and %@" xml:space="preserve" approved="no">
+        <source>%@ and %@</source>
+        <target state="translated">%@ και %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@ at %@:" xml:space="preserve" approved="no">
+        <source>%1$@ at %2$@:</source>
+        <target state="translated">%1$@ στις %2$@:</target>
+        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve" approved="no">
+        <source>## History</source>
+        <target state="translated">## Ιστορικό</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve" approved="no">
+        <source>## In reply to</source>
+        <target state="translated">## Ως απαντηση σε</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@ (current)" xml:space="preserve" approved="no">
+        <source>%@ (current)</source>
+        <target state="translated">%@ (τωρινό)</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@ (current):" xml:space="preserve" approved="no">
+        <source>%@ (current):</source>
+        <target state="translated">%@ (τωρινό):</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve" approved="no">
+        <source>%@ and %@ connected</source>
+        <target state="translated">%@ και %@ συνδεδεμένο</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@:" xml:space="preserve" approved="no">
+        <source>%@:</source>
+        <target state="translated">%@:</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld members" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld members</source>
+        <target state="translated">%@, %@ και %lld μέλη</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld other members connected</source>
+        <target state="translated">%@, %@ και %lld άλλα μέλη συνδέθηκαν</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="el" datatype="plaintext">
@@ -312,14 +312,19 @@
        <target>)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve">
+        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
+        <target>**Add contact**: to create a new invitation link, or connect via a link you received.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve">
        <source>**Add new contact**: to create your one-time QR Code or link for your contact.</source>
        <target>**Add new contact**: to create your one-time QR Code or link for your contact.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve">
-        <source>**Create link / QR code** for your contact to use.</source>
-        <target>**Create link / QR code** for your contact to use.</target>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve">
+        <source>**Create group**: to create a new group.</source>
+        <target>**Create group**: to create a new group.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve">
@@ -332,11 +337,6 @@
        <target>**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve">
-        <source>**Paste received link** or open it in the browser and tap **Open in mobile app**.</source>
-        <target>**Paste received link** or open it in the browser and tap **Open in mobile app**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
        <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
        <target>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</target>
@@ -347,11 +347,6 @@
        <target>**Recommended**: device token and notifications are sent to SimpleX Chat notification server, but not the message content, size or who it is from.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Scan QR code**: to connect to your contact in person or via video call." xml:space="preserve">
-        <source>**Scan QR code**: to connect to your contact in person or via video call.</source>
-        <target>**Scan QR code**: to connect to your contact in person or via video call.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
        <source>**Warning**: Instant push notifications require passphrase saved in Keychain.</source>
        <target>**Warning**: Instant push notifications require passphrase saved in Keychain.</target>
@@ -392,6 +387,15 @@
 - and more!</source>
        <target>- more stable message delivery.
 - a bit better groups.
+- and more!</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>
+        <target>- optionally notify deleted contacts.
+- profile names with spaces.
 - and more!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -444,11 +448,6 @@
        <target>1 week</target>
        <note>time interval</note>
      </trans-unit>
-      <trans-unit id="1-time link" xml:space="preserve">
-        <source>1-time link</source>
-        <target>1-time link</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="5 minutes" xml:space="preserve">
        <source>5 minutes</source>
        <target>5 minutes</target>
@@ -564,6 +563,11 @@
        <target>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve">
+        <source>Add contact</source>
+        <target>Add contact</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Add preset servers" xml:space="preserve">
        <source>Add preset servers</source>
        <target>Add preset servers</target>
@@ -669,9 +673,9 @@
        <target>Allow disappearing messages only if your contact allows it to you.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you." xml:space="preserve">
-        <source>Allow irreversible message deletion only if your contact allows it to you.</source>
-        <target>Allow irreversible message deletion only if your contact allows it to you.</target>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
+        <target>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve">
@@ -694,9 +698,9 @@
        <target>Allow sending disappearing messages.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow to irreversibly delete sent messages.</source>
-        <target>Allow to irreversibly delete sent messages.</target>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
+        <target>Allow to irreversibly delete sent messages. (24 hours)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -729,9 +733,9 @@
        <target>Allow your contacts to call you.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow your contacts to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow your contacts to irreversibly delete sent messages.</source>
-        <target>Allow your contacts to irreversibly delete sent messages.</target>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
+        <target>Allow your contacts to irreversibly delete sent messages. (24 hours)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve">
@@ -894,6 +898,11 @@
        <target>Bad message hash</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better groups" xml:space="preserve">
+        <source>Better groups</source>
+        <target>Better groups</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Better messages</target>
@@ -904,6 +913,11 @@
        <target>Block</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Block group members" xml:space="preserve">
+        <source>Block group members</source>
+        <target>Block group members</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Block member" xml:space="preserve">
        <source>Block member</source>
        <target>Block member</target>
@@ -919,9 +933,9 @@
        <target>Both you and your contact can add message reactions.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Both you and your contact can irreversibly delete sent messages." xml:space="preserve">
-        <source>Both you and your contact can irreversibly delete sent messages.</source>
-        <target>Both you and your contact can irreversibly delete sent messages.</target>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
+        <target>Both you and your contact can irreversibly delete sent messages. (24 hours)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Both you and your contact can make calls." xml:space="preserve">
@@ -959,6 +973,11 @@
        <target>Calls</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve">
+        <source>Camera not available</source>
+        <target>Camera not available</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Can't delete user profile!" xml:space="preserve">
        <source>Can't delete user profile!</source>
        <target>Can't delete user profile!</target>
@@ -1075,6 +1094,11 @@
        <target>Chat is stopped</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve">
+        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
+        <target>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat preferences" xml:space="preserve">
        <source>Chat preferences</source>
        <target>Chat preferences</target>
@@ -1175,6 +1199,11 @@
        <target>Connect</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Connect automatically" xml:space="preserve">
+        <source>Connect automatically</source>
+        <target>Connect automatically</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
        <source>Connect incognito</source>
        <target>Connect incognito</target>
@@ -1214,11 +1243,6 @@ This is your own one-time link!</target>
        <target>Connect via link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via link / QR code" xml:space="preserve">
-        <source>Connect via link / QR code</source>
-        <target>Connect via link / QR code</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connect via one-time link" xml:space="preserve">
        <source>Connect via one-time link</source>
        <target>Connect via one-time link</target>
@@ -1359,6 +1383,11 @@ This is your own one-time link!</target>
        <target>Create SimpleX address</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>
+        <target>Create a group using a random profile.</target>
+        <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>Create an address to let people connect with you.</target>
@@ -1389,11 +1418,6 @@ This is your own one-time link!</target>
        <target>Create new profile in [desktop app](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">
-        <source>Create one-time invitation link</source>
-        <target>Create one-time invitation link</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Create profile" xml:space="preserve">
        <source>Create profile</source>
        <target>Create profile</target>
@@ -1419,6 +1443,11 @@ This is your own one-time link!</target>
        <target>Created on %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Creating link…" xml:space="preserve">
+        <source>Creating link…</source>
+        <target>Creating link…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Current Passcode" xml:space="preserve">
        <source>Current Passcode</source>
        <target>Current Passcode</target>
@@ -1884,9 +1913,9 @@ This cannot be undone!</target>
        <target>Discover and join groups</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
-        <target>Discover on network</target>
+      <trans-unit id="Discover via local network" xml:space="preserve">
+        <source>Discover via local network</source>
+        <target>Discover via local network</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1899,6 +1928,11 @@ This cannot be undone!</target>
        <target>Do it later</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not send history to new members." xml:space="preserve">
+        <source>Do not send history to new members.</source>
+        <target>Do not send history to new members.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Don't create address</target>
@@ -1969,6 +2003,11 @@ This cannot be undone!</target>
        <target>Enable automatic message deletion?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enable camera access" xml:space="preserve">
+        <source>Enable camera access</source>
+        <target>Enable camera access</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
        <target>Enable for all</target>
@@ -2034,6 +2073,11 @@ This cannot be undone!</target>
        <target>Encrypted message or another event</target>
        <note>notification</note>
      </trans-unit>
+      <trans-unit id="Encrypted message: app is stopped" xml:space="preserve">
+        <source>Encrypted message: app is stopped</source>
+        <target>Encrypted message: app is stopped</target>
+        <note>notification</note>
+      </trans-unit>
      <trans-unit id="Encrypted message: database error" xml:space="preserve">
        <source>Encrypted message: database error</source>
        <target>Encrypted message: database error</target>
@@ -2264,6 +2308,11 @@ This cannot be undone!</target>
        <target>Error loading %@ servers</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error opening chat" xml:space="preserve">
+        <source>Error opening chat</source>
+        <target>Error opening chat</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Error receiving file</target>
@@ -2304,6 +2353,11 @@ This cannot be undone!</target>
        <target>Error saving user password</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error scanning code: %@" xml:space="preserve">
+        <source>Error scanning code: %@</source>
+        <target>Error scanning code: %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error sending email" xml:space="preserve">
        <source>Error sending email</source>
        <target>Error sending email</target>
@@ -2429,6 +2483,11 @@ This cannot be undone!</target>
        <target>Fast and no wait until the sender is online!</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>
+        <target>Faster joining and more reliable messages.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Favorite" xml:space="preserve">
        <source>Favorite</source>
        <target>Favorite</target>
@@ -2524,6 +2583,11 @@ This cannot be undone!</target>
        <target>For console</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Found desktop" xml:space="preserve">
+        <source>Found desktop</source>
+        <target>Found desktop</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="French interface" xml:space="preserve">
        <source>French interface</source>
        <target>French interface</target>
@@ -2624,9 +2688,9 @@ This cannot be undone!</target>
        <target>Group members can add message reactions.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group members can irreversibly delete sent messages." xml:space="preserve">
-        <source>Group members can irreversibly delete sent messages.</source>
-        <target>Group members can irreversibly delete sent messages.</target>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Group members can irreversibly delete sent messages. (24 hours)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group members can send direct messages." xml:space="preserve">
@@ -2734,6 +2798,11 @@ This cannot be undone!</target>
        <target>History</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="History is not sent to new members." xml:space="preserve">
+        <source>History is not sent to new members.</source>
+        <target>History is not sent to new members.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
        <target>How SimpleX works</target>
@@ -2769,11 +2838,6 @@ This cannot be undone!</target>
        <target>If you can't meet in person, show QR code in a video call, or share the link.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link." xml:space="preserve">
-        <source>If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.</source>
-        <target>If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="If you enter this passcode when opening the app, all app data will be irreversibly removed!" xml:space="preserve">
        <source>If you enter this passcode when opening the app, all app data will be irreversibly removed!</source>
        <target>If you enter this passcode when opening the app, all app data will be irreversibly removed!</target>
@@ -2849,6 +2913,11 @@ This cannot be undone!</target>
        <target>Incognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Incognito groups" xml:space="preserve">
+        <source>Incognito groups</source>
+        <target>Incognito groups</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Incognito mode" xml:space="preserve">
        <source>Incognito mode</source>
        <target>Incognito mode</target>
@@ -2926,16 +2995,36 @@ This cannot be undone!</target>
        <target>Interface</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid QR code" xml:space="preserve">
+        <source>Invalid QR code</source>
+        <target>Invalid QR code</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid connection link" xml:space="preserve">
        <source>Invalid connection link</source>
        <target>Invalid connection link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid display name!" xml:space="preserve">
+        <source>Invalid display name!</source>
+        <target>Invalid display name!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Invalid link" xml:space="preserve">
+        <source>Invalid link</source>
+        <target>Invalid link</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid name!" xml:space="preserve">
        <source>Invalid name!</source>
        <target>Invalid name!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid response" xml:space="preserve">
+        <source>Invalid response</source>
+        <target>Invalid response</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid server address!" xml:space="preserve">
        <source>Invalid server address!</source>
        <target>Invalid server address!</target>
@@ -3054,11 +3143,21 @@ This is your link for group %@!</target>
        <target>Joining group</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep" xml:space="preserve">
+        <source>Keep</source>
+        <target>Keep</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>
        <target>Keep the app open to use it from desktop</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep unused invitation?" xml:space="preserve">
+        <source>Keep unused invitation?</source>
+        <target>Keep unused invitation?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Keep your connections" xml:space="preserve">
        <source>Keep your connections</source>
        <target>Keep your connections</target>
@@ -3119,6 +3218,11 @@ This is your link for group %@!</target>
        <target>Limitations</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>
+        <target>Link mobile and desktop apps! 🔗</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Linked desktop options" xml:space="preserve">
        <source>Linked desktop options</source>
        <target>Linked desktop options</target>
@@ -3139,6 +3243,11 @@ This is your link for group %@!</target>
        <target>Live messages</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Local" xml:space="preserve">
+        <source>Local</source>
+        <target>Local</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Local name" xml:space="preserve">
        <source>Local name</source>
        <target>Local name</target>
@@ -3379,6 +3488,11 @@ This is your link for group %@!</target>
        <target>New Passcode</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New chat" xml:space="preserve">
+        <source>New chat</source>
+        <target>New chat</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New contact request" xml:space="preserve">
        <source>New contact request</source>
        <target>New contact request</target>
@@ -3479,6 +3593,11 @@ This is your link for group %@!</target>
        <target>No received or sent files</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Not compatible!" xml:space="preserve">
+        <source>Not compatible!</source>
+        <target>Not compatible!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Notifications</target>
@@ -3498,16 +3617,16 @@ This is your link for group %@!</target>
 - disable members ("observer" role)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="OK" xml:space="preserve">
+        <source>OK</source>
+        <target>OK</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Off" xml:space="preserve">
        <source>Off</source>
        <target>Off</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Off (Local)" xml:space="preserve">
-        <source>Off (Local)</source>
-        <target>Off (Local)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
@@ -3568,9 +3687,9 @@ This is your link for group %@!</target>
        <target>Only you can add message reactions.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion)." xml:space="preserve">
-        <source>Only you can irreversibly delete messages (your contact can mark them for deletion).</source>
-        <target>Only you can irreversibly delete messages (your contact can mark them for deletion).</target>
+      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)</source>
+        <target>Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only you can make calls." xml:space="preserve">
@@ -3593,9 +3712,9 @@ This is your link for group %@!</target>
        <target>Only your contact can add message reactions.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion)." xml:space="preserve">
-        <source>Only your contact can irreversibly delete messages (you can mark them for deletion).</source>
-        <target>Only your contact can irreversibly delete messages (you can mark them for deletion).</target>
+      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)</source>
+        <target>Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only your contact can make calls." xml:space="preserve">
@@ -3648,9 +3767,19 @@ This is your link for group %@!</target>
        <target>Open-source protocol and code – anybody can run the servers.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Opening database…" xml:space="preserve">
-        <source>Opening database…</source>
-        <target>Opening database…</target>
+      <trans-unit id="Opening app…" xml:space="preserve">
+        <source>Opening app…</source>
+        <target>Opening app…</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or scan QR code" xml:space="preserve">
+        <source>Or scan QR code</source>
+        <target>Or scan QR code</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or show this code" xml:space="preserve">
+        <source>Or show this code</source>
+        <target>Or show this code</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
@@ -3693,11 +3822,6 @@ This is your link for group %@!</target>
        <target>Password to show</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste" xml:space="preserve">
-        <source>Paste</source>
-        <target>Paste</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Paste desktop address" xml:space="preserve">
        <source>Paste desktop address</source>
        <target>Paste desktop address</target>
@@ -3708,16 +3832,11 @@ This is your link for group %@!</target>
        <target>Paste image</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste received link" xml:space="preserve">
-        <source>Paste received link</source>
-        <target>Paste received link</target>
+      <trans-unit id="Paste the link you received" xml:space="preserve">
+        <source>Paste the link you received</source>
+        <target>Paste the link you received</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received to connect with your contact.</source>
-        <target>Paste the link you received to connect with your contact.</target>
-        <note>placeholder</note>
-      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
        <target>People can connect to you only via the links you share.</target>
@@ -3753,6 +3872,13 @@ This is your link for group %@!</target>
        <target>Please check yours and your contact preferences.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
+        <source>Please contact developers.
+Error: %@</source>
+        <target>Please contact developers.
+Error: %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Please contact group admin." xml:space="preserve">
        <source>Please contact group admin.</source>
        <target>Please contact group admin.</target>
@@ -3958,6 +4084,11 @@ This is your link for group %@!</target>
        <target>Read more in [User Guide](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode)." xml:space="preserve">
+        <source>Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).</source>
+        <target>Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends)." xml:space="preserve">
        <source>Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</source>
        <target>Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</target>
@@ -4168,6 +4299,11 @@ This is your link for group %@!</target>
        <target>Restore database error</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Retry" xml:space="preserve">
+        <source>Retry</source>
+        <target>Retry</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Reveal" xml:space="preserve">
        <source>Reveal</source>
        <target>Reveal</target>
@@ -4323,6 +4459,11 @@ This is your link for group %@!</target>
        <target>Search</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Search or paste SimpleX link" xml:space="preserve">
+        <source>Search or paste SimpleX link</source>
+        <target>Search or paste SimpleX link</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Secure queue" xml:space="preserve">
        <source>Secure queue</source>
        <target>Secure queue</target>
@@ -4428,6 +4569,11 @@ This is your link for group %@!</target>
        <target>Send them from gallery or custom keyboards.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
+        <source>Send up to 100 last messages to new members.</source>
+        <target>Send up to 100 last messages to new members.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Sender cancelled file transfer.</target>
@@ -4598,9 +4744,9 @@ This is your link for group %@!</target>
        <target>Share link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Share one-time invitation link" xml:space="preserve">
-        <source>Share one-time invitation link</source>
-        <target>Share one-time invitation link</target>
+      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
+        <source>Share this 1-time invite link</source>
+        <target>Share this 1-time invite link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share with contacts" xml:space="preserve">
@@ -4723,16 +4869,16 @@ This is your link for group %@!</target>
        <target>Somebody</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="Start a new chat" xml:space="preserve">
-        <source>Start a new chat</source>
-        <target>Start a new chat</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
        <source>Start chat</source>
        <target>Start chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Start chat?" xml:space="preserve">
+        <source>Start chat?</source>
+        <target>Start chat?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Start migration" xml:space="preserve">
        <source>Start migration</source>
        <target>Start migration</target>
@@ -4858,6 +5004,16 @@ This is your link for group %@!</target>
        <target>Tap to join incognito</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tap to paste link" xml:space="preserve">
+        <source>Tap to paste link</source>
+        <target>Tap to paste link</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Tap to scan" xml:space="preserve">
+        <source>Tap to scan</source>
+        <target>Tap to scan</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Tap to start a new chat" xml:space="preserve">
        <source>Tap to start a new chat</source>
        <target>Tap to start a new chat</target>
@@ -4920,6 +5076,11 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>The attempt to change database passphrase was not completed.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The code you scanned is not a SimpleX link QR code." xml:space="preserve">
+        <source>The code you scanned is not a SimpleX link QR code.</source>
+        <target>The code you scanned is not a SimpleX link QR code.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
        <source>The connection you accepted will be cancelled!</source>
        <target>The connection you accepted will be cancelled!</target>
@@ -4985,6 +5146,11 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>The servers for new connections of your current chat profile **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The text you pasted is not a SimpleX link." xml:space="preserve">
+        <source>The text you pasted is not a SimpleX link.</source>
+        <target>The text you pasted is not a SimpleX link.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Theme" xml:space="preserve">
        <source>Theme</source>
        <target>Theme</target>
@@ -5030,6 +5196,11 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>This device name</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
+        <source>This display name is invalid. Please choose another name.</source>
+        <target>This display name is invalid. Please choose another name.</target>
+        <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>This group has over %lld members, delivery receipts are not sent.</target>
@@ -5065,6 +5236,11 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>To connect, your contact can scan QR code or use the link in the app.</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>
+        <target>To hide unwanted messages.</target>
+        <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>To make a new connection</target>
@@ -5132,11 +5308,6 @@ You will be prompted to complete authentication before this feature is enabled.<
        <target>Turn off</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Turn off notifications?" xml:space="preserve">
-        <source>Turn off notifications?</source>
-        <target>Turn off notifications?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Turn on" xml:space="preserve">
        <source>Turn on</source>
        <target>Turn on</target>
@@ -5254,6 +5425,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Unread</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
+        <source>Up to 100 last messages are sent to new members.</source>
+        <target>Up to 100 last messages are sent to new members.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Update" xml:space="preserve">
        <source>Update</source>
        <target>Update</target>
@@ -5339,6 +5515,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Use new incognito profile</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use only local notifications?" xml:space="preserve">
+        <source>Use only local notifications?</source>
+        <target>Use only local notifications?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Use server</target>
@@ -5389,6 +5570,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Via browser</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>
+        <target>Via secure quantum resistant protocol.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Video call" xml:space="preserve">
        <source>Video call</source>
        <target>Video call</target>
@@ -5414,6 +5600,11 @@ To connect, please ask your contact to create another connection link and check
        <target>View security code</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Visible history" xml:space="preserve">
+        <source>Visible history</source>
+        <target>Visible history</target>
+        <note>chat feature</note>
+      </trans-unit>
      <trans-unit id="Voice messages" xml:space="preserve">
        <source>Voice messages</source>
        <target>Voice messages</target>
@@ -5439,6 +5630,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Voice message…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Waiting for desktop..." xml:space="preserve">
+        <source>Waiting for desktop...</source>
+        <target>Waiting for desktop...</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Waiting for file" xml:space="preserve">
        <source>Waiting for file</source>
        <target>Waiting for file</target>
@@ -5591,11 +5787,6 @@ Repeat join request?</target>
        <target>You can accept calls from lock screen, without device and app authentication.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button." xml:space="preserve">
-        <source>You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.</source>
-        <target>You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You can create it later" xml:space="preserve">
        <source>You can create it later</source>
        <target>You can create it later</target>
@@ -5616,6 +5807,11 @@ Repeat join request?</target>
        <target>You can hide or mute a user profile - swipe it to the right.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
+        <source>You can make it visible to your SimpleX contacts via Settings.</source>
+        <target>You can make it visible to your SimpleX contacts via Settings.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can now send messages to %@" xml:space="preserve">
        <source>You can now send messages to %@</source>
        <target>You can now send messages to %@</target>
@@ -5656,6 +5852,11 @@ Repeat join request?</target>
        <target>You can use markdown to format messages:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can view invitation link again in connection details." xml:space="preserve">
+        <source>You can view invitation link again in connection details.</source>
+        <target>You can view invitation link again in connection details.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can't send messages!" xml:space="preserve">
        <source>You can't send messages!</source>
        <target>You can't send messages!</target>
@@ -5845,13 +6046,6 @@ You can cancel this connection and remove the contact (and try later with a new
        <target>Your contacts can allow full message deletion.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your contacts in SimpleX will see it.&#10;You can change it in Settings." xml:space="preserve">
-        <source>Your contacts in SimpleX will see it.
-You can change it in Settings.</source>
-        <target>Your contacts in SimpleX will see it.
-You can change it in Settings.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your contacts will remain connected." xml:space="preserve">
        <source>Your contacts will remain connected.</source>
        <target>Your contacts will remain connected.</target>
@@ -5984,6 +6178,11 @@ SimpleX servers cannot see your profile.</target>
        <target>audio call (not e2e encrypted)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="author" xml:space="preserve">
+        <source>author</source>
+        <target>author</target>
+        <note>member role</note>
+      </trans-unit>
      <trans-unit id="bad message ID" xml:space="preserve">
        <source>bad message ID</source>
        <target>bad message ID</target>
@@ -303,14 +303,17 @@
        <target>)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve">
+        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve">
        <source>**Add new contact**: to create your one-time QR Code or link for your contact.</source>
        <target>**Lisää uusi kontakti**: luo kertakäyttöinen QR-koodi tai linkki kontaktille.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve">
-        <source>**Create link / QR code** for your contact to use.</source>
-        <target>**Luo linkki / QR-koodi* kontaktille.</target>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve">
+        <source>**Create group**: to create a new group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve">
@@ -323,11 +326,6 @@
        <target>**Yksityisin**: älä käytä SimpleX Chat -ilmoituspalvelinta, tarkista viestit ajoittain taustalla (riippuu siitä, kuinka usein käytät sovellusta).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve">
-        <source>**Paste received link** or open it in the browser and tap **Open in mobile app**.</source>
-        <target>**Liitä vastaanotettu linkki** tai avaa se selaimessa ja napauta **Avaa mobiilisovelluksessa**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
        <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
        <target>**Huomaa**: et voi palauttaa tai muuttaa tunnuslausetta, jos kadotat sen.</target>
@@ -338,11 +336,6 @@
        <target>**Suositus**: laitetunnus ja ilmoitukset lähetetään SimpleX Chat -ilmoituspalvelimelle, mutta ei viestin sisältöä, kokoa tai sitä, keneltä se on peräisin.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Scan QR code**: to connect to your contact in person or via video call." xml:space="preserve">
-        <source>**Scan QR code**: to connect to your contact in person or via video call.</source>
-        <target>**Skannaa QR-koodi**: muodosta yhteys kontaktiisi henkilökohtaisesti tai videopuhelun kautta.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
        <source>**Warning**: Instant push notifications require passphrase saved in Keychain.</source>
        <target>**Varoitus**: Välittömät push-ilmoitukset vaativat tunnuslauseen, joka on tallennettu Keychainiin.</target>
@@ -383,6 +376,12 @@
 - 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.
@@ -431,11 +430,6 @@
        <target>1 viikko</target>
        <note>time interval</note>
      </trans-unit>
-      <trans-unit id="1-time link" xml:space="preserve">
-        <source>1-time link</source>
-        <target>Kertakäyttölinkki</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="5 minutes" xml:space="preserve">
        <source>5 minutes</source>
        <target>5 minuuttia</target>
@@ -551,6 +545,10 @@
        <target>Lisää osoite profiiliisi, jotta kontaktisi voivat jakaa sen muiden kanssa. Profiilipäivitys lähetetään kontakteillesi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve">
+        <source>Add contact</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Add preset servers" xml:space="preserve">
        <source>Add preset servers</source>
        <target>Lisää esiasetettuja palvelimia</target>
@@ -655,9 +653,9 @@
        <target>Salli katoavat viestit vain, jos kontaktisi sallii sen sinulle.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you." xml:space="preserve">
-        <source>Allow irreversible message deletion only if your contact allows it to you.</source>
-        <target>Salli peruuttamaton viestien poisto vain, jos kontaktisi sallii ne sinulle.</target>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
+        <target>Salli peruuttamaton viestien poisto vain, jos kontaktisi sallii ne sinulle. (24 tuntia)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve">
@@ -680,9 +678,9 @@
        <target>Salli katoavien viestien lähettäminen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow to irreversibly delete sent messages.</source>
-        <target>Salli lähetettyjen viestien peruuttamaton poistaminen.</target>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
+        <target>Salli lähetettyjen viestien peruuttamaton poistaminen. (24 tuntia)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -715,9 +713,9 @@
        <target>Salli kontaktiesi soittaa sinulle.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow your contacts to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow your contacts to irreversibly delete sent messages.</source>
-        <target>Salli kontaktiesi poistaa lähetetyt viestit peruuttamattomasti.</target>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
+        <target>Salli kontaktiesi poistaa lähetetyt viestit peruuttamattomasti. (24 tuntia)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve">
@@ -876,6 +874,10 @@
        <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>
@@ -885,6 +887,10 @@
        <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>
@@ -898,9 +904,9 @@
        <target>Sekä sinä että kontaktisi voivat käyttää viestireaktioita.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Both you and your contact can irreversibly delete sent messages." xml:space="preserve">
-        <source>Both you and your contact can irreversibly delete sent messages.</source>
-        <target>Sekä sinä että kontaktisi voitte peruuttamattomasti poistaa lähetetyt viestit.</target>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
+        <target>Sekä sinä että kontaktisi voitte peruuttamattomasti poistaa lähetetyt viestit. (24 tuntia)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Both you and your contact can make calls." xml:space="preserve">
@@ -937,6 +943,10 @@
        <target>Puhelut</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve">
+        <source>Camera not available</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Can't delete user profile!" xml:space="preserve">
        <source>Can't delete user profile!</source>
        <target>Käyttäjäprofiilia ei voi poistaa!</target>
@@ -1053,6 +1063,10 @@
        <target>Chat on pysäytetty</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve">
+        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat preferences" xml:space="preserve">
        <source>Chat preferences</source>
        <target>Chat-asetukset</target>
@@ -1153,6 +1167,10 @@
        <target>Yhdistä</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Connect automatically" xml:space="preserve">
+        <source>Connect automatically</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
        <source>Connect incognito</source>
        <target>Yhdistä Incognito</target>
@@ -1185,11 +1203,6 @@ This is your own one-time link!</source>
        <target>Yhdistä linkin kautta</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via link / QR code" xml:space="preserve">
-        <source>Connect via link / QR code</source>
-        <target>Yhdistä linkillä / QR-koodilla</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connect via one-time link" xml:space="preserve">
        <source>Connect via one-time link</source>
        <target>Yhdistä kertalinkillä</target>
@@ -1324,6 +1337,10 @@ 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>
@@ -1353,11 +1370,6 @@ This is your own one-time link!</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">
-        <source>Create one-time invitation 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>
@@ -1382,6 +1394,10 @@ This is your own one-time link!</source>
        <target>Luotu %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Creating link…" xml:space="preserve">
+        <source>Creating link…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Current Passcode" xml:space="preserve">
        <source>Current Passcode</source>
        <target>Nykyinen pääsykoodi</target>
@@ -1839,8 +1855,8 @@ This cannot be undone!</source>
        <target>Löydä ryhmiä ja liity niihin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Discover via local network" xml:space="preserve">
+        <source>Discover via local network</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1853,6 +1869,10 @@ This cannot be undone!</source>
        <target>Tee myöhemmin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not send history to new members." xml:space="preserve">
+        <source>Do not send history to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Älä luo osoitetta</target>
@@ -1923,6 +1943,10 @@ This cannot be undone!</source>
        <target>Ota automaattinen viestien poisto käyttöön?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enable camera access" xml:space="preserve">
+        <source>Enable camera access</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
        <target>Salli kaikille</target>
@@ -1987,6 +2011,10 @@ This cannot be undone!</source>
        <target>Salattu viesti tai muu tapahtuma</target>
        <note>notification</note>
      </trans-unit>
+      <trans-unit id="Encrypted message: app is stopped" xml:space="preserve">
+        <source>Encrypted message: app is stopped</source>
+        <note>notification</note>
+      </trans-unit>
      <trans-unit id="Encrypted message: database error" xml:space="preserve">
        <source>Encrypted message: database error</source>
        <target>Salattu viesti: tietokantavirhe</target>
@@ -2211,6 +2239,10 @@ This cannot be undone!</source>
        <target>Virhe %@-palvelimien lataamisessa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error opening chat" xml:space="preserve">
+        <source>Error opening chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Virhe tiedoston vastaanottamisessa</target>
@@ -2251,6 +2283,10 @@ This cannot be undone!</source>
        <target>Virhe käyttäjän salasanan tallentamisessa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error scanning code: %@" xml:space="preserve">
+        <source>Error scanning code: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error sending email" xml:space="preserve">
        <source>Error sending email</source>
        <target>Virhe sähköpostin lähettämisessä</target>
@@ -2374,6 +2410,10 @@ 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>
@@ -2469,6 +2509,10 @@ 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>
@@ -2566,9 +2610,9 @@ This cannot be undone!</source>
        <target>Ryhmän jäsenet voivat lisätä viestireaktioita.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group members can irreversibly delete sent messages." xml:space="preserve">
-        <source>Group members can irreversibly delete sent messages.</source>
-        <target>Ryhmän jäsenet voivat poistaa lähetetyt viestit peruuttamattomasti.</target>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Ryhmän jäsenet voivat poistaa lähetetyt viestit peruuttamattomasti. (24 tuntia)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group members can send direct messages." xml:space="preserve">
@@ -2676,6 +2720,10 @@ This cannot be undone!</source>
        <target>Historia</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="History is not sent to new members." xml:space="preserve">
+        <source>History is not sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
        <target>Miten SimpleX toimii</target>
@@ -2711,11 +2759,6 @@ This cannot be undone!</source>
        <target>Jos et voi tavata henkilökohtaisesti, näytä QR-koodi videopuhelussa tai jaa linkki.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link." xml:space="preserve">
-        <source>If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.</source>
-        <target>Jos et voi tavata henkilökohtaisesti, voit **skannata QR-koodin videopuhelussa** tai kontaktisi voi jakaa kutsulinkin.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="If you enter this passcode when opening the app, all app data will be irreversibly removed!" xml:space="preserve">
        <source>If you enter this passcode when opening the app, all app data will be irreversibly removed!</source>
        <target>Jos syötät tämän pääsykoodin sovellusta avatessasi, kaikki sovelluksen tiedot poistetaan peruuttamattomasti!</target>
@@ -2791,6 +2834,10 @@ 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>
@@ -2867,15 +2914,31 @@ This cannot be undone!</source>
        <target>Käyttöliittymä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid QR code" xml:space="preserve">
+        <source>Invalid QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid connection link" xml:space="preserve">
        <source>Invalid connection link</source>
        <target>Virheellinen yhteyslinkki</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid display name!" xml:space="preserve">
+        <source>Invalid display name!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Invalid link" xml:space="preserve">
+        <source>Invalid link</source>
+        <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 response" xml:space="preserve">
+        <source>Invalid response</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>
@@ -2990,10 +3053,18 @@ This is your link for group %@!</source>
        <target>Liittyy ryhmään</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep" xml:space="preserve">
+        <source>Keep</source>
+        <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 unused invitation?" xml:space="preserve">
+        <source>Keep unused invitation?</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>
@@ -3054,6 +3125,10 @@ 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>
@@ -3072,6 +3147,11 @@ This is your link for group %@!</source>
        <target>Live-viestit</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Local" xml:space="preserve">
+        <source>Local</source>
+        <target>Paikallinen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Local name" xml:space="preserve">
        <source>Local name</source>
        <target>Paikallinen nimi</target>
@@ -3311,6 +3391,10 @@ This is your link for group %@!</source>
        <target>Uusi pääsykoodi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New chat" xml:space="preserve">
+        <source>New chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New contact request" xml:space="preserve">
        <source>New contact request</source>
        <target>Uusi kontaktipyyntö</target>
@@ -3410,6 +3494,10 @@ 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>
@@ -3429,16 +3517,15 @@ This is your link for group %@!</source>
 - poista jäsenet käytöstä ("tarkkailija" rooli)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="OK" xml:space="preserve">
+        <source>OK</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Off" xml:space="preserve">
        <source>Off</source>
        <target>Pois</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Off (Local)" xml:space="preserve">
-        <source>Off (Local)</source>
-        <target>Pois (Paikallinen)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
@@ -3499,9 +3586,9 @@ This is your link for group %@!</source>
        <target>Vain sinä voit lisätä viestireaktioita.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion)." xml:space="preserve">
-        <source>Only you can irreversibly delete messages (your contact can mark them for deletion).</source>
-        <target>Vain sinä voit poistaa viestejä peruuttamattomasti (kontaktisi voi merkitä ne poistettavaksi).</target>
+      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)</source>
+        <target>Vain sinä voit poistaa viestejä peruuttamattomasti (kontaktisi voi merkitä ne poistettavaksi). (24 tuntia)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only you can make calls." xml:space="preserve">
@@ -3524,9 +3611,9 @@ This is your link for group %@!</source>
        <target>Vain kontaktisi voi lisätä viestireaktioita.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion)." xml:space="preserve">
-        <source>Only your contact can irreversibly delete messages (you can mark them for deletion).</source>
-        <target>Vain kontaktisi voi poistaa viestejä peruuttamattomasti (voit merkitä ne poistettavaksi).</target>
+      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)</source>
+        <target>Vain kontaktisi voi poistaa viestejä peruuttamattomasti (voit merkitä ne poistettavaksi). (24 tuntia)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only your contact can make calls." xml:space="preserve">
@@ -3577,9 +3664,16 @@ This is your link for group %@!</source>
        <target>Avoimen lähdekoodin protokolla ja koodi - kuka tahansa voi käyttää palvelimia.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Opening database…" xml:space="preserve">
-        <source>Opening database…</source>
-        <target>Avataan tietokantaa…</target>
+      <trans-unit id="Opening app…" xml:space="preserve">
+        <source>Opening app…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or scan QR code" xml:space="preserve">
+        <source>Or scan QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or show this code" xml:space="preserve">
+        <source>Or show this code</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
@@ -3622,11 +3716,6 @@ This is your link for group %@!</source>
        <target>Salasana näytettäväksi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste" xml:space="preserve">
-        <source>Paste</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>
@@ -3636,16 +3725,10 @@ This is your link for group %@!</source>
        <target>Liitä kuva</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste received link" xml:space="preserve">
-        <source>Paste received link</source>
-        <target>Liitä vastaanotettu linkki</target>
+      <trans-unit id="Paste the link you received" xml:space="preserve">
+        <source>Paste the link you received</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received to connect with your contact.</source>
-        <target>Liitä saamasi linkki, jonka avulla voit muodostaa yhteyden kontaktiisi.</target>
-        <note>placeholder</note>
-      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
        <target>Ihmiset voivat ottaa sinuun yhteyttä vain jakamiesi linkkien kautta.</target>
@@ -3681,6 +3764,11 @@ This is your link for group %@!</source>
        <target>Tarkista omasi ja kontaktin asetukset.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
+        <source>Please contact developers.
+Error: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Please contact group admin." xml:space="preserve">
        <source>Please contact group admin.</source>
        <target>Ota yhteyttä ryhmän ylläpitäjään.</target>
@@ -3884,6 +3972,10 @@ This is your link for group %@!</source>
        <target>Lue lisää [Käyttöoppaasta](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode)." xml:space="preserve">
+        <source>Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends)." xml:space="preserve">
        <source>Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</source>
        <target>Lue lisää [Käyttöoppaasta](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</target>
@@ -4092,6 +4184,10 @@ This is your link for group %@!</source>
        <target>Virhe tietokannan palauttamisessa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Retry" xml:space="preserve">
+        <source>Retry</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Reveal" xml:space="preserve">
        <source>Reveal</source>
        <target>Paljasta</target>
@@ -4246,6 +4342,10 @@ This is your link for group %@!</source>
        <target>Haku</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Search or paste SimpleX link" xml:space="preserve">
+        <source>Search or paste SimpleX link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Secure queue" xml:space="preserve">
        <source>Secure queue</source>
        <target>Turvallinen jono</target>
@@ -4350,6 +4450,10 @@ This is your link for group %@!</source>
        <target>Lähetä ne galleriasta tai mukautetuista näppäimistöistä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
+        <source>Send up to 100 last messages to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Lähettäjä peruutti tiedoston siirron.</target>
@@ -4519,9 +4623,8 @@ This is your link for group %@!</source>
        <target>Jaa linkki</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Share one-time invitation link" xml:space="preserve">
-        <source>Share one-time invitation link</source>
-        <target>Jaa kertakutsulinkki</target>
+      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
+        <source>Share this 1-time invite link</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share with contacts" xml:space="preserve">
@@ -4643,16 +4746,15 @@ This is your link for group %@!</source>
        <target>Joku</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="Start a new chat" xml:space="preserve">
-        <source>Start a new chat</source>
-        <target>Aloita uusi keskustelu</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
        <source>Start chat</source>
        <target>Aloita keskustelu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Start chat?" xml:space="preserve">
+        <source>Start chat?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Start migration" xml:space="preserve">
        <source>Start migration</source>
        <target>Aloita siirto</target>
@@ -4777,6 +4879,14 @@ This is your link for group %@!</source>
        <target>Napauta liittyäksesi incognito-tilassa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tap to paste link" xml:space="preserve">
+        <source>Tap to paste link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Tap to scan" xml:space="preserve">
+        <source>Tap to scan</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Tap to start a new chat" xml:space="preserve">
        <source>Tap to start a new chat</source>
        <target>Aloita uusi keskustelu napauttamalla</target>
@@ -4839,6 +4949,10 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Tietokannan tunnuslauseen muuttamista ei suoritettu loppuun.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The code you scanned is not a SimpleX link QR code." xml:space="preserve">
+        <source>The code you scanned is not a SimpleX link QR code.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
        <source>The connection you accepted will be cancelled!</source>
        <target>Hyväksymäsi yhteys peruuntuu!</target>
@@ -4904,6 +5018,10 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <target>Palvelimet nykyisen keskusteluprofiilisi uusille yhteyksille **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The text you pasted is not a SimpleX link." xml:space="preserve">
+        <source>The text you pasted is not a SimpleX link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Theme" xml:space="preserve">
        <source>Theme</source>
        <target>Teema</target>
@@ -4948,6 +5066,10 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <source>This device name</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
+        <source>This display name is invalid. Please choose another 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>
@@ -4981,6 +5103,10 @@ 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>
@@ -5047,11 +5173,6 @@ Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus ote
        <target>Sammuta</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Turn off notifications?" xml:space="preserve">
-        <source>Turn off notifications?</source>
-        <target>Kytke ilmoitukset pois päältä?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Turn on" xml:space="preserve">
        <source>Turn on</source>
        <target>Kytke päälle</target>
@@ -5164,6 +5285,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Lukematon</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Up to 100 last messages are sent to new members." xml:space="preserve">
+        <source>Up to 100 last messages are sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Update" xml:space="preserve">
        <source>Update</source>
        <target>Päivitä</target>
@@ -5248,6 +5373,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Käytä uutta incognito-profiilia</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use only local notifications?" xml:space="preserve">
+        <source>Use only local notifications?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Käytä palvelinta</target>
@@ -5295,6 +5424,10 @@ 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>
@@ -5320,6 +5453,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Näytä turvakoodi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Visible history" xml:space="preserve">
+        <source>Visible history</source>
+        <note>chat feature</note>
+      </trans-unit>
      <trans-unit id="Voice messages" xml:space="preserve">
        <source>Voice messages</source>
        <target>Ääniviestit</target>
@@ -5345,6 +5482,10 @@ 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>
@@ -5489,11 +5630,6 @@ Repeat join request?</source>
        <target>Voit vastaanottaa puheluita lukitusnäytöltä ilman laitteen ja sovelluksen todennusta.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button." xml:space="preserve">
-        <source>You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.</source>
-        <target>Voit myös muodostaa yhteyden klikkaamalla linkkiä. Jos se avautuu selaimessa, napsauta **Avaa mobiilisovelluksessa**-painiketta.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You can create it later" xml:space="preserve">
        <source>You can create it later</source>
        <target>Voit luoda sen myöhemmin</target>
@@ -5514,6 +5650,10 @@ Repeat join request?</source>
        <target>Voit piilottaa tai mykistää käyttäjäprofiilin pyyhkäisemällä sitä oikealle.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
+        <source>You can make it visible to your SimpleX contacts via Settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can now send messages to %@" xml:space="preserve">
        <source>You can now send messages to %@</source>
        <target>Voit nyt lähettää viestejä %@:lle</target>
@@ -5554,6 +5694,10 @@ Repeat join request?</source>
        <target>Voit käyttää markdownia viestien muotoiluun:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can view invitation link again in connection details." xml:space="preserve">
+        <source>You can view invitation link again in connection details.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can't send messages!" xml:space="preserve">
        <source>You can't send messages!</source>
        <target>Et voi lähettää viestejä!</target>
@@ -5738,13 +5882,6 @@ Voit peruuttaa tämän yhteyden ja poistaa kontaktin (ja yrittää myöhemmin uu
        <target>Kontaktisi voivat sallia viestien täydellisen poistamisen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your contacts in SimpleX will see it.&#10;You can change it in Settings." xml:space="preserve">
-        <source>Your contacts in SimpleX will see it.
-You can change it in Settings.</source>
-        <target>Kontaktisi SimpleX:ssä näkevät sen.
-Voit muuttaa sitä Asetuksista.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your contacts will remain connected." xml:space="preserve">
        <source>Your contacts will remain connected.</source>
        <target>Kontaktisi pysyvät yhdistettyinä.</target>
@@ -5875,6 +6012,10 @@ SimpleX-palvelimet eivät näe profiiliasi.</target>
        <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>
@@ -103,6 +103,7 @@
      </trans-unit>
      <trans-unit id="%@ connected" xml:space="preserve">
        <source>%@ connected</source>
+        <target>%@ 接続中</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -214,10 +215,12 @@
      </trans-unit>
      <trans-unit id="%lld messages marked deleted" xml:space="preserve">
        <source>%lld messages marked deleted</source>
+        <target>%lld 件のメッセージが削除されました</target>
        <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>
+        <target>%@ により%lld 件のメッセージが検閲されました</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%lld minutes" xml:space="preserve">
@@ -303,14 +306,17 @@
        <target>)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve">
+        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve">
        <source>**Add new contact**: to create your one-time QR Code or link for your contact.</source>
        <target>**新しい連絡先を追加**: 連絡先のワンタイム QR コードまたはリンクを作成します。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve">
-        <source>**Create link / QR code** for your contact to use.</source>
-        <target>連絡先が使用する **リンク/QR コードを作成します**。</target>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve">
+        <source>**Create group**: to create a new group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve">
@@ -323,11 +329,6 @@
        <target>**最もプライベート**: SimpleX Chat 通知サーバーを使用せず、バックグラウンドで定期的にメッセージをチェックします (アプリの使用頻度によって異なります)。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve">
-        <source>**Paste received link** or open it in the browser and tap **Open in mobile app**.</source>
-        <target>**受信したリンク**を貼り付けるか、ブラウザーで開いて [**モバイル アプリで開く**] をタップします。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
        <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
        <target>**注意**: パスフレーズを紛失すると、パスフレーズを復元または変更できなくなります。</target>
@@ -338,11 +339,6 @@
        <target>**推奨**: デバイス トークンと通知は SimpleX Chat 通知サーバーに送信されますが、メッセージの内容、サイズ、送信者は送信されません。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Scan QR code**: to connect to your contact in person or via video call." xml:space="preserve">
-        <source>**Scan QR code**: to connect to your contact in person or via video call.</source>
-        <target>**QR コードをスキャン**: 直接またはビデオ通話で連絡先に接続します。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
        <source>**Warning**: Instant push notifications require passphrase saved in Keychain.</source>
        <target>**警告**: 即時の プッシュ通知には、キーチェーンに保存されたパスフレーズが必要です。</target>
@@ -350,17 +346,17 @@
      </trans-unit>
      <trans-unit id="**e2e encrypted** audio call" xml:space="preserve">
        <source>**e2e encrypted** audio call</source>
-        <target>**e2e 暗号化**された音声通話</target>
+        <target>**e2e 暗号化**音声通話</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**e2e encrypted** video call" xml:space="preserve">
        <source>**e2e encrypted** video call</source>
-        <target>**エンドツーエンド暗号化済み**のビデオ通話</target>
+        <target>**e2e暗号化**ビデオ通話</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="*bold*" xml:space="preserve">
        <source>\*bold*</source>
-        <target>\*太文字*</target>
+        <target>\*太字*</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id=", " xml:space="preserve">
@@ -383,6 +379,12 @@
 - などなど！</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.
@@ -431,11 +433,6 @@
        <target>1週間</target>
        <note>time interval</note>
      </trans-unit>
-      <trans-unit id="1-time link" xml:space="preserve">
-        <source>1-time link</source>
-        <target>使い捨てのリンク</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="5 minutes" xml:space="preserve">
        <source>5 minutes</source>
        <target>5分</target>
@@ -533,7 +530,7 @@
      </trans-unit>
      <trans-unit id="Accept connection request?" xml:space="preserve">
        <source>Accept connection request?</source>
-        <target>連絡を受け入れる</target>
+        <target>接続要求を承認？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -551,6 +548,10 @@
        <target>プロフィールにアドレスを追加し、連絡先があなたのアドレスを他の人と共有できるようにします。プロフィールの更新は連絡先に送信されます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve">
+        <source>Add contact</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Add preset servers" xml:space="preserve">
        <source>Add preset servers</source>
        <target>既存サーバを追加</target>
@@ -637,7 +638,7 @@
      </trans-unit>
      <trans-unit id="All your contacts will remain connected. Profile update will be sent to your contacts." xml:space="preserve">
        <source>All your contacts will remain connected. Profile update will be sent to your contacts.</source>
-        <target>あなたの連絡先が繋がったまま継続します。</target>
+        <target>すべての連絡先は維持されます。連絡先に更新されたプロフィールを送信します。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow" xml:space="preserve">
@@ -655,8 +656,8 @@
        <target>連絡先が許可している場合のみ消えるメッセージを許可する。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you." xml:space="preserve">
-        <source>Allow irreversible message deletion only if your contact allows it to you.</source>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
        <target>送信相手も永久メッセージ削除を許可する時のみに許可する。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -680,8 +681,8 @@
        <target>消えるメッセージの送信を許可する。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow to irreversibly delete sent messages.</source>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
        <target>送信済みメッセージの永久削除を許可する。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -715,8 +716,8 @@
        <target>連絡先からの通話を許可する。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow your contacts to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow your contacts to irreversibly delete sent messages.</source>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
        <target>送信相手が永久メッセージ削除するのを許可する。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -877,6 +878,10 @@
        <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>
@@ -886,6 +891,10 @@
        <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>
@@ -899,8 +908,8 @@
        <target>自分も相手もメッセージへのリアクションを追加できます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Both you and your contact can irreversibly delete sent messages." xml:space="preserve">
-        <source>Both you and your contact can irreversibly delete sent messages.</source>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
        <target>あなたと連絡相手が送信済みメッセージを永久削除できます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -939,6 +948,10 @@
        <target>通話</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve">
+        <source>Camera not available</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Can't delete user profile!" xml:space="preserve">
        <source>Can't delete user profile!</source>
        <target>ユーザープロフィールが削除できません!</target>
@@ -1055,6 +1068,10 @@
        <target>チャットが停止してます</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve">
+        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat preferences" xml:space="preserve">
        <source>Chat preferences</source>
        <target>チャット設定</target>
@@ -1155,6 +1172,10 @@
        <target>接続</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Connect automatically" xml:space="preserve">
+        <source>Connect automatically</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
        <source>Connect incognito</source>
        <target>シークレットモードで接続</target>
@@ -1187,14 +1208,9 @@ This is your own one-time link!</source>
        <target>リンク経由で接続</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via link / QR code" xml:space="preserve">
-        <source>Connect via link / QR code</source>
-        <target>リンク・QRコード経由で接続</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connect via one-time link" xml:space="preserve">
        <source>Connect via one-time link</source>
-        <target>使い捨てリンク経由で接続しますか？</target>
+        <target>ワンタイムリンクで接続</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect with %@" xml:space="preserve">
@@ -1326,6 +1342,10 @@ 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,11 +1375,6 @@ This is your own one-time link!</source>
        <target>[デスクトップアプリ](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">
-        <source>Create one-time invitation 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>
@@ -1384,6 +1399,10 @@ This is your own one-time link!</source>
        <target>%@ によって作成されました</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Creating link…" xml:space="preserve">
+        <source>Creating link…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Current Passcode" xml:space="preserve">
        <source>Current Passcode</source>
        <target>現在のパスコード</target>
@@ -1712,12 +1731,12 @@ This cannot be undone!</source>
      </trans-unit>
      <trans-unit id="Delivery" xml:space="preserve">
        <source>Delivery</source>
-        <target>Delivery</target>
+        <target>配信</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
        <source>Delivery receipts are disabled!</source>
-        <target>Delivery receipts are disabled!</target>
+        <target>配信通知の停止！</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delivery receipts!" xml:space="preserve">
@@ -1841,8 +1860,8 @@ This cannot be undone!</source>
        <target>グループを見つけて参加する</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Discover via local network" xml:space="preserve">
+        <source>Discover via local network</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1855,6 +1874,10 @@ This cannot be undone!</source>
        <target>後で行う</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not send history to new members." xml:space="preserve">
+        <source>Do not send history to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>アドレスを作成しないでください</target>
@@ -1925,6 +1948,10 @@ This cannot be undone!</source>
        <target>自動メッセージ削除を有効にしますか？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enable camera access" xml:space="preserve">
+        <source>Enable camera access</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
        <target>すべて有効</target>
@@ -1990,6 +2017,10 @@ This cannot be undone!</source>
        <target>暗号化されたメッセージまたは別のイベント</target>
        <note>notification</note>
      </trans-unit>
+      <trans-unit id="Encrypted message: app is stopped" xml:space="preserve">
+        <source>Encrypted message: app is stopped</source>
+        <note>notification</note>
+      </trans-unit>
      <trans-unit id="Encrypted message: database error" xml:space="preserve">
        <source>Encrypted message: database error</source>
        <target>暗号化されたメッセージ : データベースエラー</target>
@@ -2214,6 +2245,10 @@ This cannot be undone!</source>
        <target>%@ サーバーのロード中にエラーが発生</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error opening chat" xml:space="preserve">
+        <source>Error opening chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>ファイル受信にエラー発生</target>
@@ -2254,6 +2289,10 @@ This cannot be undone!</source>
        <target>ユーザーパスワード保存エラー</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error scanning code: %@" xml:space="preserve">
+        <source>Error scanning code: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error sending email" xml:space="preserve">
        <source>Error sending email</source>
        <target>メールの送信にエラー発生</target>
@@ -2377,6 +2416,10 @@ 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>
@@ -2472,6 +2515,10 @@ 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>フランス語UI</target>
@@ -2569,8 +2616,8 @@ This cannot be undone!</source>
        <target>グループメンバーはメッセージへのリアクションを追加できます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group members can irreversibly delete sent messages." xml:space="preserve">
-        <source>Group members can irreversibly delete sent messages.</source>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
        <target>グループのメンバーがメッセージを完全削除することができます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2679,6 +2726,10 @@ This cannot be undone!</source>
        <target>履歴</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="History is not sent to new members." xml:space="preserve">
+        <source>History is not sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
        <target>SimpleX の仕組み</target>
@@ -2714,11 +2765,6 @@ This cannot be undone!</source>
        <target>直接会えない場合は、ビデオ通話で QR コードを表示するか、リンクを共有してください。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link." xml:space="preserve">
-        <source>If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.</source>
-        <target>直接会えない場合は、**ビデオ通話で QR コードを表示する**か、リンクを共有してください。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="If you enter this passcode when opening the app, all app data will be irreversibly removed!" xml:space="preserve">
        <source>If you enter this passcode when opening the app, all app data will be irreversibly removed!</source>
        <target>アプリを開くときにこのパスコードを入力すると、アプリのすべてのデータが元に戻せないように削除されます！</target>
@@ -2794,6 +2840,10 @@ 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>
@@ -2870,15 +2920,31 @@ This cannot be undone!</source>
        <target>インターフェース</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid QR code" xml:space="preserve">
+        <source>Invalid QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid connection link" xml:space="preserve">
        <source>Invalid connection link</source>
        <target>無効な接続リンク</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid display name!" xml:space="preserve">
+        <source>Invalid display name!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Invalid link" xml:space="preserve">
+        <source>Invalid link</source>
+        <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 response" xml:space="preserve">
+        <source>Invalid response</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>
@@ -2993,10 +3059,18 @@ This is your link for group %@!</source>
        <target>グループに参加</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep" xml:space="preserve">
+        <source>Keep</source>
+        <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 unused invitation?" xml:space="preserve">
+        <source>Keep unused invitation?</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>
@@ -3057,6 +3131,10 @@ 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>
@@ -3075,6 +3153,11 @@ This is your link for group %@!</source>
        <target>ライブメッセージ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Local" xml:space="preserve">
+        <source>Local</source>
+        <target>自分のみ</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Local name" xml:space="preserve">
        <source>Local name</source>
        <target>ローカルネーム</target>
@@ -3313,6 +3396,10 @@ This is your link for group %@!</source>
        <target>新しいパスコード</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New chat" xml:space="preserve">
+        <source>New chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New contact request" xml:space="preserve">
        <source>New contact request</source>
        <target>新しい繋がりのリクエスト</target>
@@ -3413,6 +3500,10 @@ 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>
@@ -3432,16 +3523,15 @@ This is your link for group %@!</source>
 - メンバーを無効にする (メッセージの送信不可)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="OK" xml:space="preserve">
+        <source>OK</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Off" xml:space="preserve">
        <source>Off</source>
        <target>オフ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Off (Local)" xml:space="preserve">
-        <source>Off (Local)</source>
-        <target>オフ(自分のみ)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>OK</target>
@@ -3502,8 +3592,8 @@ This is your link for group %@!</source>
        <target>メッセージへのリアクションを追加できるのは、あなただけです。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion)." xml:space="preserve">
-        <source>Only you can irreversibly delete messages (your contact can mark them for deletion).</source>
+      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)</source>
        <target>メッセージの完全削除はあなたにしかできません (あなたの連絡先は削除対象とすることができます)。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3527,8 +3617,8 @@ This is your link for group %@!</source>
        <target>メッセージへのリアクションを追加できるのは連絡先だけです。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion)." xml:space="preserve">
-        <source>Only your contact can irreversibly delete messages (you can mark them for deletion).</source>
+      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)</source>
        <target>メッセージを完全削除できるのはあなたの連絡相手だけです (あなたは削除対象とすることができます)。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3581,9 +3671,16 @@ This is your link for group %@!</source>
        <target>プロトコル技術とコードはオープンソースで、どなたでもご自分のサーバを運用できます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Opening database…" xml:space="preserve">
-        <source>Opening database…</source>
-        <target>データベースを開いています…</target>
+      <trans-unit id="Opening app…" xml:space="preserve">
+        <source>Opening app…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or scan QR code" xml:space="preserve">
+        <source>Or scan QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or show this code" xml:space="preserve">
+        <source>Or show this code</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
@@ -3626,11 +3723,6 @@ This is your link for group %@!</source>
        <target>パスワードを表示する</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste" xml:space="preserve">
-        <source>Paste</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>
@@ -3640,16 +3732,10 @@ This is your link for group %@!</source>
        <target>画像の貼り付け</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste received link" xml:space="preserve">
-        <source>Paste received link</source>
-        <target>頂いたリンクを貼り付ける</target>
+      <trans-unit id="Paste the link you received" xml:space="preserve">
+        <source>Paste the link you received</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received to connect with your contact.</source>
-        <target>連絡相手から頂いたリンクを以下の入力欄に貼り付けて繋がります。</target>
-        <note>placeholder</note>
-      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
        <target>あなたと繋がることができるのは、あなたからリンクを頂いた方のみです。</target>
@@ -3685,6 +3771,11 @@ This is your link for group %@!</source>
        <target>あなたと連絡先の設定を確認してください。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
+        <source>Please contact developers.
+Error: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Please contact group admin." xml:space="preserve">
        <source>Please contact group admin.</source>
        <target>グループの管理者に連絡してください。</target>
@@ -3888,6 +3979,10 @@ This is your link for group %@!</source>
        <target>詳しくは[ユーザーガイド](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address)をご覧ください。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode)." xml:space="preserve">
+        <source>Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends)." xml:space="preserve">
        <source>Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</source>
        <target>詳しくは[ユーザーガイド](https://simplex.chat/docs/guide/readme.html#connect-to-friends)をご覧ください。</target>
@@ -4095,6 +4190,10 @@ This is your link for group %@!</source>
        <target>データベース復元エラー</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Retry" xml:space="preserve">
+        <source>Retry</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Reveal" xml:space="preserve">
        <source>Reveal</source>
        <target>開示する</target>
@@ -4249,6 +4348,10 @@ This is your link for group %@!</source>
        <target>検索</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Search or paste SimpleX link" xml:space="preserve">
+        <source>Search or paste SimpleX link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Secure queue" xml:space="preserve">
        <source>Secure queue</source>
        <target>待ち行列セキュリティ確認</target>
@@ -4352,6 +4455,10 @@ This is your link for group %@!</source>
        <target>ギャラリーまたはカスタム キーボードから送信します。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
+        <source>Send up to 100 last messages to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>送信者がファイル転送をキャンセルしました。</target>
@@ -4515,9 +4622,8 @@ This is your link for group %@!</source>
        <target>リンクを送る</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Share one-time invitation link" xml:space="preserve">
-        <source>Share one-time invitation link</source>
-        <target>使い捨ての招待リンクを共有</target>
+      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
+        <source>Share this 1-time invite link</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share with contacts" xml:space="preserve">
@@ -4640,16 +4746,15 @@ This is your link for group %@!</source>
        <target>誰か</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="Start a new chat" xml:space="preserve">
-        <source>Start a new chat</source>
-        <target>新しいチャットを開始する</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
        <source>Start chat</source>
        <target>チャットを開始する</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Start chat?" xml:space="preserve">
+        <source>Start chat?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Start migration" xml:space="preserve">
        <source>Start migration</source>
        <target>移行の開始</target>
@@ -4774,6 +4879,14 @@ This is your link for group %@!</source>
        <target>タップしてシークレットモードで参加</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tap to paste link" xml:space="preserve">
+        <source>Tap to paste link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Tap to scan" xml:space="preserve">
+        <source>Tap to scan</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Tap to start a new chat" xml:space="preserve">
        <source>Tap to start a new chat</source>
        <target>タップして新しいチャットを始める</target>
@@ -4836,6 +4949,10 @@ 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 code you scanned is not a SimpleX link QR code." xml:space="preserve">
+        <source>The code you scanned is not a SimpleX link QR code.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
        <source>The connection you accepted will be cancelled!</source>
        <target>承認済の接続がキャンセルされます！</target>
@@ -4901,6 +5018,10 @@ 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 text you pasted is not a SimpleX link." xml:space="preserve">
+        <source>The text you pasted is not a SimpleX link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Theme" xml:space="preserve">
        <source>Theme</source>
        <target>テーマ</target>
@@ -4945,6 +5066,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <source>This device name</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
+        <source>This display name is invalid. Please choose another 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>
@@ -4977,6 +5102,10 @@ 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>
@@ -5043,11 +5172,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="Turn off notifications?" xml:space="preserve">
-        <source>Turn off notifications?</source>
-        <target>通知をオフにしますか？</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Turn on" xml:space="preserve">
        <source>Turn on</source>
        <target>オンにする</target>
@@ -5160,6 +5284,10 @@ 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="Up to 100 last messages are sent to new members." xml:space="preserve">
+        <source>Up to 100 last messages are sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Update" xml:space="preserve">
        <source>Update</source>
        <target>更新</target>
@@ -5244,6 +5372,10 @@ 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 only local notifications?" xml:space="preserve">
+        <source>Use only local notifications?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>サーバを使う</target>
@@ -5291,6 +5423,10 @@ 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>
@@ -5316,6 +5452,10 @@ 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="Visible history" xml:space="preserve">
+        <source>Visible history</source>
+        <note>chat feature</note>
+      </trans-unit>
      <trans-unit id="Voice messages" xml:space="preserve">
        <source>Voice messages</source>
        <target>音声メッセージ</target>
@@ -5341,6 +5481,10 @@ 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>
@@ -5485,11 +5629,6 @@ Repeat join request?</source>
        <target>デバイスやアプリの認証を行わずに、ロック画面から通話を受けることができます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button." xml:space="preserve">
-        <source>You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.</source>
-        <target>リンクをクリックすることでも接続できます。ブラウザで開いた場合は、**モバイルアプリで開く**ボタンをクリックしてください。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You can create it later" xml:space="preserve">
        <source>You can create it later</source>
        <target>後からでも作成できます</target>
@@ -5510,6 +5649,10 @@ Repeat join request?</source>
        <target>ユーザープロファイルを右にスワイプすると、非表示またはミュートにすることができます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
+        <source>You can make it visible to your SimpleX contacts via Settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can now send messages to %@" xml:space="preserve">
        <source>You can now send messages to %@</source>
        <target>%@ にメッセージを送信できるようになりました</target>
@@ -5550,6 +5693,10 @@ Repeat join request?</source>
        <target>メッセージの書式にmarkdownを使用することができます：</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can view invitation link again in connection details." xml:space="preserve">
+        <source>You can view invitation link again in connection details.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can't send messages!" xml:space="preserve">
        <source>You can't send messages!</source>
        <target>メッセージを送信できませんでした！</target>
@@ -5734,13 +5881,6 @@ You can cancel this connection and remove the contact (and try later with a new
        <target>連絡先がメッセージの完全削除を許可できます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your contacts in SimpleX will see it.&#10;You can change it in Settings." xml:space="preserve">
-        <source>Your contacts in SimpleX will see it.
-You can change it in Settings.</source>
-        <target>SimpleX の連絡先に表示されます。
-設定で変更できます。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your contacts will remain connected." xml:space="preserve">
        <source>Your contacts will remain connected.</source>
        <target>連絡先は接続されたままになります。</target>
@@ -5871,6 +6011,10 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
        <target>音声通話 (エンドツーエンド暗号化なし）</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>
@@ -6582,12 +6726,12 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
      </trans-unit>
      <trans-unit id="NSCameraUsageDescription" xml:space="preserve">
        <source>SimpleX needs camera access to scan QR codes to connect to other users and for video calls.</source>
-        <target>SimpleX は、他のユーザーに接続したりビデオ通話を行うために QR コードをスキャンするためにカメラにアクセスする必要があります。</target>
+        <target>SimpleXは他のユーザーに接続したりビデオ通話する際にQRコード読み取りのためにカメラにアクセスする必要があります。</target>
        <note>Privacy - Camera Usage Description</note>
      </trans-unit>
      <trans-unit id="NSFaceIDUsageDescription" xml:space="preserve">
        <source>SimpleX uses Face ID for local authentication</source>
-        <target>SimpleX はローカル認証に Face ID を使用します</target>
+        <target>SimpleXはローカル認証にFace IDを使用します</target>
        <note>Privacy - Face ID Usage Description</note>
      </trans-unit>
      <trans-unit id="NSLocalNetworkUsageDescription" xml:space="preserve">
@@ -6596,12 +6740,12 @@ SimpleX サーバーはあなたのプロファイルを参照できません。
      </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>
+        <target>SimpleXは音声通話やビデオ通話および音声メッセージの録音のためにマイクにアクセスする必要があります。</target>
        <note>Privacy - Microphone Usage Description</note>
      </trans-unit>
      <trans-unit id="NSPhotoLibraryAddUsageDescription" xml:space="preserve">
        <source>SimpleX needs access to Photo Library for saving captured and received media</source>
-        <target>SimpleX は、キャプチャおよび受信したメディアを保存するためにフォト ライブラリにアクセスする必要があります</target>
+        <target>SimpleXはキャプチャおよび受信したメディアを保存するためにフォトライブラリにアクセスする必要があります</target>
        <note>Privacy - Photo Library Additions Usage Description</note>
      </trans-unit>
    </body>
@@ -297,14 +297,17 @@
        <target>)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve">
+        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve">
        <source>**Add new contact**: to create your one-time QR Code or link for your contact.</source>
        <target>**เพิ่มผู้ติดต่อใหม่**: เพื่อสร้างคิวอาร์โค้ดแบบใช้ครั้งเดียวหรือลิงก์สำหรับผู้ติดต่อของคุณ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve">
-        <source>**Create link / QR code** for your contact to use.</source>
-        <target>**สร้างลิงค์ / คิวอาร์โค้ด** เพื่อให้ผู้ติดต่อของคุณใช้</target>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve">
+        <source>**Create group**: to create a new group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve">
@@ -317,11 +320,6 @@
        <target>**ส่วนตัวที่สุด**: ไม่ใช้เซิร์ฟเวอร์การแจ้งเตือนของ SimpleX Chat ตรวจสอบข้อความเป็นระยะในพื้นหลัง (ขึ้นอยู่กับความถี่ที่คุณใช้แอป)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve">
-        <source>**Paste received link** or open it in the browser and tap **Open in mobile app**.</source>
-        <target>**แปะลิงก์ที่ได้รับ** หรือเปิดในเบราว์เซอร์แล้วแตะ **เปิดในแอปมือถือ**</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
        <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
        <target>**โปรดทราบ**: คุณจะไม่สามารถกู้คืนหรือเปลี่ยนรหัสผ่านได้หากคุณทำรหัสผ่านหาย</target>
@@ -332,11 +330,6 @@
        <target>**แนะนำ**: โทเค็นอุปกรณ์และการแจ้งเตือนจะถูกส่งไปยังเซิร์ฟเวอร์การแจ้งเตือนของ SimpleX Chat แต่ไม่ใช่เนื้อหาข้อความ ขนาด หรือผู้ที่ส่ง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Scan QR code**: to connect to your contact in person or via video call." xml:space="preserve">
-        <source>**Scan QR code**: to connect to your contact in person or via video call.</source>
-        <target>**สแกนคิวอาร์โค้ด**: เพื่อเชื่อมต่อกับผู้ติดต่อของคุณด้วยตนเองหรือผ่านการสนทนาทางวิดีโอ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
        <source>**Warning**: Instant push notifications require passphrase saved in Keychain.</source>
        <target>**คำเตือน**: การแจ้งเตือนแบบพุชทันทีจำเป็นต้องบันทึกรหัสผ่านไว้ใน Keychain</target>
@@ -377,6 +370,12 @@
 - และอื่น ๆ!</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.
@@ -425,11 +424,6 @@
        <target>1 สัปดาห์</target>
        <note>time interval</note>
      </trans-unit>
-      <trans-unit id="1-time link" xml:space="preserve">
-        <source>1-time link</source>
-        <target>ลิงก์สำหรับใช้ 1 ครั้ง</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="5 minutes" xml:space="preserve">
        <source>5 minutes</source>
        <target>5 นาที</target>
@@ -543,6 +537,10 @@
        <target>เพิ่มที่อยู่ลงในโปรไฟล์ของคุณ เพื่อให้ผู้ติดต่อของคุณสามารถแชร์กับผู้อื่นได้ การอัปเดตโปรไฟล์จะถูกส่งไปยังผู้ติดต่อของคุณ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve">
+        <source>Add contact</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Add preset servers" xml:space="preserve">
        <source>Add preset servers</source>
        <target>เพิ่มเซิร์ฟเวอร์ที่ตั้งไว้ล่วงหน้า</target>
@@ -647,8 +645,8 @@
        <target>อนุญาตให้ข้อความที่หายไปเฉพาะในกรณีที่ผู้ติดต่อของคุณอนุญาตเท่านั้น.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you." xml:space="preserve">
-        <source>Allow irreversible message deletion only if your contact allows it to you.</source>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
        <target>อนุญาตให้ลบข้อความแบบถาวรเฉพาะในกรณีที่ผู้ติดต่อของคุณอนุญาตให้คุณเท่านั้น</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -672,8 +670,8 @@
        <target>อนุญาตให้ส่งข้อความที่จะหายไปหลังปิดแชท (disappearing message)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow to irreversibly delete sent messages.</source>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
        <target>อนุญาตให้ลบข้อความที่ส่งไปแล้วอย่างถาวร</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -707,8 +705,8 @@
        <target>อนุญาตให้ผู้ติดต่อของคุณโทรหาคุณ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow your contacts to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow your contacts to irreversibly delete sent messages.</source>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
        <target>อนุญาตให้ผู้ติดต่อของคุณลบข้อความที่ส่งแล้วอย่างถาวร</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -868,6 +866,10 @@
        <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>
@@ -877,6 +879,10 @@
        <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>
@@ -890,8 +896,8 @@
        <target>ทั้งคุณและผู้ติดต่อของคุณสามารถเพิ่มปฏิกิริยาของข้อความได้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Both you and your contact can irreversibly delete sent messages." xml:space="preserve">
-        <source>Both you and your contact can irreversibly delete sent messages.</source>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
        <target>ทั้งคุณและผู้ติดต่อของคุณสามารถลบข้อความที่ส่งแล้วอย่างถาวรได้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -929,6 +935,10 @@
        <target>โทร</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve">
+        <source>Camera not available</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Can't delete user profile!" xml:space="preserve">
        <source>Can't delete user profile!</source>
        <target>ไม่สามารถลบโปรไฟล์ผู้ใช้ได้!</target>
@@ -1045,6 +1055,10 @@
        <target>การแชทหยุดทํางานแล้ว</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve">
+        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat preferences" xml:space="preserve">
        <source>Chat preferences</source>
        <target>ค่ากําหนดในการแชท</target>
@@ -1145,6 +1159,10 @@
        <target>เชื่อมต่อ</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Connect automatically" xml:space="preserve">
+        <source>Connect automatically</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>
@@ -1176,11 +1194,6 @@ This is your own one-time link!</source>
        <target>เชื่อมต่อผ่านลิงก์</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via link / QR code" xml:space="preserve">
-        <source>Connect via link / QR code</source>
-        <target>เชื่อมต่อผ่านลิงค์ / คิวอาร์โค้ด</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connect via one-time link" xml:space="preserve">
        <source>Connect via one-time link</source>
        <note>No comment provided by engineer.</note>
@@ -1314,6 +1327,10 @@ 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>
@@ -1342,11 +1359,6 @@ This is your own one-time link!</source>
        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Create one-time invitation link" xml:space="preserve">
-        <source>Create one-time invitation 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>
@@ -1371,6 +1383,10 @@ This is your own one-time link!</source>
        <target>สร้างเมื่อ %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Creating link…" xml:space="preserve">
+        <source>Creating link…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Current Passcode" xml:space="preserve">
        <source>Current Passcode</source>
        <target>รหัสผ่านปัจจุบัน</target>
@@ -1826,8 +1842,8 @@ This cannot be undone!</source>
        <source>Discover and join groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Discover via local network" xml:space="preserve">
+        <source>Discover via local network</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1840,6 +1856,10 @@ This cannot be undone!</source>
        <target>ทำในภายหลัง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not send history to new members." xml:space="preserve">
+        <source>Do not send history to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>อย่าสร้างที่อยู่</target>
@@ -1910,6 +1930,10 @@ This cannot be undone!</source>
        <target>เปิดใช้งานการลบข้อความอัตโนมัติ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enable camera access" xml:space="preserve">
+        <source>Enable camera access</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
        <target>เปิดใช้งานสําหรับทุกคน</target>
@@ -1973,6 +1997,10 @@ This cannot be undone!</source>
        <target>ข้อความที่ encrypt หรือเหตุการณ์อื่น</target>
        <note>notification</note>
      </trans-unit>
+      <trans-unit id="Encrypted message: app is stopped" xml:space="preserve">
+        <source>Encrypted message: app is stopped</source>
+        <note>notification</note>
+      </trans-unit>
      <trans-unit id="Encrypted message: database error" xml:space="preserve">
        <source>Encrypted message: database error</source>
        <target>ข้อความที่ encrypt: ความผิดพลาดในฐานข้อมูล</target>
@@ -2196,6 +2224,10 @@ This cannot be undone!</source>
        <target>โหลดเซิร์ฟเวอร์ %@ ผิดพลาด</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error opening chat" xml:space="preserve">
+        <source>Error opening chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>เกิดข้อผิดพลาดในการรับไฟล์</target>
@@ -2236,6 +2268,10 @@ This cannot be undone!</source>
        <target>เกิดข้อผิดพลาดในการบันทึกรหัสผ่านผู้ใช้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error scanning code: %@" xml:space="preserve">
+        <source>Error scanning code: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error sending email" xml:space="preserve">
        <source>Error sending email</source>
        <target>เกิดข้อผิดพลาดในการส่งอีเมล</target>
@@ -2359,6 +2395,10 @@ 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>
@@ -2454,6 +2494,10 @@ 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>
@@ -2551,8 +2595,8 @@ This cannot be undone!</source>
        <target>สมาชิกกลุ่มสามารถเพิ่มการแสดงปฏิกิริยาต่อข้อความได้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group members can irreversibly delete sent messages." xml:space="preserve">
-        <source>Group members can irreversibly delete sent messages.</source>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
        <target>สมาชิกกลุ่มสามารถลบข้อความที่ส่งแล้วอย่างถาวร</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2661,6 +2705,10 @@ This cannot be undone!</source>
        <target>ประวัติ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="History is not sent to new members." xml:space="preserve">
+        <source>History is not sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
        <target>วิธีการ SimpleX ทํางานอย่างไร</target>
@@ -2696,11 +2744,6 @@ This cannot be undone!</source>
        <target>หากคุณไม่สามารถพบกันในชีวิตจริงได้ ให้แสดงคิวอาร์โค้ดในวิดีโอคอล หรือแชร์ลิงก์</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link." xml:space="preserve">
-        <source>If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.</source>
-        <target>หากคุณไม่สามารถพบปะด้วยตนเอง คุณสามารถ **สแกนคิวอาร์โค้ดผ่านการสนทนาทางวิดีโอ** หรือผู้ติดต่อของคุณสามารถแชร์ลิงก์เชิญได้</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="If you enter this passcode when opening the app, all app data will be irreversibly removed!" xml:space="preserve">
        <source>If you enter this passcode when opening the app, all app data will be irreversibly removed!</source>
        <target>หากคุณใส่รหัสผ่านนี้เมื่อเปิดแอป ข้อมูลแอปทั้งหมดจะถูกลบอย่างถาวร!</target>
@@ -2776,6 +2819,10 @@ 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>
@@ -2851,15 +2898,31 @@ This cannot be undone!</source>
        <target>อินเตอร์เฟซ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid QR code" xml:space="preserve">
+        <source>Invalid QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid connection link" xml:space="preserve">
        <source>Invalid connection link</source>
        <target>ลิงค์เชื่อมต่อไม่ถูกต้อง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid display name!" xml:space="preserve">
+        <source>Invalid display name!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Invalid link" xml:space="preserve">
+        <source>Invalid link</source>
+        <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 response" xml:space="preserve">
+        <source>Invalid response</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>
@@ -2973,10 +3036,18 @@ This is your link for group %@!</source>
        <target>กำลังจะเข้าร่วมกลุ่ม</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep" xml:space="preserve">
+        <source>Keep</source>
+        <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 unused invitation?" xml:space="preserve">
+        <source>Keep unused invitation?</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>
@@ -3037,6 +3108,10 @@ 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>
@@ -3055,6 +3130,11 @@ This is your link for group %@!</source>
        <target>ข้อความสด</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Local" xml:space="preserve">
+        <source>Local</source>
+        <target>ในเครื่อง</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Local name" xml:space="preserve">
        <source>Local name</source>
        <target>ชื่อภายในเครื่องเท่านั้น</target>
@@ -3293,6 +3373,10 @@ This is your link for group %@!</source>
        <target>รหัสผ่านใหม่</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New chat" xml:space="preserve">
+        <source>New chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New contact request" xml:space="preserve">
        <source>New contact request</source>
        <target>คำขอติดต่อใหม่</target>
@@ -3391,6 +3475,10 @@ 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>
@@ -3410,16 +3498,15 @@ This is your link for group %@!</source>
 - ปิดการใช้งานสมาชิก (บทบาท "ผู้สังเกตการณ์")</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="OK" xml:space="preserve">
+        <source>OK</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Off" xml:space="preserve">
        <source>Off</source>
        <target>ปิด</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Off (Local)" xml:space="preserve">
-        <source>Off (Local)</source>
-        <target>ปิด (ในเครื่อง)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>ตกลง</target>
@@ -3480,8 +3567,8 @@ This is your link for group %@!</source>
        <target>มีเพียงคุณเท่านั้นที่สามารถแสดงปฏิกิริยาต่อข้อความได้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion)." xml:space="preserve">
-        <source>Only you can irreversibly delete messages (your contact can mark them for deletion).</source>
+      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)</source>
        <target>มีเพียงคุณเท่านั้นที่สามารถลบข้อความแบบย้อนกลับไม่ได้ (ผู้ติดต่อของคุณสามารถทำเครื่องหมายเพื่อลบได้)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3505,8 +3592,8 @@ This is your link for group %@!</source>
        <target>เฉพาะผู้ติดต่อของคุณเท่านั้นที่สามารถเพิ่มการโต้ตอบข้อความได้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion)." xml:space="preserve">
-        <source>Only your contact can irreversibly delete messages (you can mark them for deletion).</source>
+      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)</source>
        <target>เฉพาะผู้ติดต่อของคุณเท่านั้นที่สามารถลบข้อความแบบย้อนกลับไม่ได้ (คุณสามารถทำเครื่องหมายเพื่อลบได้)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3558,9 +3645,16 @@ This is your link for group %@!</source>
        <target>โปรโตคอลและโค้ดโอเพ่นซอร์ส – ใคร ๆ ก็สามารถเปิดใช้เซิร์ฟเวอร์ได้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Opening database…" xml:space="preserve">
-        <source>Opening database…</source>
-        <target>กำลังเปิดฐานข้อมูล…</target>
+      <trans-unit id="Opening app…" xml:space="preserve">
+        <source>Opening app…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or scan QR code" xml:space="preserve">
+        <source>Or scan QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or show this code" xml:space="preserve">
+        <source>Or show this code</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
@@ -3603,11 +3697,6 @@ This is your link for group %@!</source>
        <target>รหัสผ่านที่จะแสดง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste" xml:space="preserve">
-        <source>Paste</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>
@@ -3617,15 +3706,10 @@ This is your link for group %@!</source>
        <target>แปะภาพ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste received link" xml:space="preserve">
-        <source>Paste received link</source>
-        <target>แปะลิงก์ที่ได้รับ</target>
+      <trans-unit id="Paste the link you received" xml:space="preserve">
+        <source>Paste the link you received</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received to connect with your contact.</source>
-        <note>placeholder</note>
-      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
        <target>ผู้คนสามารถเชื่อมต่อกับคุณผ่านลิงก์ที่คุณแบ่งปันเท่านั้น</target>
@@ -3661,6 +3745,11 @@ This is your link for group %@!</source>
        <target>โปรดตรวจสอบความต้องการของคุณและการตั้งค่าผู้ติดต่อ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
+        <source>Please contact developers.
+Error: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Please contact group admin." xml:space="preserve">
        <source>Please contact group admin.</source>
        <target>โปรดติดต่อผู้ดูแลกลุ่ม</target>
@@ -3864,6 +3953,10 @@ This is your link for group %@!</source>
        <target>อ่านเพิ่มเติมใน[คู่มือผู้ใช้](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode)." xml:space="preserve">
+        <source>Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends)." xml:space="preserve">
        <source>Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</source>
        <target>อ่านเพิ่มเติมใน[คู่มือผู้ใช้](https://simplex.chat/docs/guide/readme.html#connect-to-friends)</target>
@@ -4070,6 +4163,10 @@ This is your link for group %@!</source>
        <target>กู้คืนข้อผิดพลาดของฐานข้อมูล</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Retry" xml:space="preserve">
+        <source>Retry</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Reveal" xml:space="preserve">
        <source>Reveal</source>
        <target>เปิดเผย</target>
@@ -4224,6 +4321,10 @@ This is your link for group %@!</source>
        <target>ค้นหา</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Search or paste SimpleX link" xml:space="preserve">
+        <source>Search or paste SimpleX link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Secure queue" xml:space="preserve">
        <source>Secure queue</source>
        <target>คิวที่ปลอดภัย</target>
@@ -4328,6 +4429,10 @@ This is your link for group %@!</source>
        <target>ส่งจากแกลเลอรีหรือแป้นพิมพ์แบบกำหนดเอง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
+        <source>Send up to 100 last messages to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>ผู้ส่งยกเลิกการโอนไฟล์</target>
@@ -4495,9 +4600,8 @@ This is your link for group %@!</source>
        <target>แชร์ลิงก์</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Share one-time invitation link" xml:space="preserve">
-        <source>Share one-time invitation link</source>
-        <target>แชร์ลิงก์เชิญแบบใช้ครั้งเดียว</target>
+      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
+        <source>Share this 1-time invite link</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share with contacts" xml:space="preserve">
@@ -4617,16 +4721,15 @@ This is your link for group %@!</source>
        <target>ใครบางคน</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="Start a new chat" xml:space="preserve">
-        <source>Start a new chat</source>
-        <target>เริ่มแชทใหม่</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
        <source>Start chat</source>
        <target>เริ่มแชท</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Start chat?" xml:space="preserve">
+        <source>Start chat?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Start migration" xml:space="preserve">
        <source>Start migration</source>
        <target>เริ่มการย้ายข้อมูล</target>
@@ -4751,6 +4854,14 @@ This is your link for group %@!</source>
        <target>แตะเพื่อเข้าร่วมโหมดไม่ระบุตัวตน</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tap to paste link" xml:space="preserve">
+        <source>Tap to paste link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Tap to scan" xml:space="preserve">
+        <source>Tap to scan</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Tap to start a new chat" xml:space="preserve">
        <source>Tap to start a new chat</source>
        <target>แตะเพื่อเริ่มแชทใหม่</target>
@@ -4814,6 +4925,10 @@ 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 code you scanned is not a SimpleX link QR code." xml:space="preserve">
+        <source>The code you scanned is not a SimpleX link QR code.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
        <source>The connection you accepted will be cancelled!</source>
        <target>การเชื่อมต่อที่คุณยอมรับจะถูกยกเลิก!</target>
@@ -4879,6 +4994,10 @@ 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 text you pasted is not a SimpleX link." xml:space="preserve">
+        <source>The text you pasted is not a SimpleX link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Theme" xml:space="preserve">
        <source>Theme</source>
        <target>ธีม</target>
@@ -4922,6 +5041,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <source>This device name</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
+        <source>This display name is invalid. Please choose another 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>
@@ -4954,6 +5077,10 @@ 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>
@@ -5020,11 +5147,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="Turn off notifications?" xml:space="preserve">
-        <source>Turn off notifications?</source>
-        <target>ปิดการแจ้งเตือนไหม?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Turn on" xml:space="preserve">
        <source>Turn on</source>
        <target>เปิด</target>
@@ -5137,6 +5259,10 @@ 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="Up to 100 last messages are sent to new members." xml:space="preserve">
+        <source>Up to 100 last messages are sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Update" xml:space="preserve">
        <source>Update</source>
        <target>อัปเดต</target>
@@ -5219,6 +5345,10 @@ To connect, please ask your contact to create another connection link and check
        <source>Use new incognito profile</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use only local notifications?" xml:space="preserve">
+        <source>Use only local notifications?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>ใช้เซิร์ฟเวอร์</target>
@@ -5266,6 +5396,10 @@ 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>
@@ -5291,6 +5425,10 @@ 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="Visible history" xml:space="preserve">
+        <source>Visible history</source>
+        <note>chat feature</note>
+      </trans-unit>
      <trans-unit id="Voice messages" xml:space="preserve">
        <source>Voice messages</source>
        <target>ข้อความเสียง</target>
@@ -5316,6 +5454,10 @@ 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>
@@ -5460,11 +5602,6 @@ Repeat join request?</source>
        <target>คุณสามารถรับสายจากหน้าจอล็อกโดยไม่ต้องมีการตรวจสอบสิทธิ์อุปกรณ์และแอป</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button." xml:space="preserve">
-        <source>You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.</source>
-        <target>คุณสามารถเชื่อมต่อได้โดยคลิกที่ลิงค์ หากเปิดในเบราว์เซอร์ ให้คลิกปุ่ม **เปิดในแอปมือถือ**</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You can create it later" xml:space="preserve">
        <source>You can create it later</source>
        <target>คุณสามารถสร้างได้ในภายหลัง</target>
@@ -5485,6 +5622,10 @@ Repeat join request?</source>
        <target>คุณสามารถซ่อนหรือปิดเสียงโปรไฟล์ผู้ใช้ - ปัดไปทางขวา</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
+        <source>You can make it visible to your SimpleX contacts via Settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can now send messages to %@" xml:space="preserve">
        <source>You can now send messages to %@</source>
        <target>ตอนนี้คุณสามารถส่งข้อความถึง %@</target>
@@ -5525,6 +5666,10 @@ Repeat join request?</source>
        <target>คุณสามารถใช้มาร์กดาวน์เพื่อจัดรูปแบบข้อความ:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can view invitation link again in connection details." xml:space="preserve">
+        <source>You can view invitation link again in connection details.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can't send messages!" xml:space="preserve">
        <source>You can't send messages!</source>
        <target>คุณไม่สามารถส่งข้อความได้!</target>
@@ -5708,13 +5853,6 @@ You can cancel this connection and remove the contact (and try later with a new
        <target>ผู้ติดต่อของคุณสามารถอนุญาตให้ลบข้อความทั้งหมดได้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your contacts in SimpleX will see it.&#10;You can change it in Settings." xml:space="preserve">
-        <source>Your contacts in SimpleX will see it.
-You can change it in Settings.</source>
-        <target>ผู้ติดต่อของคุณใน SimpleX จะเห็น
-คุณสามารถเปลี่ยนได้ในการตั้งค่า</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your contacts will remain connected." xml:space="preserve">
        <source>Your contacts will remain connected.</source>
        <target>ผู้ติดต่อของคุณจะยังคงเชื่อมต่ออยู่</target>
@@ -5844,6 +5982,10 @@ SimpleX servers cannot see your profile.</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>
@@ -0,0 +1,15 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "locale" : "tr"
+    }
+  ],
+  "properties" : {
+    "localizable" : true
+  },
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,23 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.000",
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "0.533"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "properties" : {
+    "localizable" : true
+  },
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
@@ -0,0 +1,6 @@
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX NSE";
+/* Bundle name */
+"CFBundleName" = "SimpleX NSE";
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2022 SimpleX Chat. All rights reserved.";
@@ -0,0 +1,30 @@
+/* No comment provided by engineer. */
+"_italic_" = "\\_italic_";
+
+/* No comment provided by engineer. */
+"**Add new contact**: to create your one-time QR Code for your contact." = "**Add new contact**: to create your one-time QR Code or link for your contact.";
+
+/* No comment provided by engineer. */
+"*bold*" = "\\*bold*";
+
+/* No comment provided by engineer. */
+"`a + b`" = "\\`a + b`";
+
+/* No comment provided by engineer. */
+"~strike~" = "\\~strike~";
+
+/* call status */
+"connecting call" = "connecting call…";
+
+/* No comment provided by engineer. */
+"Connecting server…" = "Connecting to server…";
+
+/* No comment provided by engineer. */
+"Connecting server… (error: %@)" = "Connecting to server… (error: %@)";
+
+/* rcv group event chat item */
+"member connected" = "connected";
+
+/* No comment provided by engineer. */
+"No group!" = "Group not found!";
+
@@ -0,0 +1,12 @@
+/* Bundle name */
+"CFBundleName" = "SimpleX";
+/* Privacy - Camera Usage Description */
+"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 */
+"NSPhotoLibraryAddUsageDescription" = "SimpleX needs access to Photo Library for saving captured and received media";
@@ -0,0 +1,12 @@
+{
+  "developmentRegion" : "en",
+  "project" : "SimpleX.xcodeproj",
+  "targetLocale" : "tr",
+  "toolInfo" : {
+    "toolBuildNumber" : "15A240d",
+    "toolID" : "com.apple.dt.xcode",
+    "toolName" : "Xcode",
+    "toolVersion" : "15.0"
+  },
+  "version" : "1.0"
+}
@@ -89,6 +89,7 @@
      </trans-unit>
      <trans-unit id="%@ and %@" xml:space="preserve">
        <source>%@ and %@</source>
+        <target>%@ та %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%@ and %@ connected" xml:space="preserve">
@@ -103,6 +104,7 @@
      </trans-unit>
      <trans-unit id="%@ connected" xml:space="preserve">
        <source>%@ connected</source>
+        <target>%@ підключено</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%@ is connected!" xml:space="preserve">
@@ -132,6 +134,7 @@
      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
+        <target>%@, %@ та %lld учасників</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
@@ -201,6 +204,7 @@
      </trans-unit>
      <trans-unit id="%lld group events" xml:space="preserve">
        <source>%lld group events</source>
+        <target>%lld групові заходи</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%lld members" xml:space="preserve">
@@ -210,14 +214,17 @@
      </trans-unit>
      <trans-unit id="%lld messages blocked" xml:space="preserve">
        <source>%lld messages blocked</source>
+        <target>%lld повідомлень заблоковано</target>
        <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>
+        <target>%lld повідомлень позначено як видалені</target>
        <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>
+        <target>%lld повідомлень модерує %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%lld minutes" xml:space="preserve">
@@ -227,6 +234,7 @@
      </trans-unit>
      <trans-unit id="%lld new interface languages" xml:space="preserve">
        <source>%lld new interface languages</source>
+        <target>%lld нові мови інтерфейсу</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%lld second(s)" xml:space="preserve">
@@ -291,10 +299,12 @@
      </trans-unit>
      <trans-unit id="(new)" xml:space="preserve">
        <source>(new)</source>
+        <target>(новий)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="(this device v%@)" xml:space="preserve">
        <source>(this device v%@)</source>
+        <target>(цей пристрій v%@)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id=")" xml:space="preserve">
@@ -302,14 +312,17 @@
        <target>)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve">
+        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve">
        <source>**Add new contact**: to create your one-time QR Code or link for your contact.</source>
        <target>**Додати новий контакт**: щоб створити одноразовий QR-код або посилання для свого контакту.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve">
-        <source>**Create link / QR code** for your contact to use.</source>
-        <target>**Створіть посилання / QR-код** для використання вашим контактом.</target>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve">
+        <source>**Create group**: to create a new group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve">
@@ -322,11 +335,6 @@
        <target>**Найбільш приватний**: не використовуйте сервер сповіщень SimpleX Chat, періодично перевіряйте повідомлення у фоновому режимі (залежить від того, як часто ви користуєтесь додатком).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve">
-        <source>**Paste received link** or open it in the browser and tap **Open in mobile app**.</source>
-        <target>**Вставте отримане посилання** або відкрийте його в браузері і натисніть **Відкрити в мобільному додатку**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
        <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
        <target>**Зверніть увагу: ви НЕ зможете відновити або змінити пароль, якщо втратите його.</target>
@@ -337,11 +345,6 @@
        <target>**Рекомендується**: токен пристрою та сповіщення надсилаються на сервер сповіщень SimpleX Chat, але не вміст повідомлення, його розмір або від кого воно надійшло.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Scan QR code**: to connect to your contact in person or via video call." xml:space="preserve">
-        <source>**Scan QR code**: to connect to your contact in person or via video call.</source>
-        <target>**Відскануйте QR-код**: щоб з'єднатися з вашим контактом особисто або за допомогою відеодзвінка.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
        <source>**Warning**: Instant push notifications require passphrase saved in Keychain.</source>
        <target>**Попередження**: Для отримання миттєвих пуш-сповіщень потрібна парольна фраза, збережена у брелоку.</target>
@@ -371,6 +374,9 @@
        <source>- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!
 - delivery receipts (up to 20 members).
 - faster and more stable.</source>
+        <target>- підключитися до [сервера каталогів](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex. im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id. цибуля) (БЕТА)!
+- підтвердження доставлення (до 20 учасників).
+- швидше і стабільніше.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve">
@@ -382,6 +388,15 @@
 - і багато іншого!</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>
+        <target>- опція сповіщати про видалені контакти.
+- імена профілів з пробілами.
+- та багато іншого!</target>
+        <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.
@@ -398,6 +413,7 @@
      </trans-unit>
      <trans-unit id="0 sec" xml:space="preserve">
        <source>0 sec</source>
+        <target>0 сек</target>
        <note>time to disappear</note>
      </trans-unit>
      <trans-unit id="0s" xml:space="preserve">
@@ -430,11 +446,6 @@
        <target>1 тиждень</target>
        <note>time interval</note>
      </trans-unit>
-      <trans-unit id="1-time link" xml:space="preserve">
-        <source>1-time link</source>
-        <target>1-разове посилання</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="5 minutes" xml:space="preserve">
        <source>5 minutes</source>
        <target>5 хвилин</target>
@@ -550,6 +561,10 @@
        <target>Додайте адресу до свого профілю, щоб ваші контакти могли поділитися нею з іншими людьми. Повідомлення про оновлення профілю буде надіслано вашим контактам.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve">
+        <source>Add contact</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Add preset servers" xml:space="preserve">
        <source>Add preset servers</source>
        <target>Додавання попередньо встановлених серверів</target>
@@ -627,6 +642,7 @@
      </trans-unit>
      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve">
        <source>All new messages from %@ will be hidden!</source>
+        <target>Всі нові повідомлення від %@ будуть приховані!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
@@ -654,9 +670,9 @@
        <target>Дозволяйте зникати повідомленням, тільки якщо контакт дозволяє вам це робити.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you." xml:space="preserve">
-        <source>Allow irreversible message deletion only if your contact allows it to you.</source>
-        <target>Дозволяйте безповоротне видалення повідомлень, тільки якщо контакт дозволяє вам це зробити.</target>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
+        <target>Дозволяйте безповоротне видалення повідомлень, тільки якщо контакт дозволяє вам це зробити. (24 години)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve">
@@ -679,9 +695,9 @@
        <target>Дозволити надсилання зникаючих повідомлень.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow to irreversibly delete sent messages.</source>
-        <target>Дозволяє безповоротно видаляти надіслані повідомлення.</target>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
+        <target>Дозволяє безповоротно видаляти надіслані повідомлення. (24 години)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow to send files and media." xml:space="preserve">
@@ -714,9 +730,9 @@
        <target>Дозвольте вашим контактам телефонувати вам.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow your contacts to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow your contacts to irreversibly delete sent messages.</source>
-        <target>Дозвольте вашим контактам безповоротно видаляти надіслані повідомлення.</target>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
+        <target>Дозвольте вашим контактам безповоротно видаляти надіслані повідомлення. (24 години)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve">
@@ -736,10 +752,12 @@
      </trans-unit>
      <trans-unit id="Already connecting!" xml:space="preserve">
        <source>Already connecting!</source>
+        <target>Вже підключаємось!</target>
        <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>
+        <target>Вже приєднуємося до групи!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Always use relay" xml:space="preserve">
@@ -764,6 +782,7 @@
      </trans-unit>
      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
        <source>App encrypts new local files (except videos).</source>
+        <target>Додаток шифрує нові локальні файли (крім відео).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="App icon" xml:space="preserve">
@@ -863,6 +882,7 @@
      </trans-unit>
      <trans-unit id="Bad desktop address" xml:space="preserve">
        <source>Bad desktop address</source>
+        <target>Неправильна адреса робочого столу</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Bad message ID" xml:space="preserve">
@@ -875,6 +895,11 @@
        <target>Поганий хеш повідомлення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better groups" xml:space="preserve">
+        <source>Better groups</source>
+        <target>Кращі групи</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Кращі повідомлення</target>
@@ -882,14 +907,22 @@
      </trans-unit>
      <trans-unit id="Block" xml:space="preserve">
        <source>Block</source>
+        <target>Блокувати</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Block group members" xml:space="preserve">
+        <source>Block group members</source>
+        <target>Учасники групи блокування</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Block member" xml:space="preserve">
        <source>Block member</source>
+        <target>Заблокувати користувача</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Block member?" xml:space="preserve">
        <source>Block member?</source>
+        <target>Заблокувати користувача?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
@@ -897,9 +930,9 @@
        <target>Реакції на повідомлення можете додавати як ви, так і ваш контакт.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Both you and your contact can irreversibly delete sent messages." xml:space="preserve">
-        <source>Both you and your contact can irreversibly delete sent messages.</source>
-        <target>І ви, і ваш контакт можете безповоротно видалити надіслані повідомлення.</target>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
+        <target>І ви, і ваш контакт можете безповоротно видалити надіслані повідомлення. (24 години)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Both you and your contact can make calls." xml:space="preserve">
@@ -919,6 +952,7 @@
      </trans-unit>
      <trans-unit id="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve">
        <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
+        <target>Болгарською, фінською, тайською та українською мовами - завдяки користувачам та [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
@@ -936,6 +970,10 @@
        <target>Дзвінки</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve">
+        <source>Camera not available</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Can't delete user profile!" xml:space="preserve">
        <source>Can't delete user profile!</source>
        <target>Не можу видалити профіль користувача!</target>
@@ -1052,6 +1090,10 @@
        <target>Чат зупинено</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve">
+        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat preferences" xml:space="preserve">
        <source>Chat preferences</source>
        <target>Налаштування чату</target>
@@ -1152,6 +1194,11 @@
        <target>Підключіться</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Connect automatically" xml:space="preserve">
+        <source>Connect automatically</source>
+        <target>Підключення автоматично</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
        <source>Connect incognito</source>
        <target>Підключайтеся інкогніто</target>
@@ -1159,24 +1206,31 @@
      </trans-unit>
      <trans-unit id="Connect to desktop" xml:space="preserve">
        <source>Connect to desktop</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>
+        <target>З'єднатися з самим собою?</target>
        <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>
+        <target>З'єднатися з самим собою? 
+Це ваша власна SimpleX-адреса!</target>
        <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>
+        <target>Підключитися до себе? 
+Це ваше власне одноразове посилання!</target>
        <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>
+        <target>Підключіться за контактною адресою</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via link" xml:space="preserve">
@@ -1184,11 +1238,6 @@ This is your own one-time link!</source>
        <target>Підключіться за посиланням</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via link / QR code" xml:space="preserve">
-        <source>Connect via link / QR code</source>
-        <target>Підключитися за посиланням / QR-кодом</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connect via one-time link" xml:space="preserve">
        <source>Connect via one-time link</source>
        <target>Під'єднатися за одноразовим посиланням</target>
@@ -1196,10 +1245,12 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Connect with %@" xml:space="preserve">
        <source>Connect with %@</source>
+        <target>Підключитися до %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connected desktop" xml:space="preserve">
        <source>Connected desktop</source>
+        <target>Підключений робочий стіл</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connected to desktop" xml:space="preserve">
@@ -1323,6 +1374,10 @@ 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>
@@ -1351,11 +1406,6 @@ This is your own one-time link!</source>
        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Create one-time invitation link" xml:space="preserve">
-        <source>Create one-time invitation 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>
@@ -1380,6 +1430,10 @@ This is your own one-time link!</source>
        <target>Створено %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Creating link…" xml:space="preserve">
+        <source>Creating link…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Current Passcode" xml:space="preserve">
        <source>Current Passcode</source>
        <target>Поточний пароль</target>
@@ -1836,8 +1890,8 @@ This cannot be undone!</source>
        <source>Discover and join groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Discover via local network" xml:space="preserve">
+        <source>Discover via local network</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1850,6 +1904,10 @@ This cannot be undone!</source>
        <target>Зробіть це пізніше</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not send history to new members." xml:space="preserve">
+        <source>Do not send history to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Не створювати адресу</target>
@@ -1920,6 +1978,10 @@ This cannot be undone!</source>
        <target>Увімкнути автоматичне видалення повідомлень?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enable camera access" xml:space="preserve">
+        <source>Enable camera access</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
        <target>Увімкнути для всіх</target>
@@ -1983,6 +2045,10 @@ This cannot be undone!</source>
        <target>Зашифроване повідомлення або інша подія</target>
        <note>notification</note>
      </trans-unit>
+      <trans-unit id="Encrypted message: app is stopped" xml:space="preserve">
+        <source>Encrypted message: app is stopped</source>
+        <note>notification</note>
+      </trans-unit>
      <trans-unit id="Encrypted message: database error" xml:space="preserve">
        <source>Encrypted message: database error</source>
        <target>Зашифроване повідомлення: помилка бази даних</target>
@@ -2206,6 +2272,10 @@ This cannot be undone!</source>
        <target>Помилка завантаження %@ серверів</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error opening chat" xml:space="preserve">
+        <source>Error opening chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Помилка отримання файлу</target>
@@ -2246,6 +2316,10 @@ This cannot be undone!</source>
        <target>Помилка збереження пароля користувача</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error scanning code: %@" xml:space="preserve">
+        <source>Error scanning code: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error sending email" xml:space="preserve">
        <source>Error sending email</source>
        <target>Помилка надсилання електронного листа</target>
@@ -2369,6 +2443,10 @@ 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>
@@ -2464,6 +2542,10 @@ 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>
@@ -2561,9 +2643,9 @@ This cannot be undone!</source>
        <target>Учасники групи можуть додавати реакції на повідомлення.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group members can irreversibly delete sent messages." xml:space="preserve">
-        <source>Group members can irreversibly delete sent messages.</source>
-        <target>Учасники групи можуть безповоротно видаляти надіслані повідомлення.</target>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
+        <target>Учасники групи можуть безповоротно видаляти надіслані повідомлення. (24 години)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group members can send direct messages." xml:space="preserve">
@@ -2671,6 +2753,10 @@ This cannot be undone!</source>
        <target>Історія</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="History is not sent to new members." xml:space="preserve">
+        <source>History is not sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
        <target>Як працює SimpleX</target>
@@ -2706,11 +2792,6 @@ This cannot be undone!</source>
        <target>Якщо ви не можете зустрітися особисто, покажіть QR-код у відеодзвінку або поділіться посиланням.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link." xml:space="preserve">
-        <source>If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.</source>
-        <target>Якщо ви не можете зустрітися особисто, ви можете **сканувати QR-код у відеодзвінку**, або ваш контакт може поділитися посиланням на запрошення.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="If you enter this passcode when opening the app, all app data will be irreversibly removed!" xml:space="preserve">
        <source>If you enter this passcode when opening the app, all app data will be irreversibly removed!</source>
        <target>Якщо ви введете цей пароль при відкритті програми, всі дані програми будуть безповоротно видалені!</target>
@@ -2786,6 +2867,10 @@ 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>
@@ -2862,15 +2947,31 @@ This cannot be undone!</source>
        <target>Інтерфейс</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid QR code" xml:space="preserve">
+        <source>Invalid QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid connection link" xml:space="preserve">
        <source>Invalid connection link</source>
        <target>Неправильне посилання для підключення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid display name!" xml:space="preserve">
+        <source>Invalid display name!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Invalid link" xml:space="preserve">
+        <source>Invalid link</source>
+        <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 response" xml:space="preserve">
+        <source>Invalid response</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>
@@ -2985,10 +3086,18 @@ This is your link for group %@!</source>
        <target>Приєднання до групи</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep" xml:space="preserve">
+        <source>Keep</source>
+        <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 unused invitation?" xml:space="preserve">
+        <source>Keep unused invitation?</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>
@@ -3049,6 +3158,10 @@ 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>
@@ -3067,6 +3180,11 @@ This is your link for group %@!</source>
        <target>Живі повідомлення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Local" xml:space="preserve">
+        <source>Local</source>
+        <target>Локально</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Local name" xml:space="preserve">
        <source>Local name</source>
        <target>Місцева назва</target>
@@ -3306,6 +3424,10 @@ This is your link for group %@!</source>
        <target>Новий пароль</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New chat" xml:space="preserve">
+        <source>New chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New contact request" xml:space="preserve">
        <source>New contact request</source>
        <target>Новий запит на контакт</target>
@@ -3405,6 +3527,10 @@ 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>
@@ -3424,16 +3550,15 @@ This is your link for group %@!</source>
 - відключати користувачів (роль "спостерігач")</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="OK" xml:space="preserve">
+        <source>OK</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Off" xml:space="preserve">
        <source>Off</source>
        <target>Вимкнено</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Off (Local)" xml:space="preserve">
-        <source>Off (Local)</source>
-        <target>Вимкнено (локально)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Гаразд</target>
@@ -3494,9 +3619,9 @@ This is your link for group %@!</source>
        <target>Тільки ви можете додавати реакції на повідомлення.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion)." xml:space="preserve">
-        <source>Only you can irreversibly delete messages (your contact can mark them for deletion).</source>
-        <target>Тільки ви можете безповоротно видалити повідомлення (ваш контакт може позначити їх для видалення).</target>
+      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)</source>
+        <target>Тільки ви можете безповоротно видалити повідомлення (ваш контакт може позначити їх для видалення). (24 години)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only you can make calls." xml:space="preserve">
@@ -3519,9 +3644,9 @@ This is your link for group %@!</source>
        <target>Тільки ваш контакт може додавати реакції на повідомлення.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion)." xml:space="preserve">
-        <source>Only your contact can irreversibly delete messages (you can mark them for deletion).</source>
-        <target>Тільки ваш контакт може безповоротно видалити повідомлення (ви можете позначити їх для видалення).</target>
+      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)</source>
+        <target>Тільки ваш контакт може безповоротно видалити повідомлення (ви можете позначити їх для видалення). (24 години)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only your contact can make calls." xml:space="preserve">
@@ -3572,9 +3697,16 @@ This is your link for group %@!</source>
        <target>Протокол і код з відкритим вихідним кодом - будь-хто може запускати сервери.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Opening database…" xml:space="preserve">
-        <source>Opening database…</source>
-        <target>Відкриття бази даних…</target>
+      <trans-unit id="Opening app…" xml:space="preserve">
+        <source>Opening app…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or scan QR code" xml:space="preserve">
+        <source>Or scan QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or show this code" xml:space="preserve">
+        <source>Or show this code</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
@@ -3617,11 +3749,6 @@ This is your link for group %@!</source>
        <target>Показати пароль</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste" xml:space="preserve">
-        <source>Paste</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>
@@ -3631,16 +3758,10 @@ This is your link for group %@!</source>
        <target>Вставити зображення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste received link" xml:space="preserve">
-        <source>Paste received link</source>
-        <target>Вставте отримане посилання</target>
+      <trans-unit id="Paste the link you received" xml:space="preserve">
+        <source>Paste the link you received</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received to connect with your contact.</source>
-        <target>Вставте отримане посилання для зв'язку з вашим контактом.</target>
-        <note>placeholder</note>
-      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
        <target>Люди можуть зв'язатися з вами лише за посиланнями, якими ви ділитеся.</target>
@@ -3676,6 +3797,11 @@ This is your link for group %@!</source>
        <target>Будь ласка, перевірте свої та контактні налаштування.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
+        <source>Please contact developers.
+Error: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Please contact group admin." xml:space="preserve">
        <source>Please contact group admin.</source>
        <target>Зверніться до адміністратора групи.</target>
@@ -3879,6 +4005,10 @@ This is your link for group %@!</source>
        <target>Читайте більше в [Посібнику користувача](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode)." xml:space="preserve">
+        <source>Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends)." xml:space="preserve">
        <source>Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</source>
        <target>Читайте більше в [Посібнику користувача](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</target>
@@ -4087,6 +4217,10 @@ This is your link for group %@!</source>
        <target>Відновлення помилки бази даних</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Retry" xml:space="preserve">
+        <source>Retry</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Reveal" xml:space="preserve">
        <source>Reveal</source>
        <target>Показувати</target>
@@ -4241,6 +4375,10 @@ This is your link for group %@!</source>
        <target>Пошук</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Search or paste SimpleX link" xml:space="preserve">
+        <source>Search or paste SimpleX link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Secure queue" xml:space="preserve">
        <source>Secure queue</source>
        <target>Безпечна черга</target>
@@ -4345,6 +4483,10 @@ This is your link for group %@!</source>
        <target>Надсилайте їх із галереї чи власних клавіатур.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
+        <source>Send up to 100 last messages to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Відправник скасував передачу файлу.</target>
@@ -4514,9 +4656,8 @@ This is your link for group %@!</source>
        <target>Поділіться посиланням</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Share one-time invitation link" xml:space="preserve">
-        <source>Share one-time invitation link</source>
-        <target>Поділіться посиланням на одноразове запрошення</target>
+      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
+        <source>Share this 1-time invite link</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share with contacts" xml:space="preserve">
@@ -4638,16 +4779,15 @@ This is your link for group %@!</source>
        <target>Хтось</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="Start a new chat" xml:space="preserve">
-        <source>Start a new chat</source>
-        <target>Почніть новий чат</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
        <source>Start chat</source>
        <target>Почати чат</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Start chat?" xml:space="preserve">
+        <source>Start chat?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Start migration" xml:space="preserve">
        <source>Start migration</source>
        <target>Почати міграцію</target>
@@ -4772,6 +4912,14 @@ This is your link for group %@!</source>
        <target>Натисніть, щоб приєднатися інкогніто</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tap to paste link" xml:space="preserve">
+        <source>Tap to paste link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Tap to scan" xml:space="preserve">
+        <source>Tap to scan</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Tap to start a new chat" xml:space="preserve">
        <source>Tap to start a new chat</source>
        <target>Натисніть, щоб почати новий чат</target>
@@ -4834,6 +4982,10 @@ 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 code you scanned is not a SimpleX link QR code." xml:space="preserve">
+        <source>The code you scanned is not a SimpleX link QR code.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
        <source>The connection you accepted will be cancelled!</source>
        <target>Прийняте вами з'єднання буде скасовано!</target>
@@ -4899,6 +5051,10 @@ 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 text you pasted is not a SimpleX link." xml:space="preserve">
+        <source>The text you pasted is not a SimpleX link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Theme" xml:space="preserve">
        <source>Theme</source>
        <target>Тема</target>
@@ -4943,6 +5099,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <source>This device name</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
+        <source>This display name is invalid. Please choose another 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>
@@ -4976,6 +5136,10 @@ 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>
@@ -5042,11 +5206,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="Turn off notifications?" xml:space="preserve">
-        <source>Turn off notifications?</source>
-        <target>Вимкнути сповіщення?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Turn on" xml:space="preserve">
        <source>Turn on</source>
        <target>Ввімкнути</target>
@@ -5159,6 +5318,10 @@ 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="Up to 100 last messages are sent to new members." xml:space="preserve">
+        <source>Up to 100 last messages are sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Update" xml:space="preserve">
        <source>Update</source>
        <target>Оновлення</target>
@@ -5243,6 +5406,10 @@ 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 only local notifications?" xml:space="preserve">
+        <source>Use only local notifications?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>Використовувати сервер</target>
@@ -5290,6 +5457,10 @@ 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>
@@ -5315,6 +5486,10 @@ 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="Visible history" xml:space="preserve">
+        <source>Visible history</source>
+        <note>chat feature</note>
+      </trans-unit>
      <trans-unit id="Voice messages" xml:space="preserve">
        <source>Voice messages</source>
        <target>Голосові повідомлення</target>
@@ -5340,6 +5515,10 @@ 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>
@@ -5484,11 +5663,6 @@ Repeat join request?</source>
        <target>Ви можете приймати дзвінки з екрана блокування без автентифікації пристрою та програми.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button." xml:space="preserve">
-        <source>You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.</source>
-        <target>Ви також можете підключитися за посиланням. Якщо воно відкриється в браузері, натисніть кнопку **Відкрити в мобільному додатку**.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You can create it later" xml:space="preserve">
        <source>You can create it later</source>
        <target>Ви можете створити його пізніше</target>
@@ -5509,6 +5683,10 @@ Repeat join request?</source>
        <target>Ви можете приховати або вимкнути звук профілю користувача - проведіть по ньому вправо.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
+        <source>You can make it visible to your SimpleX contacts via Settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can now send messages to %@" xml:space="preserve">
        <source>You can now send messages to %@</source>
        <target>Тепер ви можете надсилати повідомлення на адресу %@</target>
@@ -5549,6 +5727,10 @@ Repeat join request?</source>
        <target>Ви можете використовувати розмітку для форматування повідомлень:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can view invitation link again in connection details." xml:space="preserve">
+        <source>You can view invitation link again in connection details.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can't send messages!" xml:space="preserve">
        <source>You can't send messages!</source>
        <target>Ви не можете надсилати повідомлення!</target>
@@ -5733,13 +5915,6 @@ You can cancel this connection and remove the contact (and try later with a new
        <target>Ваші контакти можуть дозволити повне видалення повідомлень.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your contacts in SimpleX will see it.&#10;You can change it in Settings." xml:space="preserve">
-        <source>Your contacts in SimpleX will see it.
-You can change it in Settings.</source>
-        <target>Ваші контакти в SimpleX побачать це.
-Ви можете змінити його в Налаштуваннях.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your contacts will remain connected." xml:space="preserve">
        <source>Your contacts will remain connected.</source>
        <target>Ваші контакти залишаться на зв'язку.</target>
@@ -5870,6 +6045,10 @@ SimpleX servers cannot see your profile.</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>
@@ -303,14 +303,17 @@
        <target>)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve">
+        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve">
        <source>**Add new contact**: to create your one-time QR Code or link for your contact.</source>
        <target>**添加新联系人**：为您的联系人创建一次性二维码或者链接。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve">
-        <source>**Create link / QR code** for your contact to use.</source>
-        <target>**创建链接 / 二维码** 给您的联系人使用。</target>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve">
+        <source>**Create group**: to create a new group.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve">
@@ -323,11 +326,6 @@
        <target>**最私密**：不使用 SimpleX Chat 通知服务器，在后台定期检查消息（取决于您多经常使用应用程序）。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve">
-        <source>**Paste received link** or open it in the browser and tap **Open in mobile app**.</source>
-        <target>**粘贴收到的链接**或者在浏览器里打开并且点击**在移动应用程序里打开**。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve">
        <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
        <target>**请注意**：如果您丢失密码，您将无法恢复或者更改密码。</target>
@@ -338,11 +336,6 @@
        <target>**推荐**：设备令牌和通知会发送至 SimpleX Chat 通知服务器，但是消息内容、大小或者发送人不会。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="**Scan QR code**: to connect to your contact in person or via video call." xml:space="preserve">
-        <source>**Scan QR code**: to connect to your contact in person or via video call.</source>
-        <target>**扫描二维码**：见面或者通过视频通话来连接您的联系人。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="**Warning**: Instant push notifications require passphrase saved in Keychain." xml:space="preserve">
        <source>**Warning**: Instant push notifications require passphrase saved in Keychain.</source>
        <target>**警告**：及时推送通知需要保存在钥匙串的密码。</target>
@@ -386,6 +379,12 @@
 - 以及更多！</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.
@@ -434,11 +433,6 @@
        <target>1周</target>
        <note>time interval</note>
      </trans-unit>
-      <trans-unit id="1-time link" xml:space="preserve">
-        <source>1-time link</source>
-        <target>一次性链接</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="5 minutes" xml:space="preserve">
        <source>5 minutes</source>
        <target>5分钟</target>
@@ -554,6 +548,10 @@
        <target>将地址添加到您的个人资料，以便您的联系人可以与其他人共享。个人资料更新将发送给您的联系人。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve">
+        <source>Add contact</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Add preset servers" xml:space="preserve">
        <source>Add preset servers</source>
        <target>添加预设服务器</target>
@@ -658,8 +656,8 @@
        <target>仅当您的联系人允许时才允许限时消息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you." xml:space="preserve">
-        <source>Allow irreversible message deletion only if your contact allows it to you.</source>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
        <target>仅有您的联系人许可后才允许不可撤回消息移除。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -683,8 +681,8 @@
        <target>允许发送限时消息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow to irreversibly delete sent messages.</source>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
        <target>允许不可撤回地删除已发送消息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -718,8 +716,8 @@
        <target>允许您的联系人给您打电话。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Allow your contacts to irreversibly delete sent messages." xml:space="preserve">
-        <source>Allow your contacts to irreversibly delete sent messages.</source>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
        <target>允许您的联系人不可撤回地删除已发送消息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -880,6 +878,10 @@
        <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>
@@ -889,6 +891,10 @@
        <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>
@@ -902,8 +908,8 @@
        <target>您和您的联系人都可以添加消息回应。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Both you and your contact can irreversibly delete sent messages." xml:space="preserve">
-        <source>Both you and your contact can irreversibly delete sent messages.</source>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
        <target>您和您的联系人都可以不可逆转地删除已发送的消息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -942,6 +948,10 @@
        <target>通话</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve">
+        <source>Camera not available</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Can't delete user profile!" xml:space="preserve">
        <source>Can't delete user profile!</source>
        <target>无法删除用户个人资料！</target>
@@ -1058,6 +1068,10 @@
        <target>聊天已停止</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat." xml:space="preserve">
+        <source>Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat preferences" xml:space="preserve">
        <source>Chat preferences</source>
        <target>聊天偏好设置</target>
@@ -1158,6 +1172,10 @@
        <target>连接</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Connect automatically" xml:space="preserve">
+        <source>Connect automatically</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Connect incognito" xml:space="preserve">
        <source>Connect incognito</source>
        <target>在隐身状态下连接</target>
@@ -1190,11 +1208,6 @@ This is your own one-time link!</source>
        <target>通过链接连接</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Connect via link / QR code" xml:space="preserve">
-        <source>Connect via link / QR code</source>
-        <target>通过群组链接/二维码连接</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Connect via one-time link" xml:space="preserve">
        <source>Connect via one-time link</source>
        <target>通过一次性链接连接</target>
@@ -1329,6 +1342,10 @@ 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>
@@ -1358,11 +1375,6 @@ This is your own one-time link!</source>
        <target>在[桌面应用程序](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">
-        <source>Create one-time invitation 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>
@@ -1387,6 +1399,10 @@ This is your own one-time link!</source>
        <target>创建于 %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Creating link…" xml:space="preserve">
+        <source>Creating link…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Current Passcode" xml:space="preserve">
        <source>Current Passcode</source>
        <target>当前密码</target>
@@ -1844,8 +1860,8 @@ This cannot be undone!</source>
        <target>发现和加入群组</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Discover on network" xml:space="preserve">
-        <source>Discover on network</source>
+      <trans-unit id="Discover via local network" xml:space="preserve">
+        <source>Discover via local network</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Do NOT use SimpleX for emergency calls." xml:space="preserve">
@@ -1858,6 +1874,10 @@ This cannot be undone!</source>
        <target>稍后再做</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not send history to new members." xml:space="preserve">
+        <source>Do not send history to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>不创建地址</target>
@@ -1928,6 +1948,10 @@ This cannot be undone!</source>
        <target>启用自动删除消息？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Enable camera access" xml:space="preserve">
+        <source>Enable camera access</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Enable for all" xml:space="preserve">
        <source>Enable for all</source>
        <target>全部启用</target>
@@ -1993,6 +2017,10 @@ This cannot be undone!</source>
        <target>加密消息或其他事件</target>
        <note>notification</note>
      </trans-unit>
+      <trans-unit id="Encrypted message: app is stopped" xml:space="preserve">
+        <source>Encrypted message: app is stopped</source>
+        <note>notification</note>
+      </trans-unit>
      <trans-unit id="Encrypted message: database error" xml:space="preserve">
        <source>Encrypted message: database error</source>
        <target>加密消息：数据库错误</target>
@@ -2218,6 +2246,10 @@ This cannot be undone!</source>
        <target>加载 %@ 服务器错误</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error opening chat" xml:space="preserve">
+        <source>Error opening chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>接收文件错误</target>
@@ -2258,6 +2290,10 @@ This cannot be undone!</source>
        <target>保存用户密码时出错</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error scanning code: %@" xml:space="preserve">
+        <source>Error scanning code: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error sending email" xml:space="preserve">
        <source>Error sending email</source>
        <target>发送电邮错误</target>
@@ -2382,6 +2418,10 @@ 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>
@@ -2477,6 +2517,10 @@ 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>
@@ -2574,8 +2618,8 @@ This cannot be undone!</source>
        <target>群组成员可以添加信息回应。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Group members can irreversibly delete sent messages." xml:space="preserve">
-        <source>Group members can irreversibly delete sent messages.</source>
+      <trans-unit id="Group members can irreversibly delete sent messages. (24 hours)" xml:space="preserve">
+        <source>Group members can irreversibly delete sent messages. (24 hours)</source>
        <target>群组成员可以不可撤回地删除已发送的消息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -2684,6 +2728,10 @@ This cannot be undone!</source>
        <target>历史记录</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="History is not sent to new members." xml:space="preserve">
+        <source>History is not sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="How SimpleX works" xml:space="preserve">
        <source>How SimpleX works</source>
        <target>SimpleX的工作原理</target>
@@ -2719,11 +2767,6 @@ This cannot be undone!</source>
        <target>如果您不能亲自见面，可以在视频通话中展示二维码，或分享链接。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link." xml:space="preserve">
-        <source>If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.</source>
-        <target>如果您不能亲自见面，您可以**扫描视频通话中的二维码**，或者您的联系人可以分享邀请链接。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="If you enter this passcode when opening the app, all app data will be irreversibly removed!" xml:space="preserve">
        <source>If you enter this passcode when opening the app, all app data will be irreversibly removed!</source>
        <target>如果您在打开应用时输入该密码，所有应用程序数据将被不可撤回地删除！</target>
@@ -2799,6 +2842,10 @@ 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>
@@ -2875,15 +2922,31 @@ This cannot be undone!</source>
        <target>界面</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid QR code" xml:space="preserve">
+        <source>Invalid QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Invalid connection link" xml:space="preserve">
        <source>Invalid connection link</source>
        <target>无效的连接链接</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Invalid display name!" xml:space="preserve">
+        <source>Invalid display name!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Invalid link" xml:space="preserve">
+        <source>Invalid link</source>
+        <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 response" xml:space="preserve">
+        <source>Invalid response</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>
@@ -2998,10 +3061,18 @@ This is your link for group %@!</source>
        <target>加入群组中</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Keep" xml:space="preserve">
+        <source>Keep</source>
+        <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 unused invitation?" xml:space="preserve">
+        <source>Keep unused invitation?</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>
@@ -3062,6 +3133,10 @@ 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>
@@ -3080,6 +3155,11 @@ This is your link for group %@!</source>
        <target>实时消息</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Local" xml:space="preserve">
+        <source>Local</source>
+        <target>本地</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Local name" xml:space="preserve">
        <source>Local name</source>
        <target>本地名称</target>
@@ -3319,6 +3399,10 @@ This is your link for group %@!</source>
        <target>新密码</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New chat" xml:space="preserve">
+        <source>New chat</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New contact request" xml:space="preserve">
        <source>New contact request</source>
        <target>新联系人请求</target>
@@ -3419,6 +3503,10 @@ 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>
@@ -3438,16 +3526,15 @@ This is your link for group %@!</source>
 - 禁用成员（“观察员”角色）</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="OK" xml:space="preserve">
+        <source>OK</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Off" xml:space="preserve">
        <source>Off</source>
        <target>关闭</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Off (Local)" xml:space="preserve">
-        <source>Off (Local)</source>
-        <target>关闭（本地）</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>好的</target>
@@ -3508,8 +3595,8 @@ This is your link for group %@!</source>
        <target>只有您可以添加消息回应。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion)." xml:space="preserve">
-        <source>Only you can irreversibly delete messages (your contact can mark them for deletion).</source>
+      <trans-unit id="Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only you can irreversibly delete messages (your contact can mark them for deletion). (24 hours)</source>
        <target>只有您可以不可撤回地删除消息（您的联系人可以将它们标记为删除）。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3533,8 +3620,8 @@ This is your link for group %@!</source>
        <target>只有您的联系人可以添加消息回应。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion)." xml:space="preserve">
-        <source>Only your contact can irreversibly delete messages (you can mark them for deletion).</source>
+      <trans-unit id="Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)" xml:space="preserve">
+        <source>Only your contact can irreversibly delete messages (you can mark them for deletion). (24 hours)</source>
        <target>只有您的联系人才能不可撤回地删除消息（您可以将它们标记为删除）。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -3587,9 +3674,16 @@ This is your link for group %@!</source>
        <target>开源协议和代码——任何人都可以运行服务器。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Opening database…" xml:space="preserve">
-        <source>Opening database…</source>
-        <target>打开数据库中……</target>
+      <trans-unit id="Opening app…" xml:space="preserve">
+        <source>Opening app…</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or scan QR code" xml:space="preserve">
+        <source>Or scan QR code</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Or show this code" xml:space="preserve">
+        <source>Or show this code</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
@@ -3632,11 +3726,6 @@ This is your link for group %@!</source>
        <target>显示密码</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste" xml:space="preserve">
-        <source>Paste</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>
@@ -3646,16 +3735,10 @@ This is your link for group %@!</source>
        <target>粘贴图片</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste received link" xml:space="preserve">
-        <source>Paste received link</source>
-        <target>粘贴收到的链接</target>
+      <trans-unit id="Paste the link you received" xml:space="preserve">
+        <source>Paste the link you received</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Paste the link you received to connect with your contact." xml:space="preserve">
-        <source>Paste the link you received to connect with your contact.</source>
-        <target>将您收到的链接粘贴到下面的框中以与您的联系人联系。</target>
-        <note>placeholder</note>
-      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
        <source>People can connect to you only via the links you share.</source>
        <target>人们只能通过您共享的链接与您建立联系。</target>
@@ -3691,6 +3774,11 @@ This is your link for group %@!</source>
        <target>请检查您和您的联系人偏好设置。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Please contact developers.&#10;Error: %@" xml:space="preserve">
+        <source>Please contact developers.
+Error: %@</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Please contact group admin." xml:space="preserve">
        <source>Please contact group admin.</source>
        <target>请联系群组管理员。</target>
@@ -3894,6 +3982,10 @@ This is your link for group %@!</source>
        <target>在 [用户指南](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address) 中阅读更多内容。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode)." xml:space="preserve">
+        <source>Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends)." xml:space="preserve">
        <source>Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends).</source>
        <target>在 [用户指南](https://simplex.chat/docs/guide/readme.html#connect-to-friends) 中阅读更多内容。</target>
@@ -4102,6 +4194,10 @@ This is your link for group %@!</source>
        <target>恢复数据库错误</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Retry" xml:space="preserve">
+        <source>Retry</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Reveal" xml:space="preserve">
        <source>Reveal</source>
        <target>揭示</target>
@@ -4256,6 +4352,10 @@ This is your link for group %@!</source>
        <target>搜索</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Search or paste SimpleX link" xml:space="preserve">
+        <source>Search or paste SimpleX link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Secure queue" xml:space="preserve">
        <source>Secure queue</source>
        <target>保护队列</target>
@@ -4361,6 +4461,10 @@ This is your link for group %@!</source>
        <target>发送它们来自图库或自定义键盘。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Send up to 100 last messages to new members." xml:space="preserve">
+        <source>Send up to 100 last messages to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>发送人已取消文件传输。</target>
@@ -4530,9 +4634,8 @@ This is your link for group %@!</source>
        <target>分享链接</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Share one-time invitation link" xml:space="preserve">
-        <source>Share one-time invitation link</source>
-        <target>分享一次性邀请链接</target>
+      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
+        <source>Share this 1-time invite link</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share with contacts" xml:space="preserve">
@@ -4655,16 +4758,15 @@ This is your link for group %@!</source>
        <target>某人</target>
        <note>notification title</note>
      </trans-unit>
-      <trans-unit id="Start a new chat" xml:space="preserve">
-        <source>Start a new chat</source>
-        <target>开始新聊天</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Start chat" xml:space="preserve">
        <source>Start chat</source>
        <target>开始聊天</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Start chat?" xml:space="preserve">
+        <source>Start chat?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Start migration" xml:space="preserve">
        <source>Start migration</source>
        <target>开始迁移</target>
@@ -4789,6 +4891,14 @@ This is your link for group %@!</source>
        <target>点击以加入隐身聊天</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tap to paste link" xml:space="preserve">
+        <source>Tap to paste link</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Tap to scan" xml:space="preserve">
+        <source>Tap to scan</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Tap to start a new chat" xml:space="preserve">
        <source>Tap to start a new chat</source>
        <target>点击开始一个新聊天</target>
@@ -4851,6 +4961,10 @@ 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 code you scanned is not a SimpleX link QR code." xml:space="preserve">
+        <source>The code you scanned is not a SimpleX link QR code.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
        <source>The connection you accepted will be cancelled!</source>
        <target>您接受的连接将被取消！</target>
@@ -4916,6 +5030,10 @@ 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 text you pasted is not a SimpleX link." xml:space="preserve">
+        <source>The text you pasted is not a SimpleX link.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Theme" xml:space="preserve">
        <source>Theme</source>
        <target>主题</target>
@@ -4960,6 +5078,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <source>This device name</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
+        <source>This display name is invalid. Please choose another 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>
@@ -4993,6 +5115,10 @@ 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>
@@ -5060,11 +5186,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="Turn off notifications?" xml:space="preserve">
-        <source>Turn off notifications?</source>
-        <target>关闭通知？</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Turn on" xml:space="preserve">
        <source>Turn on</source>
        <target>打开</target>
@@ -5177,6 +5298,10 @@ 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="Up to 100 last messages are sent to new members." xml:space="preserve">
+        <source>Up to 100 last messages are sent to new members.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Update" xml:space="preserve">
        <source>Update</source>
        <target>更新</target>
@@ -5261,6 +5386,10 @@ 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 only local notifications?" xml:space="preserve">
+        <source>Use only local notifications?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use server" xml:space="preserve">
        <source>Use server</source>
        <target>使用服务器</target>
@@ -5308,6 +5437,10 @@ 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>
@@ -5333,6 +5466,10 @@ 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="Visible history" xml:space="preserve">
+        <source>Visible history</source>
+        <note>chat feature</note>
+      </trans-unit>
      <trans-unit id="Voice messages" xml:space="preserve">
        <source>Voice messages</source>
        <target>语音消息</target>
@@ -5358,6 +5495,10 @@ 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>
@@ -5502,11 +5643,6 @@ Repeat join request?</source>
        <target>您可以从锁屏上接听电话，无需设备和应用程序的认证。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button." xml:space="preserve">
-        <source>You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.</source>
-        <target>您也可以通过点击链接进行连接。如果在浏览器中打开，请点击“在移动应用程序中打开”按钮。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You can create it later" xml:space="preserve">
        <source>You can create it later</source>
        <target>您可以以后创建它</target>
@@ -5527,6 +5663,10 @@ Repeat join request?</source>
        <target>您可以隐藏或静音用户个人资料——只需向右滑动。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
+        <source>You can make it visible to your SimpleX contacts via Settings.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can now send messages to %@" xml:space="preserve">
        <source>You can now send messages to %@</source>
        <target>您现在可以给 %@ 发送消息</target>
@@ -5567,6 +5707,10 @@ Repeat join request?</source>
        <target>您可以使用 markdown 来编排消息格式：</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="You can view invitation link again in connection details." xml:space="preserve">
+        <source>You can view invitation link again in connection details.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="You can't send messages!" xml:space="preserve">
        <source>You can't send messages!</source>
        <target>您无法发送消息！</target>
@@ -5751,13 +5895,6 @@ You can cancel this connection and remove the contact (and try later with a new
        <target>您的联系人可以允许完全删除消息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your contacts in SimpleX will see it.&#10;You can change it in Settings." xml:space="preserve">
-        <source>Your contacts in SimpleX will see it.
-You can change it in Settings.</source>
-        <target>您的 SimpleX 的联系人会看到它。
-您可以在设置中更改它。</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Your contacts will remain connected." xml:space="preserve">
        <source>Your contacts will remain connected.</source>
        <target>与您的联系人保持连接。</target>
@@ -5888,6 +6025,10 @@ SimpleX 服务器无法看到您的资料。</target>
        <target>语音通话（非端到端加密）</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>
@@ -5868,6 +5868,36 @@ It can happen because of some bug or when the connection is compromised.</source
        <target state="translated">你和你的聯絡人可以新增訊息互動。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ connected" xml:space="preserve" approved="no">
+        <source>%@ connected</source>
+        <target state="translated">%@ 已連接</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="# %@" xml:space="preserve" approved="no">
+        <source># %@</source>
+        <target state="translated"># %@</target>
+        <note>copied message info title, # &lt;title&gt;</note>
+      </trans-unit>
+      <trans-unit id="%@ and %@" xml:space="preserve" approved="no">
+        <source>%@ and %@</source>
+        <target state="translated">%@ 和 %@</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="## History" xml:space="preserve" approved="no">
+        <source>## History</source>
+        <target state="translated">紀錄</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="## In reply to" xml:space="preserve" approved="no">
+        <source>## In reply to</source>
+        <target state="translated">回覆</target>
+        <note>copied message info</note>
+      </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve" approved="no">
+        <source>%@ and %@ connected</source>
+        <target state="translated">%@ 和 %@ 已連接</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="zh-Hant" datatype="plaintext">
@@ -0,0 +1,64 @@
+//
+//  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,91 +14,233 @@ import SimpleXChat

 let logger = Logger()

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

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

+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) {
-        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 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 readStream(_ id: String, for nse: NotificationService, msgCount: Int = 1, showNotifications: Bool) async {
-        logger.debug("PendingNtfs.readStream: \(id, privacy: .public) \(msgCount, privacy: .public)")
+    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)
+        }
        if let s = ntfStreams[id] {
-            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 }
+            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: exiting")
+            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")
        }
    }

-    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)
+    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
+            }
        }
    }
 }

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

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

+// 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")
-        if let ntf = request.content.mutableCopy() as? UNMutableNotificationContent {
-            setBestAttemptNtf(ntf)
-        }
+        let ntf = if let ntf_ = request.content.mutableCopy() as? UNMutableNotificationContent { ntf_ } else { 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 {
-                var state = appState
-                for _ in 1...5 {
-                    _ = try await Task.sleep(nanoseconds: suspendingDelay)
-                    state = appStateGroupDefault.get()
-                    if state == .suspended || state != .suspending { break }
+                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)
+                        }
+                    }
                }
-                logger.debug("NotificationService: app state is \(state.rawValue, privacy: .public)")
+                logger.debug("NotificationService: app state is now \(state.rawValue)")
                if state.inactive {
                    receiveNtfMessages(request, contentHandler)
                } else {
@@ -106,7 +248,6 @@ class NotificationService: UNNotificationServiceExtension {
                }
            }
        default:
-            logger.debug("NotificationService: app state is \(appState.rawValue, privacy: .public)")
            deliverBestAttemptNtf()
        }
    }
@@ -121,27 +262,35 @@ class NotificationService: UNNotificationServiceExtension {
        if let ntfData = userInfo["notificationData"] as? [AnyHashable : Any],
           let nonce = ntfData["nonce"] as? String,
           let encNtfInfo = ntfData["message"] as? String,
-           let dbStatus = startChat() {
+           // 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()
            if case .ok = dbStatus,
-               let ntfMsgInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
-                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfMsgInfo), privacy: .public)")
-                if let connEntity = ntfMsgInfo.connEntity {
+               let ntfInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
+                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfInfo.ntfMessages.count))")
+                if let connEntity = ntfInfo.connEntity_ {
                    setBestAttemptNtf(
-                        ntfMsgInfo.ntfsEnabled
-                        ? .nse(notification: createConnectionEventNtf(ntfMsgInfo.user, connEntity))
+                        ntfInfo.ntfsEnabled
+                        ? .nse(createConnectionEventNtf(ntfInfo.user, connEntity))
                        : .empty
                    )
                    if let id = connEntity.id {
-                        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()
+                        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()
+                            }
                        }
+                        return
                    }
                }
-                return
-            } else {
+            } else if let dbStatus = dbStatus {
                setBestAttemptNtf(createErrorNtf(dbStatus))
            }
        }
@@ -150,7 +299,7 @@ class NotificationService: UNNotificationServiceExtension {

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

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

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

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

-    private func deliverBestAttemptNtf() {
+    private func deliverBestAttemptNtf(urgent: Bool = false) {
        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): handler(content)
+            case let .nse(content): deliver(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
-                    if error == nil {
-                        handler(UNMutableNotificationContent())
-                    } else {
-                        logger.debug("reportNewIncomingVoIPPushPayload success to CallController for \(invitation.contact.id)")
-                        handler(createCallInvitationNtf(invitation))
-                    }
+                    logger.debug("reportNewIncomingVoIPPushPayload result: \(error)")
+                    deliver(error == nil ? nil : createCallInvitationNtf(invitation))
                }
-            case .empty: handler(UNMutableNotificationContent())
+            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
            }
-            bestAttemptNtf = nil
        }
    }
 }

-var chatStarted = false
-var networkConfig: NetCfg = getNetCfg()
-var xftpConfig: XFTPFileConfig? = getXFTPCfg()
+// 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 networkConfig: NetCfg = getNetCfg()
+let 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? {
-    hs_init(0, nil)
-    if chatStarted { return .ok }
-    let (_, dbStatus) = chatMigrateInit(confirmMigrations: defaultMigrationConfirmation())
+    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))")
    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("active user \(String(describing: user))")
+        logger.debug("NotificationService 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())
-            let justStarted = try apiStartChat()
-            chatStarted = true
-            if justStarted {
-                chatLastStartGroupDefault.set(Date.now)
-                Task { await receiveMessages() }
+            // 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
            }
-            return .ok
        } catch {
-            logger.error("NotificationService startChat error: \(responseError(error), privacy: .public)")
+            logger.error("NotificationService startChat error: \(responseError(error))")
        }
    } else {
-        logger.debug("no active user")
+        logger.debug("NotificationService: 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 {
-        updateNetCfg()
+        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 {
        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? {
@@ -257,14 +616,14 @@ private let isInChina = SKStorefront().countryCode == "CHN"
 private func useCallKit() -> Bool { !isInChina && callKitEnabledGroupDefault.get() }

 func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
-    logger.debug("NotificationService processReceivedMsg: \(res.responseType)")
+    logger.debug("NotificationService receivedMsgNtf: \(res.responseType)")
    switch res {
    case let .contactConnected(user, contact, _):
-        return (contact.id, .nse(notification: createContactConnectedNtf(user, contact)))
+        return (contact.id, .nse(createContactConnectedNtf(user, contact)))
 //        case let .contactConnecting(contact):
 //            TODO profile update
    case let .receivedContactRequest(user, contactRequest):
-        return (UserContact(contactRequest: contactRequest).id, .nse(notification: createContactRequestNtf(user, contactRequest)))
+        return (UserContact(contactRequest: contactRequest).id, .nse(createContactRequestNtf(user, contactRequest)))
    case let .newChatItem(user, aChatItem):
        let cInfo = aChatItem.chatInfo
        var cItem = aChatItem.chatItem
@@ -274,7 +633,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(notification: createMessageReceivedNtf(user, cInfo, cItem)) : .empty
+        let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(createMessageReceivedNtf(user, cInfo, cItem)) : .empty
        return cItem.showNotification ? (aChatItem.chatId, ntf) : nil
    case let .rcvFileSndCancelled(_, aChatItem, _):
        cleanupFile(aChatItem)
@@ -292,10 +651,18 @@ 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: invitation) : .nse(notification: createCallInvitationNtf(invitation))
+            useCallKit() ? .callkit(invitation) : .nse(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 processReceivedMsg ignored event: \(res.responseType)")
+        logger.debug("NotificationService receivedMsgNtf ignored event: \(res.responseType)")
        return nil
    }
 }
@@ -308,17 +675,22 @@ func updateNetCfg() {
            try setNetworkConfig(networkConfig)
            networkConfig = newNetConfig
        } catch {
-            logger.error("NotificationService apply changed network config error: \(responseError(error), privacy: .public)")
+            logger.error("NotificationService apply changed network config error: \(responseError(error))")
        }
    }
 }

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

 func apiStartChat() throws -> Bool {
-    let r = sendSimpleXCmd(.startChat(subscribe: false, expire: false, xftp: false))
+    let r = sendSimpleXCmd(.startChat(mainApp: false))
    switch r {
    case .chatStarted: return true
    case .chatRunning: return false
@@ -334,6 +706,21 @@ 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 }
@@ -364,12 +751,13 @@ 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 {
-        return NtfMessages(user: user, connEntity: connEntity, msgTs: msgTs, ntfMessages: ntfMessages)
+    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)
    } else if case let .chatCmdError(_, error) = r {
        logger.debug("apiGetNtfMessage error response: \(String.init(describing: error))")
    } else {
-        logger.debug("apiGetNtfMessage ignored response: \(r.responseType, privacy: .public) \(String.init(describing: r), privacy: .private)")
+        logger.debug("apiGetNtfMessage ignored response: \(r.responseType) \(String.init(describing: r))")
    }
    return nil
 }
@@ -405,11 +793,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)
    }
 }
@@ -0,0 +1,9 @@
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX NSE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX NSE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Telif Hakkı © 2024 SimpleX Chat. Tüm hakları saklıdır.";
+
@@ -16,7 +16,6 @@
 		18415C6C56DBCEC2CBBD2F11 /* WebRTCClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18415323A4082FC92887F906 /* WebRTCClient.swift */; };
 		18415F9A2D551F9757DA4654 /* CIVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18415FD2E36F13F596A45BB4 /* CIVideoView.swift */; };
 		18415FEFE153C5920BFB7828 /* GroupWelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1841516F0CE5992B0EDFB377 /* GroupWelcomeView.swift */; };
-		3C8C548928133C84000A3EC7 /* PasteToConnectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C8C548828133C84000A3EC7 /* PasteToConnectView.swift */; };
 		3CDBCF4227FAE51000354CDD /* ComposeLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CDBCF4127FAE51000354CDD /* ComposeLinkView.swift */; };
 		3CDBCF4827FF621E00354CDD /* CILinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CDBCF4727FF621E00354CDD /* CILinkView.swift */; };
 		5C00164428A26FBC0094D739 /* ContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C00164328A26FBC0094D739 /* ContextMenu.swift */; };
@@ -30,6 +29,11 @@
 		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 */; };
+		5C245F372B4ED5BE001CC39F /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F322B4ED5BE001CC39F /* libgmpxx.a */; };
+		5C245F382B4ED5BE001CC39F /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F332B4ED5BE001CC39F /* libgmp.a */; };
+		5C245F392B4ED5BE001CC39F /* libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F342B4ED5BE001CC39F /* libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V-ghc9.6.3.a */; };
+		5C245F3A2B4ED5BE001CC39F /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F352B4ED5BE001CC39F /* libffi.a */; };
+		5C245F3B2B4ED5BE001CC39F /* libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C245F362B4ED5BE001CC39F /* libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V.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 */; };
@@ -56,7 +60,6 @@
 		5C5F2B7027EBC704006A9D5F /* ProfileImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5F2B6F27EBC704006A9D5F /* ProfileImage.swift */; };
 		5C65DAF929D0CC20003CEE45 /* DeveloperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C65DAF829D0CC20003CEE45 /* DeveloperView.swift */; };
 		5C65F343297D45E100B67AF3 /* VersionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C65F341297D3F3600B67AF3 /* VersionView.swift */; };
-		5C6AD81327A834E300348BD7 /* NewChatButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C6AD81227A834E300348BD7 /* NewChatButton.swift */; };
 		5C6BA667289BD954009B8ECC /* DismissSheets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C6BA666289BD954009B8ECC /* DismissSheets.swift */; };
 		5C7031162953C97F00150A12 /* CIFeaturePreferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7031152953C97F00150A12 /* CIFeaturePreferenceView.swift */; };
 		5C7505A227B65FDB00BE3227 /* CIMetaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7505A127B65FDB00BE3227 /* CIMetaView.swift */; };
@@ -93,8 +96,6 @@
 		5CB0BA92282713FD00B3292C /* CreateProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB0BA91282713FD00B3292C /* CreateProfile.swift */; };
 		5CB0BA9A2827FD8800B3292C /* HowItWorks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB0BA992827FD8800B3292C /* HowItWorks.swift */; };
 		5CB2084F28DA4B4800D024EC /* RTCServers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB2084E28DA4B4800D024EC /* RTCServers.swift */; };
-		5CB2085128DB64CA00D024EC /* CreateLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB2085028DB64CA00D024EC /* CreateLinkView.swift */; };
-		5CB2085328DB7CAF00D024EC /* ConnectViaLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB2085228DB7CAF00D024EC /* ConnectViaLinkView.swift */; };
 		5CB346E52868AA7F001FD2EF /* SuspendChat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB346E42868AA7F001FD2EF /* SuspendChat.swift */; };
 		5CB346E72868D76D001FD2EF /* NotificationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB346E62868D76D001FD2EF /* NotificationsView.swift */; };
 		5CB346E92869E8BA001FD2EF /* PushEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB346E82869E8BA001FD2EF /* PushEnvironment.swift */; };
@@ -116,13 +117,8 @@
 		5CC2C0FF2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5CC2C0FD2809BF11000C35E3 /* SimpleX--iOS--InfoPlist.strings */; };
 		5CC868F329EB540C0017BBFD /* CIRcvDecryptionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CC868F229EB540C0017BBFD /* CIRcvDecryptionError.swift */; };
 		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 */; };
-		5CDA5A2D2B04FE2D00A71D61 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CDA5A282B04FE2D00A71D61 /* libgmp.a */; };
-		5CDA5A2E2B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CDA5A292B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a */; };
-		5CDA5A2F2B04FE2D00A71D61 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CDA5A2A2B04FE2D00A71D61 /* libffi.a */; };
-		5CDA5A302B04FE2D00A71D61 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CDA5A2B2B04FE2D00A71D61 /* libgmpxx.a */; };
-		5CDA5A312B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CDA5A2C2B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a */; };
+		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 */; };
 		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, ); }; };
@@ -148,10 +144,15 @@
 		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 */; };
 		5CFE0922282EEAF60002594B /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */; };
+		640417CD2B29B8C200CCB412 /* NewChatMenuButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 640417CB2B29B8C200CCB412 /* NewChatMenuButton.swift */; };
+		640417CE2B29B8C200CCB412 /* NewChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 640417CC2B29B8C200CCB412 /* NewChatView.swift */; };
 		6407BA83295DA85D0082BA18 /* CIInvalidJSONView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6407BA82295DA85D0082BA18 /* CIInvalidJSONView.swift */; };
 		6419EC562AB8BC8B004A607A /* ContextInvitingContactMemberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */; };
 		6419EC582AB97507004A607A /* CIMemberCreatedContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */; };
@@ -183,6 +184,7 @@
 		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 */; };
@@ -257,7 +259,6 @@
 		18415B08031E8FB0F7FC27F9 /* CallViewRenderers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallViewRenderers.swift; sourceTree = "<group>"; };
 		18415DAAAD1ADBEDB0EDA852 /* VideoPlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoPlayerView.swift; sourceTree = "<group>"; };
 		18415FD2E36F13F596A45BB4 /* CIVideoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CIVideoView.swift; sourceTree = "<group>"; };
-		3C8C548828133C84000A3EC7 /* PasteToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteToConnectView.swift; sourceTree = "<group>"; };
 		3CDBCF4127FAE51000354CDD /* ComposeLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeLinkView.swift; sourceTree = "<group>"; };
 		3CDBCF4727FF621E00354CDD /* CILinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CILinkView.swift; sourceTree = "<group>"; };
 		5C00164328A26FBC0094D739 /* ContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextMenu.swift; sourceTree = "<group>"; };
@@ -274,6 +275,14 @@
 		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>"; };
+		5C245F322B4ED5BE001CC39F /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		5C245F332B4ED5BE001CC39F /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5C245F342B4ED5BE001CC39F /* libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V-ghc9.6.3.a"; sourceTree = "<group>"; };
+		5C245F352B4ED5BE001CC39F /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5C245F362B4ED5BE001CC39F /* libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V.a"; sourceTree = "<group>"; };
+		5C245F3C2B501E98001CC39F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
+		5C245F3D2B501F13001CC39F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = "tr.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
+		5C245F3E2B501F13001CC39F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; 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>"; };
@@ -313,7 +322,6 @@
 		5C65DAED29CB8908003CEE45 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5C65DAF829D0CC20003CEE45 /* DeveloperView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperView.swift; sourceTree = "<group>"; };
 		5C65F341297D3F3600B67AF3 /* VersionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionView.swift; sourceTree = "<group>"; };
-		5C6AD81227A834E300348BD7 /* NewChatButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewChatButton.swift; sourceTree = "<group>"; };
 		5C6BA666289BD954009B8ECC /* DismissSheets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DismissSheets.swift; sourceTree = "<group>"; };
 		5C6D183229E93FBA00D430B3 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = "pl.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5C6D183329E93FBA00D430B3 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -370,8 +378,6 @@
 		5CB0BA91282713FD00B3292C /* CreateProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateProfile.swift; sourceTree = "<group>"; };
 		5CB0BA992827FD8800B3292C /* HowItWorks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HowItWorks.swift; sourceTree = "<group>"; };
 		5CB2084E28DA4B4800D024EC /* RTCServers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RTCServers.swift; sourceTree = "<group>"; };
-		5CB2085028DB64CA00D024EC /* CreateLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateLinkView.swift; sourceTree = "<group>"; };
-		5CB2085228DB7CAF00D024EC /* ConnectViaLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectViaLinkView.swift; sourceTree = "<group>"; };
 		5CB2085428DE647400D024EC /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CB346E42868AA7F001FD2EF /* SuspendChat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuspendChat.swift; sourceTree = "<group>"; };
 		5CB346E62868D76D001FD2EF /* NotificationsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsView.swift; sourceTree = "<group>"; };
@@ -397,13 +403,8 @@
 		5CC2C0FE2809BF11000C35E3 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5CC868F229EB540C0017BBFD /* CIRcvDecryptionError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIRcvDecryptionError.swift; sourceTree = "<group>"; };
 		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>"; };
-		5CDA5A282B04FE2D00A71D61 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5CDA5A292B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a"; sourceTree = "<group>"; };
-		5CDA5A2A2B04FE2D00A71D61 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5CDA5A2B2B04FE2D00A71D61 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5CDA5A2C2B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a"; 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>"; };
 		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>"; };
@@ -430,9 +431,14 @@
 		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; };
+		640417CB2B29B8C200CCB412 /* NewChatMenuButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewChatMenuButton.swift; sourceTree = "<group>"; };
+		640417CC2B29B8C200CCB412 /* NewChatView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewChatView.swift; sourceTree = "<group>"; };
 		6407BA82295DA85D0082BA18 /* CIInvalidJSONView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIInvalidJSONView.swift; sourceTree = "<group>"; };
 		6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextInvitingContactMemberView.swift; sourceTree = "<group>"; };
 		6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIMemberCreatedContactView.swift; sourceTree = "<group>"; };
@@ -466,6 +472,7 @@
 		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; };
@@ -507,13 +514,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CDA5A302B04FE2D00A71D61 /* libgmpxx.a in Frameworks */,
+				5C245F372B4ED5BE001CC39F /* libgmpxx.a in Frameworks */,
+				5C245F3A2B4ED5BE001CC39F /* libffi.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				5CDA5A2D2B04FE2D00A71D61 /* libgmp.a in Frameworks */,
-				5CDA5A2E2B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a in Frameworks */,
-				5CDA5A2F2B04FE2D00A71D61 /* libffi.a in Frameworks */,
+				5C245F382B4ED5BE001CC39F /* libgmp.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				5CDA5A312B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a in Frameworks */,
+				5C245F3B2B4ED5BE001CC39F /* libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V.a in Frameworks */,
+				5C245F392B4ED5BE001CC39F /* libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V-ghc9.6.3.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -575,11 +582,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5CDA5A2A2B04FE2D00A71D61 /* libffi.a */,
-				5CDA5A282B04FE2D00A71D61 /* libgmp.a */,
-				5CDA5A2B2B04FE2D00A71D61 /* libgmpxx.a */,
-				5CDA5A292B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL-ghc9.6.3.a */,
-				5CDA5A2C2B04FE2D00A71D61 /* libHSsimplex-chat-5.4.0.3-rODxCBVsb2BkD1fnTAqXL.a */,
+				5C245F352B4ED5BE001CC39F /* libffi.a */,
+				5C245F332B4ED5BE001CC39F /* libgmp.a */,
+				5C245F322B4ED5BE001CC39F /* libgmpxx.a */,
+				5C245F342B4ED5BE001CC39F /* libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V-ghc9.6.3.a */,
+				5C245F362B4ED5BE001CC39F /* libHSsimplex-chat-5.5.0.1-88BIBmZS0745eqQdRbJ61V.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -604,6 +611,7 @@
 				5C35CFC727B2782E00FB6C6D /* BGManager.swift */,
 				5C35CFCA27B2E91D00FB6C6D /* NtfManager.swift */,
 				5CB346E42868AA7F001FD2EF /* SuspendChat.swift */,
+				5CF937212B25034A00E1D781 /* NSESubscriber.swift */,
 				5CB346E82869E8BA001FD2EF /* PushEnvironment.swift */,
 				5C93293E2928E0FD0090FFF9 /* AudioRecPlay.swift */,
 				5CBD2859295711D700EC2CF4 /* ImageUtils.swift */,
@@ -631,6 +639,7 @@
 				64466DCB29FFE3E800E3D48D /* MailView.swift */,
 				64C3B0202A0D359700E19930 /* CustomTimePicker.swift */,
 				5CEBD7452A5C0A8F00665FE2 /* KeyboardPadding.swift */,
+				8C05382D2B39887E006436DC /* VideoUtils.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -723,14 +732,10 @@
 		5CB924DD27A8622200ACCCDD /* NewChat */ = {
 			isa = PBXGroup;
 			children = (
-				5C6AD81227A834E300348BD7 /* NewChatButton.swift */,
-				5CCD403327A5F6DF00368C90 /* AddContactView.swift */,
-				5CCD403627A5F9A200368C90 /* ScanToConnectView.swift */,
-				3C8C548828133C84000A3EC7 /* PasteToConnectView.swift */,
+				640417CB2B29B8C200CCB412 /* NewChatMenuButton.swift */,
+				640417CC2B29B8C200CCB412 /* NewChatView.swift */,
 				5CC1C99127A6C7F5000D9FF6 /* QRCode.swift */,
 				6442E0B9287F169300CEC0F9 /* AddGroupView.swift */,
-				5CB2085028DB64CA00D024EC /* CreateLinkView.swift */,
-				5CB2085228DB7CAF00D024EC /* ConnectViaLinkView.swift */,
 				64D0C2C529FAC1EC00B38D5F /* AddContactLearnMore.swift */,
 			);
 			path = NewChat;
@@ -784,6 +789,7 @@
 			isa = PBXGroup;
 			children = (
 				5CDCAD5128186DE400503DA2 /* SimpleX NSE.entitlements */,
+				5CF9371D2B23429500E1D781 /* ConcurrentQueue.swift */,
 				5CDCAD472818589900503DA2 /* NotificationService.swift */,
 				5CDCAD492818589900503DA2 /* Info.plist */,
 				5CB0BA862826CB3A00B3292C /* InfoPlist.strings */,
@@ -804,10 +810,13 @@
 				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>";
@@ -892,6 +901,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				5CE2BA77284530BF00EC33A6 /* SimpleXChat.h in Headers */,
+				5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */,
 				5CE2BA952845354B00EC33A6 /* SimpleX.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1032,6 +1042,7 @@
 				fi,
 				uk,
 				bg,
+				tr,
 			);
 			mainGroup = 5CA059BD279559F40002BEB4;
 			packageReferences = (
@@ -1094,8 +1105,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				64C06EB52A0A4A7C00792D4D /* ChatItemInfoView.swift in Sources */,
+				640417CE2B29B8C200CCB412 /* NewChatView.swift in Sources */,
 				6440CA03288AECA70062C672 /* AddGroupMembersView.swift in Sources */,
-				5C6AD81327A834E300348BD7 /* NewChatButton.swift in Sources */,
 				5C3F1D58284363C400EC8A82 /* PrivacySettings.swift in Sources */,
 				5C55A923283CEDE600C4E99E /* SoundPlayer.swift in Sources */,
 				5C93292F29239A170090FFF9 /* ProtocolServersView.swift in Sources */,
@@ -1142,13 +1153,11 @@
 				5C063D2727A4564100AEC577 /* ChatPreviewView.swift in Sources */,
 				5CC868F329EB540C0017BBFD /* CIRcvDecryptionError.swift in Sources */,
 				5C35CFCB27B2E91D00FB6C6D /* NtfManager.swift in Sources */,
-				3C8C548928133C84000A3EC7 /* PasteToConnectView.swift in Sources */,
 				5C9D13A3282187BB00AB8B43 /* WebRTC.swift in Sources */,
 				5C9A5BDB2871E05400A5B906 /* SetNotificationsMode.swift in Sources */,
 				5CB0BA8E2827126500B3292C /* OnboardingView.swift in Sources */,
 				6442E0BE2880182D00CEC0F9 /* GroupChatInfoView.swift in Sources */,
 				5C2E261227A30FEA00F70299 /* TerminalView.swift in Sources */,
-				5CB2085128DB64CA00D024EC /* CreateLinkView.swift in Sources */,
 				5C9FD96E27A5D6ED0075386C /* SendMessageView.swift in Sources */,
 				5CA7DFC329302AF000F7FDDE /* AppSheet.swift in Sources */,
 				64E972072881BB22008DBC02 /* CIGroupInvitationView.swift in Sources */,
@@ -1157,8 +1166,8 @@
 				5CB9250D27A9432000ACCCDD /* ChatListNavLink.swift in Sources */,
 				649BCDA0280460FD00C3A862 /* ComposeImageView.swift in Sources */,
 				5CA059ED279559F40002BEB4 /* ContentView.swift in Sources */,
-				5CCD403427A5F6DF00368C90 /* AddContactView.swift in Sources */,
 				5C05DF532840AA1D00C683F9 /* CallSettings.swift in Sources */,
+				640417CD2B29B8C200CCB412 /* NewChatMenuButton.swift in Sources */,
 				5CFE0921282EEAF60002594B /* ZoomableScrollView.swift in Sources */,
 				5C3A88CE27DF50170060F1C2 /* DetermineWidth.swift in Sources */,
 				5C7505A527B679EE00BE3227 /* NavLinkPlain.swift in Sources */,
@@ -1173,6 +1182,7 @@
 				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 */,
@@ -1192,9 +1202,9 @@
 				6448BBB628FA9D56000D2AB9 /* GroupLinkView.swift in Sources */,
 				5CB346E92869E8BA001FD2EF /* PushEnvironment.swift in Sources */,
 				5C55A91F283AD0E400C4E99E /* CallManager.swift in Sources */,
-				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 */,
@@ -1214,7 +1224,6 @@
 				5C93293F2928E0FD0090FFF9 /* AudioRecPlay.swift in Sources */,
 				5C029EA82837DBB3004A9677 /* CICallItemView.swift in Sources */,
 				5CE4407227ADB1D0007B033A /* Emoji.swift in Sources */,
-				5CB2085328DB7CAF00D024EC /* ConnectViaLinkView.swift in Sources */,
 				5C9CC7A928C532AB00BEF955 /* DatabaseErrorView.swift in Sources */,
 				5C1A4C1E27A715B700EAD5AD /* ChatItemView.swift in Sources */,
 				64AA1C6927EE10C800AC7277 /* ContextItemView.swift in Sources */,
@@ -1252,6 +1261,7 @@
 			files = (
 				5CDCAD482818589900503DA2 /* NotificationService.swift in Sources */,
 				5CFE0922282EEAF60002594B /* ZoomableScrollView.swift in Sources */,
+				5CF9371E2B23429500E1D781 /* ConcurrentQueue.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1259,9 +1269,11 @@
 			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 */,
@@ -1318,6 +1330,7 @@
 				5C136D8F2AAB3D14006DE2FC /* fi */,
 				5C636F672AAB3D2400751C84 /* uk */,
 				5C5B67932ABAF56000DA9412 /* bg */,
+				5C245F3E2B501F13001CC39F /* tr */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -1340,6 +1353,7 @@
 				5CE6C7B32AAB1515007F345C /* fi */,
 				5CE6C7B42AAB1527007F345C /* uk */,
 				5C5B67912ABAF4B500DA9412 /* bg */,
+				5C245F3C2B501E98001CC39F /* tr */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1361,6 +1375,7 @@
 				5C136D8E2AAB3D14006DE2FC /* fi */,
 				5C636F662AAB3D2400751C84 /* uk */,
 				5C5B67922ABAF56000DA9412 /* bg */,
+				5C245F3D2B501F13001CC39F /* tr */,
 			);
 			name = "SimpleX--iOS--InfoPlist.strings";
 			sourceTree = "<group>";
@@ -1494,7 +1509,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 189;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1516,7 +1531,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1537,7 +1552,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 189;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1559,7 +1574,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1618,7 +1633,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 189;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1631,7 +1646,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1650,7 +1665,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 189;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1663,7 +1678,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1682,7 +1697,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 189;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1706,7 +1721,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1728,7 +1743,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 181;
+				CURRENT_PROJECT_VERSION = 189;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1752,7 +1767,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.4;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -41,7 +41,7 @@
      </Testables>
   </TestAction>
   <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
@@ -2,7 +2,7 @@
 <Scheme
   LastUpgradeVersion = "1400"
   wasCreatedForAppExtension = "YES"
-   version = "2.0">
+   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
@@ -47,16 +47,14 @@
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
-      askForAppToLaunch = "Yes"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
+      allowLocationSimulation = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
         <BuildableReference
@@ -12,12 +12,16 @@ private var chatController: chat_ctrl?

 private var migrationResult: (Bool, DBMigrationResult)?

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

-public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: MigrationConfirmation? = nil) -> (Bool, DBMigrationResult) {
+public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: MigrationConfirmation? = nil, backgroundMode: Bool = false) -> (Bool, DBMigrationResult) {
    if let res = migrationResult { return res }
    let dbPath = getAppDatabasePath().path
    var dbKey = ""
@@ -41,7 +45,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(&cPath, &cKey, &cConfirm, &chatController)!
+    let cjson = chat_migrate_init_key(&cPath, &cKey, 1, &cConfirm, backgroundMode ? 1 : 0, &chatController)!
    let dbRes = dbMigrationResult(fromCString(cjson))
    let encrypted = dbKey != ""
    let keychainErr = dbRes == .ok && useKeychain && encrypted && !kcDatabasePassword.set(dbKey)
@@ -57,6 +61,13 @@ 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(subscribe: Bool, expire: Bool, xftp: Bool)
+    case startChat(mainApp: Bool)
    case apiStopChat
-    case apiActivateChat
+    case apiActivateChat(restoreChat: Bool)
    case apiSuspendChat(timeoutMicroseconds: Int)
    case setTempFolder(tempFolder: String)
    case setFilesFolder(filesFolder: String)
@@ -154,9 +154,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(subscribe, expire, xftp): return "/_start subscribe=\(onOff(subscribe)) expire=\(onOff(expire)) xftp=\(onOff(xftp))"
+            case let .startChat(mainApp): return "/_start main=\(onOff(mainApp))"
            case .apiStopChat: return "/_stop"
-            case .apiActivateChat: return "/_app activate"
+            case let .apiActivateChat(restore): return "/_app activate restore=\(onOff(restore))"
            case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
            case let .setTempFolder(tempFolder): return "/_temp_folder \(tempFolder)"
            case let .setFilesFolder(filesFolder): return "/_files_folder \(filesFolder)"
@@ -505,8 +505,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)
-    case sentInvitation(user: UserRef)
+    case sentConfirmation(user: UserRef, connection: PendingContactConnection)
+    case sentInvitation(user: UserRef, connection: PendingContactConnection)
    case sentInvitationToContact(user: UserRef, contact: Contact, customUserProfile: Profile?)
    case contactAlreadyExists(user: UserRef, contact: Contact)
    case contactRequestAlreadyAccepted(user: UserRef, contact: Contact)
@@ -604,16 +604,16 @@ 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 newContactConnection(user: UserRef, connection: PendingContactConnection)
+    case ntfMessages(user_: User?, connEntity_: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
+    case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgInfo)
    case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
    // remote desktop responses/events
    case remoteCtrlList(remoteCtrls: [RemoteCtrlInfo])
-    case remoteCtrlFound(remoteCtrl: 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
+    case remoteCtrlStopped(rcsState: RemoteCtrlSessionState, rcStopReason: RemoteCtrlStopReason)
    // misc
    case versionInfo(versionInfo: CoreVersionInfo, chatMigrations: [UpMigration], agentMigrations: [UpMigration])
    case cmdOk(user: UserRef?)
@@ -752,7 +752,7 @@ public enum ChatResponse: Decodable, Error {
            case .ntfTokenStatus: return "ntfTokenStatus"
            case .ntfToken: return "ntfToken"
            case .ntfMessages: return "ntfMessages"
-            case .newContactConnection: return "newContactConnection"
+            case .ntfMessage: return "ntfMessage"
            case .contactConnectionDeleted: return "contactConnectionDeleted"
            case .remoteCtrlList: return "remoteCtrlList"
            case .remoteCtrlFound: return "remoteCtrlFound"
@@ -803,11 +803,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, _): return withUser(u, connReqInvitation)
+            case let .invitation(u, connReqInvitation, connection): return withUser(u, "connReqInvitation: \(connReqInvitation)\nconnection: \(connection)")
            case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
            case let .connectionPlan(u, connectionPlan): return withUser(u, String(describing: connectionPlan))
-            case .sentConfirmation: return noDetails
-            case .sentInvitation: return noDetails
+            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 let .contactAlreadyExists(u, contact): return withUser(u, String(describing: contact))
            case let .contactRequestAlreadyAccepted(u, contact): return withUser(u, String(describing: contact))
@@ -900,10 +900,10 @@ 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 .newContactConnection(u, connection): return withUser(u, String(describing: connection))
+            case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
            case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
            case let .remoteCtrlList(remoteCtrls): return String(describing: remoteCtrls)
-            case let .remoteCtrlFound(remoteCtrl): return String(describing: remoteCtrl)
+            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)
@@ -1207,9 +1207,9 @@ public struct NetCfg: Codable, Equatable {
    public static let defaults: NetCfg = NetCfg(
        socksProxy: nil,
        sessionMode: TransportSessionMode.user,
-        tcpConnectTimeout: 15_000_000,
-        tcpTimeout: 10_000_000,
-        tcpTimeoutPerKb: 30_000,
+        tcpConnectTimeout: 20_000_000,
+        tcpTimeout: 15_000_000,
+        tcpTimeoutPerKb: 45_000,
        tcpKeepAlive: KeepAliveOpts.defaults,
        smpPingInterval: 1200_000_000,
        smpPingCount: 3,
@@ -1498,6 +1498,8 @@ 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"
@@ -1505,9 +1507,9 @@ public enum NotificationsMode: String, Decodable, SelectableItem {

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

@@ -1546,11 +1548,19 @@ public struct RemoteCtrlInfo: Decodable {

 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
@@ -1600,6 +1610,7 @@ public enum ChatErrorType: Decodable {
    case userUnknown
    case activeUserExists
    case userExists
+    case invalidDisplayName
    case differentActiveUser(commandUserId: Int64, activeUserId: Int64)
    case cantDeleteActiveUser(userId: Int64)
    case cantDeleteLastUser(userId: Int64)
@@ -9,12 +9,16 @@
 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"
-public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic"
+public let GROUP_DEFAULT_NTF_ENABLE_LOCAL = "ntfEnableLocal" // no longer used
+public let GROUP_DEFAULT_NTF_ENABLE_PERIODIC = "ntfEnablePeriodic" // no longer used
 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"
@@ -66,13 +70,23 @@ public func registerGroupDefaults() {
    ])
 }

-public enum AppState: String {
+public enum AppState: String, Codable {
    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
@@ -84,23 +98,57 @@ public enum AppState: String {
    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,
@@ -109,6 +157,8 @@ 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,
@@ -117,10 +167,6 @@ 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)
--- a/Show More
+++ b/Show More