Merge branch 'master' into ep/survey-bot

.github/workflows/build.yml

@@ -52,19 +52,15 @@ jobs:
           - os: ubuntu-20.04
             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
             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
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-macos-x86-64
-            desktop_asset_name: simplex-desktop-macos-x86_64.dmg
           - os: windows-latest
             cache_path: C:/cabal
             asset_name: simplex-chat-windows-x86-64
-            desktop_asset_name: simplex-desktop-windows-x86_64.msi
     steps:
       - name: Configure pagefile (Windows)
         if: matrix.os == 'windows-latest'
@@ -78,10 +74,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
         with:
-          ghc-version: "9.6.2"
-          cabal-version: "3.10.1.0"
+          ghc-version: "8.10.7"
+          cabal-version: "latest"
 
       - name: Cache dependencies
         uses: actions/cache@v3
@@ -103,10 +99,6 @@ jobs:
           echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
           echo "    flags: +openssl"                                        >> cabal.project.local
 
-      - name: Install AppImage dependencies
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
-        run: sudo apt install -y desktop-file-utils
-
       - name: Install pkg-config for Mac
         if: matrix.os == 'macos-latest'
         run: brew install pkg-config
@@ -119,136 +111,23 @@ jobs:
           echo "package direct-sqlcipher" >> cabal.project.local
           echo "    flags: +openssl"      >> cabal.project.local
 
-      - name: Unix build CLI
-        id: unix_cli_build
+      - name: Unix build
+        id: unix_build
         if: matrix.os != 'windows-latest'
         shell: bash
         run: |
           cabal build --enable-tests
-          path=$(cabal list-bin simplex-chat)
-          echo "bin_path=$path" >> $GITHUB_OUTPUT
-          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+          echo "::set-output name=bin_path::$(cabal list-bin simplex-chat)"
 
-      - name: Unix upload CLI binary to release
+      - name: Unix upload binary to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.unix_cli_build.outputs.bin_path }}
+          file: ${{ steps.unix_build.outputs.bin_path }}
           asset_name: ${{ matrix.asset_name }}
           tag: ${{ github.ref }}
 
-      - name: Unix update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.unix_cli_build.outputs.bin_hash }}
-
-      - name: Setup Java
-        if: startsWith(github.ref, 'refs/tags/v')
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: '17'
-          cache: 'gradle'
-
-      - 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')
-        shell: bash
-        run: |
-          scripts/desktop/build-lib-linux.sh
-          cd apps/multiplatform
-          ./gradlew packageDeb
-          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'
-        shell: bash
-        run: |
-          scripts/desktop/make-appimage-linux.sh
-          path=$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage)
-          echo "appimage_path=$path" >> $GITHUB_OUTPUT
-          echo "appimage_hash=$(echo SHA2-512\(simplex-desktop-x86_64.AppImage\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-
-      - name: Mac build desktop
-        id: mac_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
-        shell: bash
-        env:
-          APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
-          APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
-          APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
-        run: |
-          scripts/ci/build-desktop-mac.sh
-          path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
-          echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-
-      - name: Linux upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.linux_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          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')
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ 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'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.linux_appimage_build.outputs.appimage_path }}
-          asset_name: simplex-desktop-x86_64.AppImage
-          tag: ${{ github.ref }}
-
-      - name: Linux update AppImage hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.linux_appimage_build.outputs.appimage_hash }}
-
-      - name: Mac upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.mac_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Mac update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.mac_desktop_build.outputs.package_hash }}
-
       - name: Unix test
         if: matrix.os != 'windows-latest'
         timeout-minutes: 30
@@ -258,22 +137,21 @@ jobs:
       # Unix /
 
       # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
 
       - name: Windows build
         id: windows_build
         if: matrix.os == 'windows-latest'
-        shell: bash
+        shell: cmd
         run: |
-          rm -rf dist-newstyle/src/direct-sq*
-          sed -i "s/, unix /--, unix /" simplex-chat.cabal
           cabal build --enable-tests
-          rm -rf dist-newstyle/src/direct-sq*
-          path=$(cabal list-bin simplex-chat | tail -n 1)
-          echo "bin_path=$path" >> $GITHUB_OUTPUT
-          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+          cabal list-bin simplex-chat > tmp_bin_path
+          set /p bin_path= < tmp_bin_path
+          echo ::set-output name=bin_path::%bin_path%
 
-      - name: Windows upload CLI binary to release
+      - name: Windows upload binary to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
         uses: svenstaro/upload-release-action@v2
         with:
@@ -282,14 +160,4 @@ jobs:
           asset_name: ${{ matrix.asset_name }}
           tag: ${{ github.ref }}
 
-      - name: Windows update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.windows_build.outputs.bin_hash }}
-
       # Windows /

.gitignore

@@ -53,7 +53,6 @@ website/src/docs/
 website/translations.json
 website/src/img/images/
 website/src/images/
-website/src/js/lottie.min.js
 # Generated files
 website/package/generated*
 

PRIVACY.md

@@ -6,63 +6,27 @@ If you believe that some of the clauses in this document are not aligned with ou
 
 ## Privacy Policy
 
-SimpleX Chat Ltd. ("SimpleX Chat") uses the best industry practices for security and encryption to provide secure [end-to-end encrypted](./docs/GLOSSARY.md#end-to-end-encryption) messaging via private connections. This encryption cannot be compromised by the servers via [man-in-the-middle attack](./docs/GLOSSARY.md#man-in-the-middle-attack).
+SimpleX Chat Ltd. ("SimpleX Chat") uses the best industry practices for security and end-to-end encryption to provide secure end-to-end encrypted messaging via private connections. SimpleX Chat is built on top of SimpleX messaging and application platform that uses a new message routing protocol that allows establishing private connection without having any kind of addresses that identify its users - we don't use emails, phone numbers, usernames, identity keys or any other user identifiers to pass messages between the users.
 
-SimpleX Chat is built on top of SimpleX messaging and application platform that uses a new message routing protocol allowing to establish private connections without having any kind of addresses that identify its users - we don't use emails, phone numbers, usernames, identity keys or any other user identifiers to pass messages between the users.
-
-SimpleX Chat security assessment was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
+SimpleX Chat security audit was performed in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
 ### Information you provide
 
-#### User profiles
+We do not store user profiles. The profile you create in the app is local to your device. When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
 
-We do not store user profiles. The profile you create in the app is local to your device.
+Messages. SimpleX Chat cannot decrypt or otherwise access the content or even size of your messages (each message is padded to a fixed size of 16kb). SimpleX Chat temporarily stores end-to-end encrypted messages on its servers for delivery to the devices that are offline, these messages are permanently removed as soon as they are delivered. Your message history is stored only on your own devices.
 
-When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
-
-#### Messages and Files
-
-SimpleX Chat cannot decrypt or otherwise access the content or even the size of your messages and files you send or receive. Each message is padded to a fixed size of 16kb. Each file is sent in chunks of 256kb, 1mb or 8mb via all or some of the configured file servers. Both messages and files are sent end-to-end encrypted, and the servers do not have technical means to compromise this encryption, because part of the [key exchange](./docs/GLOSSARY.md#key-exchange) happens out-of-band.
-
-Your message history is stored only on your own device and the devices of your contacts. While the recipients' devices are offline SimpleX Chat temporarily stores end-to-end encrypted messages on the messaging (SMP) servers that are preset in the app or chosen by the users.
-
-The messages are permanently removed from the preset servers as soon as they are delivered. Undelivered messages are deleted after the time that is configured in the messaging servers you use (21 days for preset messaging servers).
-
-The files are stored on file (XFTP) servers for the time configured in the file servers you use (48 hours for preset file servers).
-
-If a messaging or file servers are restarted, the encrypted message or the record of the file can be stored in a backup file until it is overwritten by the next restart (usually within 1 week).
-
-#### Connections with other users
-
-When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on chosen messaging servers, that can be the preset servers or the servers that you configured in the app, in case it allows such configuration. SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default.
-
-At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by two anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages.
-
-#### iOS Push Notifications
-
-When you choose to use instant push notifications in SimpleX iOS app, because the design of push notifications requires storing the device token on notification server, the notifications server can observe how many messaging queues your device has notifications enabled for, and approximately how many messages are sent to each queue.
-
-Notification server cannot observe the actual addresses of these queues, as a separate address is used to subscribe to the notifications. It also cannot observe who, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging servers.
-
-It also does not allow to see message content or sizes, as the actual messages are not sent via the notification server, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot observe it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
-
-#### Another information stored on the servers
+Connections with other users. When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on our servers, or on the servers that you configured in the app, in case it allows such configuration (SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default). At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by a set of anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages. The exception to that is when you choose to use instant push notifications in our iOS app, because the design of push notifications requires storing the device token on notification server, and the server can observe how many messaging queues your device uses, and approximate how many messages are sent to each queue. It does not allow though to determine the actual addresses of these queues, as a separate address is used to subscibe to the notifications (unless notification and messaging servers exchange information), and who, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging servers. It also does not allow to see message content or sizes, as the actual messages are not sent via the notification service, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot see it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
 
 Additional technical information can be stored on our servers, including randomly generated authentication tokens, keys, push tokens, and other material that is necessary to transmit messages. SimpleX Chat limits this additional technical information to the minimum required to operate the Services.
 
-#### SimpleX Directory Service
-
-[SimpleX directory service](./docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the group. You can connect to SimpleX Directory Service via [this address](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).
-
-#### User Support.
-
-If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.
+User Support. If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.
 
 ### Information we may share
 
 We operate our Services using third parties. While we do not share any user data, these third party may access the encrypted user data as it is stored or transmitted via our servers.
 
-We use a third party for email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according to their privacy policies and terms of service.
+We use Third party to provide email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according their privacy policies and terms of service.
 
 The cases when SimpleX Chat may need to share the data we temporarily store on the servers:
 
@@ -75,19 +39,19 @@ At the time of updating this document, we have never provided or have been reque
 
 ### Updates
 
-We will update this Privacy Policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our Services confirms your acceptance of our updated Privacy Policy.
+We will update this privacy policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our Services confirms your acceptance of our updated Privacy Policy.
 
-Please also read our Terms of Service below.
+Please also read our Terms of Service.
 
-If you have questions about our Privacy Policy please contact us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
+If you have questions about our Privacy Policy please contact us at chat@simplex.chat.
 
 ## Terms of Service
 
-You accept our Terms of Service ("Terms") by installing or using any of our apps or services ("Services").
+You accept to our Terms of Service ("Terms") by installing or using any of our apps or services ("Services").
 
 **Minimal age**. You must be at least 13 years old to use our Services. The minimum age to use our Services without parental approval may be higher in your country.
 
-**Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or ciphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.
+**Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we do cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or cyphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.
 
 **Privacy of user data**. We do not retain any data we transmit for any longer than necessary to provide the Services. We only collect aggregate statistics across all users, not per user - we do not have information about how many people use SimpleX Chat (we only know an approximate number of app installations and the aggregate traffic through our servers). In any case, we do not and will not sell or in any way monetize user data.
 
@@ -103,17 +67,15 @@ You accept our Terms of Service ("Terms") by installing or using any of our apps
 
 **Keeping your data secure**. SimpleX Chat is the first messaging platform that is 100% private by design - we neither have ability to access your messages, nor we have information about who you communicate with. That means that you are solely responsible for keeping your device and your user profile safe and secure. If you lose your phone or remove the app, you will not be able to recover the lost data, unless you made a back up.
 
-**Storing the messages on the device**. The messages are stored in the encrypted database on your device. Whether and how database passphrase is stored is determined by the configuration of the application you use. Legacy databases created prior to 2023 or in CLI (terminal) app may remain unencrypted, and it will be indicated in the app. In this case, if you make a backup of the app data and store it unencrypted, the backup provider may be able to access the messages. Please note, that the beta version of desktop app currently stores the database passphrase in the configuration file in plaintext, so you may need to remove passphrase from the device via the app configuration.
-
-**Storing the files on the device**. The files are stored on your device unencrypted. If you make a backup of the app data and store it unencrypted, the backup provider will be able to access the files.
+**Storing the messages on the device**. Currently the messages are stored in the database on your device without encryption. It means that if you make a backup of the app and store it unecrypted, the backup provider may be able to access the messages.
 
 **No Access to Emergency Services**. Our Services do not provide access to emergency service providers like the police, fire department, hospitals, or other public safety organizations. Make sure you can contact emergency service providers through a mobile, fixed-line telephone, or other service.
 
 **Third-party services**. Our Services may allow you to access, use, or interact with third-party websites, apps, content, and other products and services. When you use third-party services, their terms and privacy policies govern your use of those services.
 
-**Your Rights**. You own the messages and the information you transmit through our Services. Your recipients are able to retain the messages you receive from you; there is no technical ability to delete data from their devices. While there are various app features that allow deleting messages from the recipients' devices, such as _disappearing messages_ and _full message deletion_, their functioning on your recipients' devices cannot be guaranteed or enforced, as the device may be offline or have a modified version of the app.
+**Your Rights**. You own the mesasges and information you transmit through our Services. Your recipients are able to retain the messages you receive from you; there is no technical ability to delete data from their devices.
 
-**License**. SimpleX Chat grants you a limited, revocable, non-exclusive, and non-transferable license to use our Services in accordance with these Terms. The source-code of services is available and can be used under [AGPL v3 license](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)
+**License**. SimpleX Chat grants you a limited, revocable, non-exclusive, and non-transferable license to use our Services in accordance with these Terms. The source-code of services is available and can be used under [AGPL v3 licence](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)
 
 **SimpleX Chat Rights**. We own all copyrights, trademarks, domains, logos, trade secrets, and other intellectual property rights associated with our Services. You may not use our copyrights, trademarks, domains, logos, and other intellectual property rights unless you have our written permission, and unless under an open-source license distributed together with the source code. To report copyright, trademark, or other intellectual property infringement, please contact chat@simplex.chat.
 
@@ -131,4 +93,4 @@ You accept our Terms of Service ("Terms") by installing or using any of our apps
 
 **Ending these Terms**. You may end these Terms with SimpleX Chat at any time by deleting SimpleX Chat app(s) from your device and discontinuing use of our Services. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the terms, Enforcing the terms, and Ending these Terms will survive termination of your relationship with SimpleX Chat.
 
-Updated August 17, 2023
+Updated November 8, 2022

README.md

@@ -2,7 +2,7 @@
 [![GitHub downloads](https://img.shields.io/github/downloads/simplex-chat/simplex-chat/total)](https://github.com/simplex-chat/simplex-chat/releases)
 [![GitHub release](https://img.shields.io/github/v/release/simplex-chat/simplex-chat)](https://github.com/simplex-chat/simplex-chat/releases)
 [![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
-<a rel="me" href="https://mastodon.social/@simplex">![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)</a>
+[![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)](https://mastodon.social/@simplex)
 
 | 30/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md) |
 
@@ -15,7 +15,7 @@
 ## Welcome to SimpleX Chat!
 
 1. 📲 [Install the app](#install-the-app).
-2. ↔️ [Connect to the team](#connect-to-the-team), [join user groups](#join-user-groups) and [follow our updates](#follow-our-updates).
+2. ↔️ [Connect to the team](#connect-to-the-team-via-the-app) and [join user groups](#join-user-groups).
 3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
 4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
 5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
@@ -40,29 +40,21 @@
 - 🚀 [TestFlight preview for iOS](https://testflight.apple.com/join/DWuT2LQu) with the new features 1-2 weeks earlier - **limited to 10,000 users**!
 - 🖥 Available as a terminal (console) [app / CLI](#zap-quick-installation-of-a-terminal-app) on Linux, MacOS, Windows.
 
-## Connect to the team
-
-You can connect to the team via the app using "chat with the developers button" available when you have no conversations in the profile, "Send questions and ideas" in the app settings or via our [SimpleX address](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion). Please connect to:
+## Connect to the team via the app
 
 - to ask any questions
 - to suggest any improvements
 - to share anything relevant
 
-We are replying the questions manually, so it is not instant – it can take up to 24 hours.
-
-If you are interested in helping us to integrate open-source language models, and in [joining our team](./docs/JOIN_TEAM.md), please get in touch.
-
 ## Join user groups
 
-You can join the groups created by other users via the new [directory service](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion). We are not responsible for the content shared in these groups.
-
 **Please note**: The groups below are created for the users to be able to ask questions, make suggestions and ask questions about SimpleX Chat only.
 
 You also can:
 - criticize the app, and make comparisons with other messengers.
 - share new messengers you think could be interesting for privacy, as long as you don't spam.
 - share some privacy related publications, infrequently.
-- having preliminary approved with the admin in direct message, share the link to a group you created, but only once. Once the group has more than 10 members it can be submitted to [SimpleX Directory Service](./docs/DIRECTORY.md) where the new users will be able to discover it.
+- having preliminary approved with the admin in direct message, share the link to a group you created.
 
 You must:
 - be polite to other users
@@ -87,15 +79,6 @@ There are groups in other languages, that we have the apps interface translated
 
 You can join either by opening these links in the app or by opening them in a desktop browser and scanning the QR code.
 
-## Follow our updates
-
-We publish our updates and releases via:
-
-- [Reddit](https://www.reddit.com/r/SimpleXChat/), [Twitter](https://twitter.com/SimpleXChat), [Lemmy](https://lemmy.ml/c/simplex), [Mastodon](https://mastodon.social/@simplex) and [Nostr](https://snort.social/p/npub1exv22uulqnmlluszc4yk92jhs2e5ajcs6mu3t00a6avzjcalj9csm7d828).
-- SimpleX Chat [team profile](#connect-to-the-team).
-- [blog](https://simplex.chat/blog/) and [RSS feed](https://simplex.chat/feed.rss).
-- [mailing list](https://simplex.chat/#join-simplex), very rarely.
-
 ## Make a private connection
 
 You need to share a link with your friend or scan a QR code from their phone, in person or during a video call, to make a connection and start messaging.
@@ -120,18 +103,16 @@ Join our translators to help SimpleX grow!
 |:----:|:-------:|:---------:|:---------:|:---------:|:---------:|
 |🇬🇧 en|English   | |✓|✓|✓|✓|
 |ar|العربية   |[jermanuts](https://github.com/jermanuts)||[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
-|🇧🇬 bg|Български |-|[![android app](https://hosted.weblate.org/widgets/simplex-chat/bg/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/bg/)<br>-|||
 |🇨🇿 cs|Čeština   |[zen0bit](https://github.com/zen0bit)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/cs/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/cs/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/cs/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/cs/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/cs/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/cs/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/cs)|
 |🇩🇪 de|Deutsch   |[mlanp](https://github.com/mlanp)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/de/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/de/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/de/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/de/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/de/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/de/)||
 |🇪🇸 es|Español   |[Mateyhv](https://github.com/Mateyhv)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/es/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/es/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/es/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/es/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/es/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/es/)||
 |🇫🇷 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)|
 |🇮🇹 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|Japanese  ||[![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/)|||
+|🇯🇵 ja|Japanese  ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/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/)|||
 |🇳🇱 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/)||
-|🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/pl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
+|🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/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/pl/)|||
 |🇧🇷 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/)|||
 |🇨🇳 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/)||
 
 Languages in progress: Arabic, Japanese, Korean, Portuguese and [others](https://hosted.weblate.org/projects/simplex-chat/#languages). We will be adding more languages as some of the already added are completed – please suggest new languages, review the [translation guide](./docs/TRANSLATIONS.md) and get in touch with us!
@@ -159,14 +140,11 @@ It is possible to donate via:
 
 - [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
 - [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
-- Monero: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
-- Bitcoin: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
-- BCH: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
-- USDT:
-  - BNB Smart Chain: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
-  - Tron: TNnTrKLBmdy2Wn3cAQR98dAVvWhLskQGfW
-- Ethereum: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
-- Solana: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
+- Monero address: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
+- Bitcoin address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- Ethereum address: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+- Solana address: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
 
 Thank you,
 
@@ -186,7 +164,7 @@ SimpleX Chat founder
 - [News and updates](#news-and-updates)
 - [Quick installation of a terminal app](#zap-quick-installation-of-a-terminal-app)
 - [SimpleX Platform design](#simplex-platform-design)
-- [Privacy and security: technical details and limitations](#privacy-and-security-technical-details-and-limitations)
+- [Privacy: technical details and limitations](#privacy-technical-details-and-limitations)
 - [For developers](#for-developers)
 - [Roadmap](#roadmap)
 - [Disclaimers, Security contact, License](#disclaimers)
@@ -277,7 +255,7 @@ See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/stable/p
 
 See [SimpleX Chat Protocol](./docs/protocol/simplex-chat.md) for the format of messages sent between chat clients over [SimpleX Messaging Protocol](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/simplex-messaging.md).
 
-## Privacy and security: technical details and limitations
+## Privacy: technical details and limitations
 
 SimpleX Chat is a work in progress – we are releasing improvements as they are ready. You have to decide if the current state is good enough for your usage scenario.
 
@@ -296,15 +274,12 @@ What is already implemented:
 9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
 10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
 11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
-12. Manual messaging queue rotations to move conversation to another SMP relay.
 
-We plan to add:
+We plan to add soon:
 
-1. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`. This is currently in progress.
-2. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
-3. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
-4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
-5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
+1. Automatic message queue rotation. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+2. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`.
+3. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
 
 ## For developers
 

apps/ios/Shared/ContentView.swift

@@ -28,17 +28,6 @@ struct ContentView: View {
     @State private var showWhatsNew = false
     @State private var showChooseLAMode = false
     @State private var showSetPasscode = false
-    @State private var chatListActionSheet: ChatListActionSheet? = nil
-
-    private enum ChatListActionSheet: Identifiable {
-        case connectViaUrl(action: ConnReqType, link: String)
-
-        var id: String {
-            switch self {
-            case let .connectViaUrl(_, link): return "connectViaUrl \(link)"
-            }
-        }
-    }
 
     var body: some View {
         ZStack {
@@ -91,11 +80,6 @@ struct ContentView: View {
             if case .onboardingComplete = step,
                chatModel.currentUser != nil {
                 mainView()
-                .actionSheet(item: $chatListActionSheet) { sheet in
-                    switch sheet {
-                    case let .connectViaUrl(action, link): return connectViaUrlSheet(action, link)
-                    }
-                }
             } else {
                 OnboardingView(onboarding: step)
             }
@@ -148,9 +132,7 @@ struct ContentView: View {
                     }
                 }
                 prefShowLANotice = true
-                connectViaUrl()
             }
-            .onChange(of: chatModel.appOpenUrl) { _ in connectViaUrl() }
             .sheet(isPresented: $showWhatsNew) {
                 WhatsNewView()
             }
@@ -283,40 +265,36 @@ struct ContentView: View {
             secondaryButton: .cancel()
         )
     }
+}
 
-    func connectViaUrl() {
-        dismissAllSheets() {
-            let m = ChatModel.shared
-            if let url = m.appOpenUrl {
-                m.appOpenUrl = nil
-                var path = url.path
-                logger.debug("ContentView.connectViaUrl path: \(path)")
-                if (path == "/contact" || path == "/invitation") {
-                    path.removeFirst()
-                    let action: ConnReqType = path == "contact" ? .contact : .invitation
-                    let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
-                    chatListActionSheet = .connectViaUrl(action: action, link: link)
-                } else {
-                    AlertManager.shared.showAlert(Alert(title: Text("Error: URL is invalid")))
-                }
-            }
-        }
+func connectViaUrl() {
+    let m = ChatModel.shared
+    if let url = m.appOpenUrl {
+        m.appOpenUrl = nil
+        AlertManager.shared.showAlert(connectViaUrlAlert(url))
     }
+}
 
-    private func connectViaUrlSheet(_ action: ConnReqType, _ link: String) -> ActionSheet {
+func connectViaUrlAlert(_ url: URL) -> Alert {
+    var path = url.path
+    logger.debug("ChatListView.connectViaUrlAlert path: \(path)")
+    if (path == "/contact" || path == "/invitation") {
+        path.removeFirst()
+        let action: ConnReqType = path == "contact" ? .contact : .invitation
+        let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
         let title: LocalizedStringKey
-        switch action {
-        case .contact: title = "Connect via contact link"
-        case .invitation: title = "Connect via one-time link"
-        }
-        return ActionSheet(
+        if case .contact = action { title = "Connect via contact link?" }
+        else { title = "Connect via one-time link?" }
+        return Alert(
             title: Text(title),
-            buttons: [
-                .default(Text("Use current profile")) { connectViaLink(link, incognito: false) },
-                .default(Text("Use new incognito profile")) { connectViaLink(link, incognito: true) },
-                .cancel()
-            ]
+            message: Text("Your profile will be sent to the contact that you received this link from"),
+            primaryButton: .default(Text("Connect")) {
+                connectViaLink(link)
+            },
+            secondaryButton: .cancel()
         )
+    } else {
+        return Alert(title: Text("Error: URL is invalid"))
     }
 }
 

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -103,15 +103,9 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         self.onFinishPlayback = onFinishPlayback
     }
 
-    func start(fileSource: CryptoFile, at: TimeInterval?) {
-        let url = getAppFilePath(fileSource.filePath)
-        if let cfArgs = fileSource.cryptoArgs {
-            if let data = try? readCryptoFile(path: url.path, cryptoArgs: cfArgs) {
-                audioPlayer = try? AVAudioPlayer(data: data)
-            }
-        } else {
-            audioPlayer = try? AVAudioPlayer(contentsOf: url)
-        }
+    func start(fileName: String, at: TimeInterval?) {
+        let url = getAppFilePath(fileName)
+        audioPlayer = try? AVAudioPlayer(contentsOf: url)
         audioPlayer?.delegate = self
         audioPlayer?.prepareToPlay()
         if let at = at {

apps/ios/Shared/Model/ChatModel.swift

@@ -11,38 +11,6 @@ import Combine
 import SwiftUI
 import SimpleXChat
 
-actor TerminalItems {
-    private var terminalItems: [TerminalItem] = []
-
-    static let shared = TerminalItems()
-
-    func items() -> [TerminalItem] {
-        terminalItems
-    }
-
-    func add(_ item: TerminalItem) async {
-        addTermItem(&terminalItems, item)
-        let m = ChatModel.shared
-        if m.showingTerminal {
-            await MainActor.run {
-                addTermItem(&m.terminalItems, item)
-            }
-        }
-    }
-
-    func addCommand(_ start: Date, _ cmd: ChatCommand, _ resp: ChatResponse) async {
-        await add(.cmd(start, cmd))
-        await add(.resp(.now, resp))
-    }
-}
-
-private func addTermItem(_ items: inout [TerminalItem], _ item: TerminalItem) {
-    if items.count >= 200 {
-        items.removeFirst()
-    }
-    items.append(item)
-}
-
 final class ChatModel: ObservableObject {
     @Published var onboardingStage: OnboardingStage?
     @Published var setDeliveryReceipts = false
@@ -65,7 +33,6 @@ final class ChatModel: ObservableObject {
     @Published var chatToTop: String?
     @Published var groupMembers: [GroupMember] = []
     // items in the terminal view
-    @Published var showingTerminal = false
     @Published var terminalItems: [TerminalItem] = []
     @Published var userAddress: UserContactLink?
     @Published var chatItemTTL: ChatItemTTL = .none
@@ -76,8 +43,9 @@ final class ChatModel: ObservableObject {
     @Published var tokenStatus: NtfTknStatus?
     @Published var notificationMode = NotificationsMode.off
     @Published var notificationPreview: NotificationPreviewMode = ntfPreviewModeGroupDefault.get()
+    @Published var incognito: Bool = incognitoGroupDefault.get()
     // pending notification actions
-    @Published var ntfContactRequest: NTFContactRequest?
+    @Published var ntfContactRequest: ChatId?
     @Published var ntfCallInvitationAction: (ChatId, NtfCallAction)?
     // current WebRTC call
     @Published var callInvitations: Dictionary<ChatId, RcvCallInvitation> = [:]
@@ -495,18 +463,18 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func increaseUnreadCounter(user: any UserLike) {
+    func increaseUnreadCounter(user: User) {
         changeUnreadCounter(user: user, by: 1)
         NtfManager.shared.incNtfBadgeCount()
     }
 
-    func decreaseUnreadCounter(user: any UserLike, by: Int = 1) {
+    func decreaseUnreadCounter(user: User, by: Int = 1) {
         changeUnreadCounter(user: user, by: -by)
         NtfManager.shared.decNtfBadgeCount(by: by)
     }
 
-    private func changeUnreadCounter(user: any UserLike, by: Int) {
-        if let i = users.firstIndex(where: { $0.user.userId == user.userId }) {
+    private func changeUnreadCounter(user: User, by: Int) {
+        if let i = users.firstIndex(where: { $0.user.id == user.id }) {
             users[i].unreadCount += by
         }
     }
@@ -516,27 +484,14 @@ final class ChatModel: ObservableObject {
             users.filter { !$0.user.activeUser }.reduce(0, { unread, next -> Int in unread + next.unreadCount })
     }
 
-    func getConnectedMemberNames(_ ci: ChatItem) -> [String] {
-        guard var i = getChatItemIndex(ci) else { return [] }
-        var ns: [String] = []
-        while i < reversedChatItems.count, let m = reversedChatItems[i].memberConnected {
-            ns.append(m.displayName)
-            i += 1
-        }
-        return ns
-    }
-
-    func getChatItemNeighbors(_ ci: ChatItem) -> (ChatItem?, ChatItem?) {
-        if let i = getChatItemIndex(ci)  {
-            return (
-                i + 1 < reversedChatItems.count ? reversedChatItems[i + 1] : nil,
-                i - 1 >= 0 ? reversedChatItems[i - 1] : nil
-            )
+    func getPrevChatItem(_ ci: ChatItem) -> ChatItem? {
+        if let i = getChatItemIndex(ci), i < reversedChatItems.count - 1  {
+            return reversedChatItems[i + 1]
         } else {
-            return (nil, nil)
+            return nil
         }
     }
-
+    
     func popChat(_ id: String) {
         if let i = getChatIndex(id) {
             popChat_(i)
@@ -625,11 +580,13 @@ final class ChatModel: ObservableObject {
     func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
         networkStatuses[contact.activeConn.agentConnId] ?? .unknown
     }
-}
 
-struct NTFContactRequest {
-    var incognito: Bool
-    var chatId: String
+    func addTerminalItem(_ item: TerminalItem) {
+        if terminalItems.count >= 500 {
+            terminalItems.remove(at: 0)
+        }
+        terminalItems.append(item)
+    }
 }
 
 struct UnreadChatItemCounts {

apps/ios/Shared/Model/ImageUtils.swift

@@ -11,43 +11,42 @@ import SimpleXChat
 import SwiftUI
 import AVKit
 
-func getLoadedFileSource(_ file: CIFile?) -> CryptoFile? {
-    if let file = file, file.loaded {
-        return file.fileSource
+func getLoadedFilePath(_ file: CIFile?) -> String? {
+    if let fileName = getLoadedFileName(file) {
+        return getAppFilePath(fileName).path
+    }
+    return nil
+}
+
+func getLoadedFileName(_ file: CIFile?) -> String? {
+    if let file = file,
+       file.loaded,
+       let fileName = file.filePath {
+        return fileName
     }
     return nil
 }
 
 func getLoadedImage(_ file: CIFile?) -> UIImage? {
-    if let fileSource = getLoadedFileSource(file) {
-        let filePath = getAppFilePath(fileSource.filePath)
+    let loadedFilePath = getLoadedFilePath(file)
+    if let loadedFilePath = loadedFilePath, let fileName = file?.filePath {
+        let filePath = getAppFilePath(fileName)
         do {
-            let data = try getFileData(filePath, fileSource.cryptoArgs)
+            let data = try Data(contentsOf: filePath)
             let img = UIImage(data: data)
-            do {
-                try img?.setGifFromData(data, levelOfIntegrity: 1.0)
-                return img
-            } catch {
-                return UIImage(data: data)
-            }
+            try img?.setGifFromData(data, levelOfIntegrity: 1.0)
+            return img
         } catch {
-            return nil
+            return UIImage(contentsOfFile: loadedFilePath)
         }
     }
     return nil
 }
 
-func getFileData(_ path: URL, _ cfArgs: CryptoFileArgs?) throws -> Data {
-    if let cfArgs = cfArgs {
-        return try readCryptoFile(path: path.path, cryptoArgs: cfArgs)
-    } else {
-        return try Data(contentsOf: path)
-    }
-}
-
 func getLoadedVideo(_ file: CIFile?) -> URL? {
-    if let fileSource = getLoadedFileSource(file) {
-        let filePath = getAppFilePath(fileSource.filePath)
+    let loadedFilePath = getLoadedFilePath(file)
+    if loadedFilePath != nil, let fileName = file?.filePath {
+        let filePath = getAppFilePath(fileName)
         if FileManager.default.fileExists(atPath: filePath.path) {
             return filePath
         }
@@ -55,18 +54,18 @@ func getLoadedVideo(_ file: CIFile?) -> URL? {
     return nil
 }
 
-func saveAnimImage(_ image: UIImage) -> CryptoFile? {
+func saveAnimImage(_ image: UIImage) -> String? {
     let fileName = generateNewFileName("IMG", "gif")
     guard let imageData = image.imageData else { return nil }
-    return saveFile(imageData, fileName, encrypted: privacyEncryptLocalFilesGroupDefault.get())
+    return saveFile(imageData, fileName)
 }
 
-func saveImage(_ uiImage: UIImage) -> CryptoFile? {
+func saveImage(_ uiImage: UIImage) -> String? {
     let hasAlpha = imageHasAlpha(uiImage)
     let ext = hasAlpha ? "png" : "jpg"
     if let imageDataResized = resizeImageToDataSize(uiImage, maxDataSize: MAX_IMAGE_SIZE, hasAlpha: hasAlpha) {
         let fileName = generateNewFileName("IMG", ext)
-        return saveFile(imageDataResized, fileName, encrypted: privacyEncryptLocalFilesGroupDefault.get())
+        return saveFile(imageDataResized, fileName)
     }
     return nil
 }
@@ -158,19 +157,13 @@ func imageHasAlpha(_ img: UIImage) -> Bool {
     return false
 }
 
-func saveFileFromURL(_ url: URL, encrypted: Bool) -> CryptoFile? {
-    let savedFile: CryptoFile?
+func saveFileFromURL(_ url: URL) -> String? {
+    let savedFile: String?
     if url.startAccessingSecurityScopedResource() {
         do {
+            let fileData = try Data(contentsOf: url)
             let fileName = uniqueCombine(url.lastPathComponent)
-            let toPath = getAppFilePath(fileName).path
-            if encrypted {
-                let cfArgs = try encryptCryptoFile(fromPath: url.path, toPath: toPath)
-                savedFile = CryptoFile(filePath: fileName, cryptoArgs: cfArgs)
-            } else {
-                try FileManager.default.copyItem(atPath: url.path, toPath: toPath)
-                savedFile = CryptoFile.plain(fileName)
-            }
+            savedFile = saveFile(fileData, fileName)
         } catch {
             logger.error("FileUtils.saveFileFromURL error: \(error.localizedDescription)")
             savedFile = nil
@@ -183,16 +176,18 @@ func saveFileFromURL(_ url: URL, encrypted: Bool) -> CryptoFile? {
     return savedFile
 }
 
-func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
+func saveFileFromURLWithoutLoad(_ url: URL) -> String? {
+    let savedFile: String?
     do {
         let fileName = uniqueCombine(url.lastPathComponent)
         try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
         ChatModel.shared.filesToDelete.remove(url)
-        return CryptoFile.plain(fileName)
+        savedFile = fileName
     } catch {
-        logger.error("ImageUtils.moveTempFileFromURL error: \(error.localizedDescription)")
-        return nil
+        logger.error("FileUtils.saveFileFromURLWithoutLoad error: \(error.localizedDescription)")
+        savedFile = nil
     }
+    return savedFile
 }
 
 func generateNewFileName(_ prefix: String, _ ext: String) -> String {
@@ -293,4 +288,4 @@ extension UIImage {
         }
         return self
     }
-}
+}

apps/ios/Shared/Model/NtfManager.swift

@@ -12,7 +12,6 @@ import UIKit
 import SimpleXChat
 
 let ntfActionAcceptContact = "NTF_ACT_ACCEPT_CONTACT"
-let ntfActionAcceptContactIncognito = "NTF_ACT_ACCEPT_CONTACT_INCOGNITO"
 let ntfActionAcceptCall = "NTF_ACT_ACCEPT_CALL"
 let ntfActionRejectCall = "NTF_ACT_REJECT_CALL"
 
@@ -42,13 +41,12 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
            userId != chatModel.currentUser?.userId {
             changeActiveUser(userId, viewPwd: nil)
         }
-        if content.categoryIdentifier == ntfCategoryContactRequest && (action == ntfActionAcceptContact || action == ntfActionAcceptContactIncognito),
+        if content.categoryIdentifier == ntfCategoryContactRequest && action == ntfActionAcceptContact,
            let chatId = content.userInfo["chatId"] as? String {
-            let incognito = action == ntfActionAcceptContactIncognito
             if case let .contactRequest(contactRequest) = chatModel.getChat(chatId)?.chatInfo {
-                Task { await acceptContactRequest(incognito: incognito, contactRequest: contactRequest) }
+                Task { await acceptContactRequest(contactRequest) }
             } else {
-                chatModel.ntfContactRequest = NTFContactRequest(incognito: incognito, chatId: chatId)
+                chatModel.ntfContactRequest = chatId
             }
         } else if let (chatId, ntfAction) = ntfCallAction(content, action) {
             if let invitation = chatModel.callInvitations.removeValue(forKey: chatId) {
@@ -136,17 +134,11 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         UNUserNotificationCenter.current().setNotificationCategories([
             UNNotificationCategory(
                 identifier: ntfCategoryContactRequest,
-                actions: [
-                    UNNotificationAction(
-                        identifier: ntfActionAcceptContact,
-                        title: NSLocalizedString("Accept", comment: "accept contact request via notification"),
-                        options: .foreground
-                    ), UNNotificationAction(
-                        identifier: ntfActionAcceptContactIncognito,
-                        title: NSLocalizedString("Accept incognito", comment: "accept contact request via notification"),
-                        options: .foreground
-                    )
-                ],
+                actions: [UNNotificationAction(
+                    identifier: ntfActionAcceptContact,
+                    title: NSLocalizedString("Accept", comment: "accept contact request via notification"),
+                    options: .foreground
+                )],
                 intentIdentifiers: [],
                 hiddenPreviewsBodyPlaceholder: NSLocalizedString("New contact request", comment: "notification")
             ),
@@ -211,17 +203,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         center.delegate = self
     }
 
-    func notifyContactRequest(_ user: any UserLike, _ contactRequest: UserContactRequest) {
+    func notifyContactRequest(_ user: User, _ contactRequest: UserContactRequest) {
         logger.debug("NtfManager.notifyContactRequest")
         addNotification(createContactRequestNtf(user, contactRequest))
     }
 
-    func notifyContactConnected(_ user: any UserLike, _ contact: Contact) {
+    func notifyContactConnected(_ user: User, _ contact: Contact) {
         logger.debug("NtfManager.notifyContactConnected")
         addNotification(createContactConnectedNtf(user, contact))
     }
 
-    func notifyMessageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) {
+    func notifyMessageReceived(_ user: User, _ cInfo: ChatInfo, _ cItem: ChatItem) {
         logger.debug("NtfManager.notifyMessageReceived")
         if cInfo.ntfsEnabled {
             addNotification(createMessageReceivedNtf(user, cInfo, cItem))

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -15,12 +15,6 @@ import SimpleXChat
 
 private var chatController: chat_ctrl?
 
-// currentChatVersion in core
-public let CURRENT_CHAT_VERSION: Int = 2
-
-// version range that supports establishing direct connection with a group member (xGrpDirectInvVRange in core)
-public let CREATE_MEMBER_CONTACT_VRANGE = VersionRange(minVersion: 2, maxVersion: CURRENT_CHAT_VERSION)
-
 enum TerminalItem: Identifiable {
     case cmd(Date, ChatCommand)
     case resp(Date, ChatResponse)
@@ -100,8 +94,9 @@ func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? =
     if case let .response(_, json) = resp {
         logger.debug("chatSendCmd \(cmd.cmdType) response: \(json)")
     }
-    Task {
-        await TerminalItems.shared.addCommand(start, cmd.obfuscated, resp)
+    DispatchQueue.main.async {
+        ChatModel.shared.addTerminalItem(.cmd(start, cmd.obfuscated))
+        ChatModel.shared.addTerminalItem(.resp(.now, resp))
     }
     return resp
 }
@@ -176,12 +171,6 @@ func apiSetUserContactReceipts(_ userId: Int64, userMsgReceiptSettings: UserMsgR
     throw r
 }
 
-func apiSetUserGroupReceipts(_ userId: Int64, userMsgReceiptSettings: UserMsgReceiptSettings) async throws {
-    let r = await chatSendCmd(.apiSetUserGroupReceipts(userId: userId, userMsgReceiptSettings: userMsgReceiptSettings))
-    if case .cmdOk = r { return }
-    throw r
-}
-
 func apiHideUser(_ userId: Int64, viewPwd: String) async throws -> User {
     try await setUserPrivacy_(.apiHideUser(userId: userId, viewPwd: viewPwd))
 }
@@ -257,6 +246,12 @@ func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
     throw r
 }
 
+func apiSetIncognito(incognito: Bool) throws {
+    let r = chatSendCmdSync(.setIncognito(incognito: incognito))
+    if case .cmdOk = r { return }
+    throw r
+}
+
 func apiExportArchive(config: ArchiveConfig) async throws {
     try await sendCommandOkResp(.apiExportArchive(config: config))
 }
@@ -321,23 +316,17 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
     throw r
 }
 
-func apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
+func apiSendMessage(type: ChatType, id: Int64, file: String?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
     let chatModel = ChatModel.shared
     let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live, ttl: ttl)
     let r: ChatResponse
     if type == .direct {
-        var cItem: ChatItem? = nil
-        let endTask = beginBGTask({
-            if let cItem = cItem {
-                DispatchQueue.main.async {
-                    chatModel.messageDelivery.removeValue(forKey: cItem.id)
-                }
-            }
-        })
+        var cItem: ChatItem!
+        let endTask = beginBGTask({ if cItem != nil { chatModel.messageDelivery.removeValue(forKey: cItem.id) } })
         r = await chatSendCmd(cmd, bgTask: false)
         if case let .newChatItem(_, aChatItem) = r {
             cItem = aChatItem.chatItem
-            chatModel.messageDelivery[aChatItem.chatItem.id] = endTask
+            chatModel.messageDelivery[cItem.id] = endTask
             return cItem
         }
         if let networkErrorAlert = networkErrorAlert(r) {
@@ -569,25 +558,19 @@ func apiVerifyGroupMember(_ groupId: Int64, _ groupMemberId: Int64, connectionCo
     return nil
 }
 
-func apiAddContact(incognito: Bool) async -> (String, PendingContactConnection)? {
+func apiAddContact() async -> String? {
     guard let userId = ChatModel.shared.currentUser?.userId else {
         logger.error("apiAddContact: no current user")
         return nil
     }
-    let r = await chatSendCmd(.apiAddContact(userId: userId, incognito: incognito), bgTask: false)
-    if case let .invitation(_, connReqInvitation, connection) = r { return (connReqInvitation, connection) }
+    let r = await chatSendCmd(.apiAddContact(userId: userId), bgTask: false)
+    if case let .invitation(_, connReqInvitation) = r { return connReqInvitation }
     AlertManager.shared.showAlert(connectionErrorAlert(r))
     return nil
 }
 
-func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> PendingContactConnection? {
-    let r = await chatSendCmd(.apiSetConnectionIncognito(connId: connId, incognito: incognito))
-    if case let .connectionIncognitoUpdated(_, toConnection) = r { return toConnection }
-    throw r
-}
-
-func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
-    let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
+func apiConnect(connReq: String) async -> ConnReqType? {
+    let (connReqType, alert) = await apiConnect_(connReq: connReq)
     if let alert = alert {
         AlertManager.shared.showAlert(alert)
         return nil
@@ -596,12 +579,12 @@ func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
     }
 }
 
-func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert?) {
+func apiConnect_(connReq: String) async -> (ConnReqType?, Alert?) {
     guard let userId = ChatModel.shared.currentUser?.userId else {
         logger.error("apiConnect: no current user")
         return (nil, nil)
     }
-    let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
+    let r = await chatSendCmd(.apiConnect(userId: userId, connReq: connReq))
     switch r {
     case .sentConfirmation: return (.invitation, nil)
     case .sentInvitation: return (.contact, nil)
@@ -697,12 +680,12 @@ func apiListContacts() throws -> [Contact] {
     throw r
 }
 
-func apiUpdateProfile(profile: Profile) async throws -> (Profile, [Contact])? {
+func apiUpdateProfile(profile: Profile) async throws -> Profile? {
     let userId = try currentUserId("apiUpdateProfile")
     let r = await chatSendCmd(.apiUpdateProfile(userId: userId, profile: profile))
     switch r {
     case .userProfileNoChange: return nil
-    case let .userProfileUpdated(_, _, toProfile, updateSummary): return (toProfile, updateSummary.changedContacts)
+    case let .userProfileUpdated(_, _, toProfile): return toProfile
     default: throw r
     }
 }
@@ -712,7 +695,7 @@ func apiSetProfileAddress(on: Bool) async throws -> User? {
     let r = await chatSendCmd(.apiSetProfileAddress(userId: userId, on: on))
     switch r {
     case .userProfileNoChange: return nil
-    case let .userProfileUpdated(user, _, _, _): return user
+    case let .userProfileUpdated(user, _, _): return user
     default: throw r
     }
 }
@@ -777,8 +760,8 @@ func userAddressAutoAccept(_ autoAccept: AutoAccept?) async throws -> UserContac
     }
 }
 
-func apiAcceptContactRequest(incognito: Bool, contactReqId: Int64) async -> Contact? {
-    let r = await chatSendCmd(.apiAcceptContact(incognito: incognito, contactReqId: contactReqId))
+func apiAcceptContactRequest(contactReqId: Int64) async -> Contact? {
+    let r = await chatSendCmd(.apiAcceptContact(contactReqId: contactReqId))
     let am = AlertManager.shared
 
     if case let .acceptingContactRequest(_, contact) = r { return contact }
@@ -813,35 +796,29 @@ func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
     try await sendCommandOkResp(.apiChatUnread(type: type, id: id, unreadChat: unreadChat))
 }
 
-func receiveFile(user: any UserLike, fileId: Int64, encrypted: Bool, auto: Bool = false) async {
-    if let chatItem = await apiReceiveFile(fileId: fileId, encrypted: encrypted, auto: auto) {
-        await chatItemSimpleUpdate(user, chatItem)
+func receiveFile(user: User, fileId: Int64) async {
+    if let chatItem = await apiReceiveFile(fileId: fileId) {
+        DispatchQueue.main.async { chatItemSimpleUpdate(user, chatItem) }
     }
 }
 
-func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
-    let r = await chatSendCmd(.receiveFile(fileId: fileId, encrypted: encrypted, inline: inline))
+func apiReceiveFile(fileId: Int64, inline: Bool? = nil) async -> AChatItem? {
+    let r = await chatSendCmd(.receiveFile(fileId: fileId, inline: inline))
     let am = AlertManager.shared
     if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
     if case .rcvFileAcceptedSndCancelled = r {
-        logger.debug("apiReceiveFile error: sender cancelled file transfer")
-        if !auto {
-            am.showAlertMsg(
-                title: "Cannot receive file",
-                message: "Sender cancelled file transfer."
-            )
-        }
+        am.showAlertMsg(
+            title: "Cannot receive file",
+            message: "Sender cancelled file transfer."
+        )
     } else if let networkErrorAlert = networkErrorAlert(r) {
-        logger.error("apiReceiveFile network error: \(String(describing: r))")
         am.showAlert(networkErrorAlert)
     } else {
-        switch chatError(r) {
-        case .fileCancelled:
-            logger.debug("apiReceiveFile ignoring fileCancelled error")
-        case .fileAlreadyReceiving:
+        logger.error("apiReceiveFile error: \(String(describing: r))")
+        switch r {
+        case .chatCmdError(_, .error(.fileAlreadyReceiving)):
             logger.debug("apiReceiveFile ignoring fileAlreadyReceiving error")
         default:
-            logger.error("apiReceiveFile error: \(String(describing: r))")
             am.showAlertMsg(
                 title: "Error receiving file",
                 message: "Error: \(String(describing: r))"
@@ -853,7 +830,7 @@ func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil, auto: B
 
 func cancelFile(user: User, fileId: Int64) async {
     if let chatItem = await apiCancelFile(fileId: fileId) {
-        await chatItemSimpleUpdate(user, chatItem)
+        DispatchQueue.main.async { chatItemSimpleUpdate(user, chatItem) }
         cleanupFile(chatItem)
     }
 }
@@ -886,8 +863,8 @@ func networkErrorAlert(_ r: ChatResponse) -> Alert? {
     }
 }
 
-func acceptContactRequest(incognito: Bool, contactRequest: UserContactRequest) async {
-    if let contact = await apiAcceptContactRequest(incognito: incognito, contactReqId: contactRequest.apiId) {
+func acceptContactRequest(_ contactRequest: UserContactRequest) async {
+    if let contact = await apiAcceptContactRequest(contactReqId: contactRequest.apiId) {
         let chat = Chat(chatInfo: ChatInfo.direct(contact: contact), chatItems: [])
         DispatchQueue.main.async { ChatModel.shared.replaceChat(contactRequest.id, chat) }
     }
@@ -1096,18 +1073,6 @@ func apiGetGroupLink(_ groupId: Int64) throws -> (String, GroupMemberRole)? {
     }
 }
 
-func apiCreateMemberContact(_ groupId: Int64, _ groupMemberId: Int64) async throws -> Contact {
-    let r = await chatSendCmd(.apiCreateMemberContact(groupId: groupId, groupMemberId: groupMemberId))
-    if case let .newMemberContact(_, contact, _, _) = r { return contact }
-    throw r
-}
-
-func apiSendMemberContactInvitation(_ contactId: Int64, _ msg: MsgContent) async throws -> Contact {
-    let r = await chatSendCmd(.apiSendMemberContactInvitation(contactId: contactId, msg: msg), bgDelay: msgDelay)
-    if case let .newMemberContactSentInv(_, contact, _, _) = r { return contact }
-    throw r
-}
-
 func apiGetVersion() throws -> CoreVersionInfo {
     let r = chatSendCmdSync(.showVersion)
     if case let .versionInfo(info, _, _) = r { return info }
@@ -1133,6 +1098,7 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
     try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
     try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
     try setXFTPConfig(getXFTPCfg())
+    try apiSetIncognito(incognito: incognitoGroupDefault.get())
     m.chatInitialized = true
     m.currentUser = try apiGetActiveUser()
     if m.currentUser == nil {
@@ -1267,50 +1233,38 @@ class ChatReceiver {
 }
 
 func processReceivedMsg(_ res: ChatResponse) async {
-    Task {
-        await TerminalItems.shared.add(.resp(.now, res))
-    }
     let m = ChatModel.shared
-    logger.debug("processReceivedMsg: \(res.responseType)")
-    switch res {
-    case let .newContactConnection(user, connection):
-        if active(user) {
-            await MainActor.run {
+    await MainActor.run {
+        m.addTerminalItem(.resp(.now, res))
+        logger.debug("processReceivedMsg: \(res.responseType)")
+        switch res {
+        case let .newContactConnection(user, connection):
+            if active(user) {
                 m.updateContactConnection(connection)
             }
-        }
-    case let .contactConnectionDeleted(user, connection):
-        if active(user) {
-            await MainActor.run {
+        case let .contactConnectionDeleted(user, connection):
+            if active(user) {
                 m.removeChat(connection.id)
             }
-        }
-    case let .contactConnected(user, contact, _):
-        if active(user) && contact.directOrUsed {
-            await MainActor.run {
+        case let .contactConnected(user, contact, _):
+            if active(user) && contact.directOrUsed {
                 m.updateContact(contact)
                 m.dismissConnReqView(contact.activeConn.id)
                 m.removeChat(contact.activeConn.id)
             }
-        }
-        if contact.directOrUsed {
-            NtfManager.shared.notifyContactConnected(user, contact)
-        }
-        await MainActor.run {
+            if contact.directOrUsed {
+                NtfManager.shared.notifyContactConnected(user, contact)
+            }
             m.setContactNetworkStatus(contact, .connected)
-        }
-    case let .contactConnecting(user, contact):
-        if active(user) && contact.directOrUsed {
-            await MainActor.run {
+        case let .contactConnecting(user, contact):
+            if active(user) && contact.directOrUsed {
                 m.updateContact(contact)
                 m.dismissConnReqView(contact.activeConn.id)
                 m.removeChat(contact.activeConn.id)
             }
-        }
-    case let .receivedContactRequest(user, contactRequest):
-        if active(user) {
-            let cInfo = ChatInfo.contactRequest(contactRequest: contactRequest)
-            await MainActor.run {
+        case let .receivedContactRequest(user, contactRequest):
+            if active(user) {
+                let cInfo = ChatInfo.contactRequest(contactRequest: contactRequest)
                 if m.hasChat(contactRequest.id) {
                     m.updateChatInfo(cInfo)
                 } else {
@@ -1320,318 +1274,255 @@ func processReceivedMsg(_ res: ChatResponse) async {
                     ))
                 }
             }
-        }
-        NtfManager.shared.notifyContactRequest(user, contactRequest)
-    case let .contactUpdated(user, toContact):
-        if active(user) && m.hasChat(toContact.id) {
-            await MainActor.run {
+            NtfManager.shared.notifyContactRequest(user, contactRequest)
+        case let .contactUpdated(user, toContact):
+            if active(user) && m.hasChat(toContact.id) {
                 let cInfo = ChatInfo.direct(contact: toContact)
                 m.updateChatInfo(cInfo)
             }
-        }
-    case let .contactsMerged(user, intoContact, mergedContact):
-        if active(user) && m.hasChat(mergedContact.id) {
-            await MainActor.run {
+        case let .contactsMerged(user, intoContact, mergedContact):
+            if active(user) && m.hasChat(mergedContact.id) {
                 if m.chatId == mergedContact.id {
                     m.chatId = intoContact.id
                 }
                 m.removeChat(mergedContact.id)
             }
-        }
-    case let .contactsSubscribed(_, contactRefs):
-        await updateContactsStatus(contactRefs, status: .connected)
-    case let .contactsDisconnected(_, contactRefs):
-        await updateContactsStatus(contactRefs, status: .disconnected)
-    case let .contactSubError(user, contact, chatError):
-        await MainActor.run {
+        case let .contactsSubscribed(_, contactRefs):
+            updateContactsStatus(contactRefs, status: .connected)
+        case let .contactsDisconnected(_, contactRefs):
+            updateContactsStatus(contactRefs, status: .disconnected)
+        case let .contactSubError(user, contact, chatError):
             if active(user) {
                 m.updateContact(contact)
             }
             processContactSubError(contact, chatError)
-        }
-    case let .contactSubSummary(_, contactSubscriptions):
-        await MainActor.run {
+        case let .contactSubSummary(user, contactSubscriptions):
             for sub in contactSubscriptions {
-// no need to update contact here, and it is slow
-//                if active(user) {
-//                    m.updateContact(sub.contact)
-//                }
+                if active(user) {
+                    m.updateContact(sub.contact)
+                }
                 if let err = sub.contactError {
                     processContactSubError(sub.contact, err)
                 } else {
                     m.setContactNetworkStatus(sub.contact, .connected)
                 }
             }
-        }
-    case let .newChatItem(user, aChatItem):
-        let cInfo = aChatItem.chatInfo
-        let cItem = aChatItem.chatItem
-        await MainActor.run {
+        case let .newChatItem(user, aChatItem):
+            let cInfo = aChatItem.chatInfo
+            let cItem = aChatItem.chatItem
             if active(user) {
                 m.addChatItem(cInfo, cItem)
             } else if cItem.isRcvNew && cInfo.ntfsEnabled {
                 m.increaseUnreadCounter(user: user)
             }
-        }
-        if let file = cItem.autoReceiveFile() {
-            Task {
-                await receiveFile(user: user, fileId: file.fileId, encrypted: cItem.encryptLocalFile, auto: true)
-            }
-        }
-        if cItem.showNotification {
-            NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
-        }
-    case let .chatItemStatusUpdated(user, aChatItem):
-        let cInfo = aChatItem.chatInfo
-        let cItem = aChatItem.chatItem
-        if !cItem.isDeletedContent {
-            let added = active(user) ? await MainActor.run { m.upsertChatItem(cInfo, cItem) } : true
-            if added && cItem.showNotification {
-                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
-            }
-        }
-        if let endTask = m.messageDelivery[cItem.id] {
-            switch cItem.meta.itemStatus {
-            case .sndSent: endTask()
-            case .sndErrorAuth: endTask()
-            case .sndError: endTask()
-            default: ()
-            }
-        }
-    case let .chatItemUpdated(user, aChatItem):
-        await chatItemSimpleUpdate(user, aChatItem)
-    case let .chatItemReaction(user, _, r):
-        if active(user) {
-            await MainActor.run {
-                m.updateChatItem(r.chatInfo, r.chatReaction.chatItem)
-            }
-        }
-    case let .chatItemDeleted(user, deletedChatItem, toChatItem, _):
-        if !active(user) {
-            if toChatItem == nil && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled {
-                await MainActor.run {
-                    m.decreaseUnreadCounter(user: user)
+            if let file = cItem.autoReceiveFile() {
+                Task {
+                    await receiveFile(user: user, fileId: file.fileId)
                 }
             }
-            return
-        }
+            if cItem.showNotification {
+                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+            }
+        case let .chatItemStatusUpdated(user, aChatItem):
+            let cInfo = aChatItem.chatInfo
+            let cItem = aChatItem.chatItem
+            if !cItem.isDeletedContent {
+                let added = active(user) ? m.upsertChatItem(cInfo, cItem) : true
+                if added && cItem.showNotification {
+                    NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+                }
+            }
+            if let endTask = m.messageDelivery[cItem.id] {
+                switch cItem.meta.itemStatus {
+                case .sndSent: endTask()
+                case .sndErrorAuth: endTask()
+                case .sndError: endTask()
+                default: ()
+                }
+            }
+        case let .chatItemUpdated(user, aChatItem):
+            chatItemSimpleUpdate(user, aChatItem)
+        case let .chatItemReaction(user, _, r):
+            if active(user) {
+                m.updateChatItem(r.chatInfo, r.chatReaction.chatItem)
+            }
+        case let .chatItemDeleted(user, deletedChatItem, toChatItem, _):
+            if !active(user) {
+                if toChatItem == nil && deletedChatItem.chatItem.isRcvNew && deletedChatItem.chatInfo.ntfsEnabled {
+                    m.decreaseUnreadCounter(user: user)
+                }
+                return
+            }
 
-        await MainActor.run {
             if let toChatItem = toChatItem {
                 _ = m.upsertChatItem(toChatItem.chatInfo, toChatItem.chatItem)
             } else {
                 m.removeChatItem(deletedChatItem.chatInfo, deletedChatItem.chatItem)
             }
-        }
-    case let .receivedGroupInvitation(user, groupInfo, _, _):
-        if active(user) {
-            await MainActor.run {
+        case let .receivedGroupInvitation(user, groupInfo, _, _):
+            if active(user) {
                 m.updateGroup(groupInfo) // update so that repeat group invitations are not duplicated
                 // NtfManager.shared.notifyContactRequest(contactRequest) // TODO notifyGroupInvitation?
             }
-        }
-    case let .userAcceptedGroupSent(user, groupInfo, hostContact):
-        if !active(user) { return }
+        case let .userAcceptedGroupSent(user, groupInfo, hostContact):
+            if !active(user) { return }
 
-        await MainActor.run {
             m.updateGroup(groupInfo)
             if let hostContact = hostContact {
                 m.dismissConnReqView(hostContact.activeConn.id)
                 m.removeChat(hostContact.activeConn.id)
             }
-        }
-    case let .joinedGroupMemberConnecting(user, groupInfo, _, member):
-        if active(user) {
-            await MainActor.run {
+        case let .joinedGroupMemberConnecting(user, groupInfo, _, member):
+            if active(user) {
                 _ = m.upsertGroupMember(groupInfo, member)
             }
-        }
-    case let .deletedMemberUser(user, groupInfo, _): // TODO update user member
-        if active(user) {
-            await MainActor.run {
+        case let .deletedMemberUser(user, groupInfo, _): // TODO update user member
+            if active(user) {
                 m.updateGroup(groupInfo)
             }
-        }
-    case let .deletedMember(user, groupInfo, _, deletedMember):
-        if active(user) {
-            await MainActor.run {
+        case let .deletedMember(user, groupInfo, _, deletedMember):
+            if active(user) {
                 _ = m.upsertGroupMember(groupInfo, deletedMember)
             }
-        }
-    case let .leftMember(user, groupInfo, member):
-        if active(user) {
-            await MainActor.run {
+        case let .leftMember(user, groupInfo, member):
+            if active(user) {
                 _ = m.upsertGroupMember(groupInfo, member)
             }
-        }
-    case let .groupDeleted(user, groupInfo, _): // TODO update user member
-        if active(user) {
-            await MainActor.run {
+        case let .groupDeleted(user, groupInfo, _): // TODO update user member
+            if active(user) {
                 m.updateGroup(groupInfo)
             }
-        }
-    case let .userJoinedGroup(user, groupInfo):
-        if active(user) {
-            await MainActor.run {
+        case let .userJoinedGroup(user, groupInfo):
+            if active(user) {
                 m.updateGroup(groupInfo)
             }
-        }
-    case let .joinedGroupMember(user, groupInfo, member):
-        if active(user) {
-            await MainActor.run {
+        case let .joinedGroupMember(user, groupInfo, member):
+            if active(user) {
                 _ = m.upsertGroupMember(groupInfo, member)
             }
-        }
-    case let .connectedToGroupMember(user, groupInfo, member, memberContact):
-        if active(user) {
-            await MainActor.run {
+        case let .connectedToGroupMember(user, groupInfo, member, memberContact):
+            if active(user) {
                 _ = m.upsertGroupMember(groupInfo, member)
             }
-        }
-        if let contact = memberContact {
-            await MainActor.run {
+            if let contact = memberContact {
                 m.setContactNetworkStatus(contact, .connected)
             }
-        }
-    case let .groupUpdated(user, toGroup):
-        if active(user) {
-            await MainActor.run {
+        case let .groupUpdated(user, toGroup):
+            if active(user) {
                 m.updateGroup(toGroup)
             }
-        }
-    case let .memberRole(user, groupInfo, _, _, _, _):
-        if active(user) {
-            await MainActor.run {
+        case let .memberRole(user, groupInfo, _, _, _, _):
+            if active(user) {
                 m.updateGroup(groupInfo)
             }
+        case let .rcvFileAccepted(user, aChatItem): // usually rcvFileAccepted is a response, but it's also an event for XFTP files auto-accepted from NSE
+            chatItemSimpleUpdate(user, aChatItem)
+        case let .rcvFileStart(user, aChatItem):
+            chatItemSimpleUpdate(user, aChatItem)
+        case let .rcvFileComplete(user, aChatItem):
+            chatItemSimpleUpdate(user, aChatItem)
+        case let .rcvFileSndCancelled(user, aChatItem, _):
+            chatItemSimpleUpdate(user, aChatItem)
+            cleanupFile(aChatItem)
+        case let .rcvFileProgressXFTP(user, aChatItem, _, _):
+            chatItemSimpleUpdate(user, aChatItem)
+        case let .rcvFileError(user, aChatItem):
+            chatItemSimpleUpdate(user, aChatItem)
+            cleanupFile(aChatItem)
+        case let .sndFileStart(user, aChatItem, _):
+            chatItemSimpleUpdate(user, aChatItem)
+        case let .sndFileComplete(user, aChatItem, _):
+            chatItemSimpleUpdate(user, aChatItem)
+            cleanupDirectFile(aChatItem)
+        case let .sndFileRcvCancelled(user, aChatItem, _):
+            chatItemSimpleUpdate(user, aChatItem)
+            cleanupDirectFile(aChatItem)
+        case let .sndFileProgressXFTP(user, aChatItem, _, _, _):
+            chatItemSimpleUpdate(user, aChatItem)
+        case let .sndFileCompleteXFTP(user, aChatItem, _):
+            chatItemSimpleUpdate(user, aChatItem)
+            cleanupFile(aChatItem)
+        case let .sndFileError(user, aChatItem):
+            chatItemSimpleUpdate(user, aChatItem)
+            cleanupFile(aChatItem)
+        case let .callInvitation(invitation):
+            m.callInvitations[invitation.contact.id] = invitation
+            activateCall(invitation)
+        case let .callOffer(_, contact, callType, offer, sharedKey, _):
+            withCall(contact) { call in
+                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(
+                    offer: offer.rtcSession,
+                    iceCandidates: offer.rtcIceCandidates,
+                    media: callType.media, aesKey: sharedKey,
+                    iceServers: iceServers,
+                    relay: useRelay
+                )
+            }
+        case let .callAnswer(_, contact, answer):
+            withCall(contact) { call in
+                call.callState = .answerReceived
+                m.callCommand = .answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates)
+            }
+        case let .callExtraInfo(_, contact, extraInfo):
+            withCall(contact) { _ in
+                m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
+            }
+        case let .callEnded(_, contact):
+            if let invitation = m.callInvitations.removeValue(forKey: contact.id) {
+                CallController.shared.reportCallRemoteEnded(invitation: invitation)
+            }
+            withCall(contact) { call in
+                m.callCommand = .end
+                CallController.shared.reportCallRemoteEnded(call: call)
+            }
+        case .chatSuspended:
+            chatSuspended()
+        case let .contactSwitch(_, contact, switchProgress):
+            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
+        case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
+            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
+        case let .contactRatchetSync(_, contact, ratchetSyncProgress):
+            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
+        case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
+            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
+        default:
+            logger.debug("unsupported event: \(res.responseType)")
         }
-    case let .newMemberContactReceivedInv(user, contact, _, _):
-        if active(user) {
-            await MainActor.run {
-                m.updateContact(contact)
+
+        func withCall(_ contact: Contact, _ perform: (Call) -> Void) {
+            if let call = m.activeCall, call.contact.apiId == contact.apiId {
+                perform(call)
+            } else {
+                logger.debug("processReceivedMsg: ignoring \(res.responseType), not in call with the contact \(contact.id)")
             }
         }
-    case let .rcvFileAccepted(user, aChatItem): // usually rcvFileAccepted is a response, but it's also an event for XFTP files auto-accepted from NSE
-        await chatItemSimpleUpdate(user, aChatItem)
-    case let .rcvFileStart(user, aChatItem):
-        await chatItemSimpleUpdate(user, aChatItem)
-    case let .rcvFileComplete(user, aChatItem):
-        await chatItemSimpleUpdate(user, aChatItem)
-    case let .rcvFileSndCancelled(user, aChatItem, _):
-        await chatItemSimpleUpdate(user, aChatItem)
-        Task { cleanupFile(aChatItem) }
-    case let .rcvFileProgressXFTP(user, aChatItem, _, _):
-        await chatItemSimpleUpdate(user, aChatItem)
-    case let .rcvFileError(user, aChatItem):
-        await chatItemSimpleUpdate(user, aChatItem)
-        Task { cleanupFile(aChatItem) }
-    case let .sndFileStart(user, aChatItem, _):
-        await chatItemSimpleUpdate(user, aChatItem)
-    case let .sndFileComplete(user, aChatItem, _):
-        await chatItemSimpleUpdate(user, aChatItem)
-        Task { cleanupDirectFile(aChatItem) }
-    case let .sndFileRcvCancelled(user, aChatItem, _):
-        await chatItemSimpleUpdate(user, aChatItem)
-        Task { cleanupDirectFile(aChatItem) }
-    case let .sndFileProgressXFTP(user, aChatItem, _, _, _):
-        await chatItemSimpleUpdate(user, aChatItem)
-    case let .sndFileCompleteXFTP(user, aChatItem, _):
-        await chatItemSimpleUpdate(user, aChatItem)
-        Task { cleanupFile(aChatItem) }
-    case let .sndFileError(user, aChatItem):
-        await chatItemSimpleUpdate(user, aChatItem)
-        Task { cleanupFile(aChatItem) }
-    case let .callInvitation(invitation):
-        await MainActor.run {
-            m.callInvitations[invitation.contact.id] = invitation
-        }
-        activateCall(invitation)
-    case let .callOffer(_, contact, callType, offer, sharedKey, _):
-        await withCall(contact) { call in
-            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(
-                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)
-        }
-    case let .callExtraInfo(_, contact, extraInfo):
-        await withCall(contact) { _ in
-            m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
-        }
-    case let .callEnded(_, contact):
-        if let invitation = await MainActor.run(body: { m.callInvitations.removeValue(forKey: contact.id) }) {
-            CallController.shared.reportCallRemoteEnded(invitation: invitation)
-        }
-        await withCall(contact) { call in
-            m.callCommand = .end
-            CallController.shared.reportCallRemoteEnded(call: call)
-        }
-    case .chatSuspended:
-        chatSuspended()
-    case let .contactSwitch(_, contact, switchProgress):
-        await MainActor.run {
-            m.updateContactConnectionStats(contact, switchProgress.connectionStats)
-        }
-    case let .groupMemberSwitch(_, groupInfo, member, switchProgress):
-        await MainActor.run {
-            m.updateGroupMemberConnectionStats(groupInfo, member, switchProgress.connectionStats)
-        }
-    case let .contactRatchetSync(_, contact, ratchetSyncProgress):
-        await MainActor.run {
-            m.updateContactConnectionStats(contact, ratchetSyncProgress.connectionStats)
-        }
-    case let .groupMemberRatchetSync(_, groupInfo, member, ratchetSyncProgress):
-        await MainActor.run {
-            m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
-        }
-    default:
-        logger.debug("unsupported event: \(res.responseType)")
-    }
-
-    func withCall(_ contact: Contact, _ perform: (Call) -> Void) async {
-        if let call = m.activeCall, call.contact.apiId == contact.apiId {
-            await MainActor.run { perform(call) }
-        } else {
-            logger.debug("processReceivedMsg: ignoring \(res.responseType), not in call with the contact \(contact.id)")
-        }
     }
 }
 
-func active(_ user: any UserLike) -> Bool {
-    user.userId == ChatModel.shared.currentUser?.id
+func active(_ user: User) -> Bool {
+    user.id == ChatModel.shared.currentUser?.id
 }
 
-func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
+func chatItemSimpleUpdate(_ user: User, _ aChatItem: AChatItem) {
     let m = ChatModel.shared
     let cInfo = aChatItem.chatInfo
     let cItem = aChatItem.chatItem
-    if active(user) {
-        if await MainActor.run(body: { m.upsertChatItem(cInfo, cItem) }) {
-            NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
-        }
+    if active(user) && m.upsertChatItem(cInfo, cItem) {
+        NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
     }
 }
 
-func updateContactsStatus(_ contactRefs: [ContactRef], status: NetworkStatus) async {
+func updateContactsStatus(_ contactRefs: [ContactRef], status: NetworkStatus) {
     let m = ChatModel.shared
-    await MainActor.run {
-        for c in contactRefs {
-            m.networkStatuses[c.agentConnId] = status
-        }
+    for c in contactRefs {
+        m.networkStatuses[c.agentConnId] = status
     }
 }
 
@@ -1670,9 +1561,7 @@ func activateCall(_ callInvitation: RcvCallInvitation) {
     let m = ChatModel.shared
     CallController.shared.reportNewIncomingCall(invitation: callInvitation) { error in
         if let error = error {
-            DispatchQueue.main.async {
-                m.callInvitations[callInvitation.contact.id]?.callkitUUID = nil
-            }
+            m.callInvitations[callInvitation.contact.id]?.callkitUUID = nil
             logger.error("reportNewIncomingCall error: \(error.localizedDescription)")
         } else {
             logger.debug("reportNewIncomingCall success")
@@ -1684,3 +1573,15 @@ private struct UserResponse: Decodable {
     var user: User?
     var error: String?
 }
+
+struct RuntimeError: Error {
+    let message: String
+
+    init(_ message: String) {
+        self.message = message
+    }
+
+    public var localizedDescription: String {
+        return message
+    }
+}

apps/ios/Shared/SimpleXApp.swift

@@ -139,10 +139,10 @@ struct SimpleXApp: App {
                let chat = chatModel.getChat(id) {
                 loadChat(chat: chat)
             }
-            if let ncr = chatModel.ntfContactRequest {
+            if let chatId = chatModel.ntfContactRequest {
                 chatModel.ntfContactRequest = nil
-                if case let .contactRequest(contactRequest) = chatModel.getChat(ncr.chatId)?.chatInfo {
-                    Task { await acceptContactRequest(incognito: ncr.incognito, contactRequest: contactRequest) }
+                if case let .contactRequest(contactRequest) = chatModel.getChat(chatId)?.chatInfo {
+                    Task { await acceptContactRequest(contactRequest) }
                 }
             }
         } catch let error {

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

@@ -143,12 +143,7 @@ struct ChatInfoView: View {
 
                 if let customUserProfile = customUserProfile {
                     Section("Incognito") {
-                        HStack {
-                            Text("Your random profile")
-                            Spacer()
-                            Text(customUserProfile.chatViewName)
-                                .foregroundStyle(.indigo)
-                        }
+                        infoRow("Your random profile", customUserProfile.chatViewName)
                     }
                 }
 
@@ -164,7 +159,6 @@ struct ChatInfoView: View {
 //                        synchronizeConnectionButtonForce()
 //                    }
                 }
-                .disabled(!contact.ready)
 
                 if let contactLink = contact.contactLink {
                     Section {
@@ -181,33 +175,30 @@ struct ChatInfoView: View {
                     }
                 }
 
-                if contact.ready {
-                    Section("Servers") {
-                        networkStatusRow()
-                            .onTapGesture {
-                                alert = .networkStatusAlert
-                            }
-                        if let connStats = connectionStats {
-                            Button("Change receiving address") {
-                                alert = .switchAddressAlert
+                Section("Servers") {
+                    networkStatusRow()
+                        .onTapGesture {
+                            alert = .networkStatusAlert
+                        }
+                    if let connStats = connectionStats {
+                        Button("Change receiving address") {
+                            alert = .switchAddressAlert
+                        }
+                        .disabled(
+                            connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                            || connStats.ratchetSyncSendProhibited
+                        )
+                        if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
+                            Button("Abort changing address") {
+                                alert = .abortSwitchAddressAlert
                             }
                             .disabled(
-                                !contact.ready
-                                || connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
                                 || connStats.ratchetSyncSendProhibited
                             )
-                            if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
-                                Button("Abort changing address") {
-                                    alert = .abortSwitchAddressAlert
-                                }
-                                .disabled(
-                                    connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
-                                    || connStats.ratchetSyncSendProhibited
-                                )
-                            }
-                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer })
-                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer })
                         }
+                        smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer })
+                        smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer })
                     }
                 }
 

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

@@ -10,11 +10,20 @@ import SwiftUI
 import SimpleXChat
 
 struct CIEventView: View {
-    var eventText: Text
+    var chatItem: ChatItem
 
     var body: some View {
         HStack(alignment: .bottom, spacing: 0) {
-            eventText
+            if let member = chatItem.memberDisplayName {
+                Text(member)
+                    .font(.caption)
+                    .foregroundColor(.secondary)
+                    .fontWeight(.light)
+                + Text(" ")
+                + chatEventText(chatItem)
+            } else {
+                chatEventText(chatItem)
+            }
         }
         .padding(.leading, 6)
         .padding(.bottom, 6)
@@ -22,8 +31,20 @@ struct CIEventView: View {
     }
 }
 
+func chatEventText(_ ci: ChatItem) -> Text {
+    Text(ci.content.text)
+        .font(.caption)
+        .foregroundColor(.secondary)
+        .fontWeight(.light)
+    + Text(" ")
+    + ci.timestampText
+        .font(.caption)
+        .foregroundColor(Color.secondary)
+        .fontWeight(.light)
+}
+
 struct CIEventView_Previews: PreviewProvider {
     static var previews: some View {
-        CIEventView(eventText: Text("event happened"))
+        CIEventView(chatItem: ChatItem.getGroupEventSample())
     }
 }

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

@@ -16,8 +16,8 @@ struct CIFileView: View {
 
     var body: some View {
         let metaReserve = edited
-        ? "                           "
-        : "                       "
+        ? "                         "
+        : "                     "
         Button(action: fileAction) {
             HStack(alignment: .bottom, spacing: 6) {
                 fileIndicator()
@@ -62,7 +62,6 @@ struct CIFileView: View {
             case .rcvComplete: return true
             case .rcvCancelled: return false
             case .rcvError: return false
-            case .invalid: return false
             }
         }
         return false
@@ -84,8 +83,7 @@ struct CIFileView: View {
                     Task {
                         logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
                         if let user = ChatModel.shared.currentUser {
-                            let encrypted = privacyEncryptLocalFilesGroupDefault.get()
-                            await receiveFile(user: user, fileId: file.fileId, encrypted: encrypted)
+                            await receiveFile(user: user, fileId: file.fileId)
                         }
                     }
                 } else {
@@ -110,8 +108,9 @@ struct CIFileView: View {
                 }
             case .rcvComplete:
                 logger.debug("CIFileView fileAction - in .rcvComplete")
-                if let fileSource = getLoadedFileSource(file) {
-                    saveCryptoFile(fileSource)
+                if let filePath = getLoadedFilePath(file) {
+                    let url = URL(fileURLWithPath: filePath)
+                    showShareSheet(items: [url])
                 }
             default: break
             }
@@ -150,7 +149,6 @@ struct CIFileView: View {
             case .rcvComplete: fileIcon("doc.fill")
             case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
             case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
-            case .invalid: fileIcon("doc.fill", innerIcon: "questionmark", innerIconSize: 10)
             }
         } else {
             fileIcon("doc.fill")
@@ -193,35 +191,11 @@ struct CIFileView: View {
     }
 }
 
-func saveCryptoFile(_ fileSource: CryptoFile) {
-    if let cfArgs = fileSource.cryptoArgs {
-        let url = getAppFilePath(fileSource.filePath)
-        let tempUrl = getTempFilesDirectory().appendingPathComponent(fileSource.filePath)
-        Task {
-            do {
-                try decryptCryptoFile(fromPath: url.path, cryptoArgs: cfArgs, toPath: tempUrl.path)
-                await MainActor.run {
-                    showShareSheet(items: [tempUrl]) {
-                        removeFile(tempUrl)
-                    }
-                }
-            } catch {
-                await MainActor.run {
-                    AlertManager.shared.showAlertMsg(title: "Error decrypting file", message: "Error: \(error.localizedDescription)")
-                }
-            }
-        }
-    } else {
-        let url = getAppFilePath(fileSource.filePath)
-        showShareSheet(items: [url])
-    }
-}
-
 struct CIFileView_Previews: PreviewProvider {
     static var previews: some View {
         let sentFile: ChatItem = ChatItem(
             chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
             content: .sndMsgContent(msgContent: .file("")),
             quotedItem: nil,
             file: CIFile.getSample(fileStatus: .sndComplete)

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

@@ -16,7 +16,6 @@ struct CIImageView: View {
     let maxWidth: CGFloat
     @Binding var imgWidth: CGFloat?
     @State var scrollProxy: ScrollViewProxy?
-    @State var metaColor: Color
     @State private var showFullScreenImage = false
 
     var body: some View {
@@ -37,8 +36,9 @@ struct CIImageView: View {
                             case .rcvInvitation:
                                 Task {
                                     if let user = ChatModel.shared.currentUser {
-                                        await receiveFile(user: user, fileId: file.fileId, encrypted: chatItem.encryptLocalFile)
+                                        await receiveFile(user: user, fileId: file.fileId)
                                     }
+                                    // TODO image accepted alert?
                                 }
                             case .rcvAccepted:
                                 switch file.fileProtocol {
@@ -99,7 +99,6 @@ struct CIImageView: View {
             case .rcvTransfer: progressView()
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case .rcvError: fileIcon("xmark", 10, 13)
-            case .invalid: fileIcon("questionmark", 10, 13)
             default: EmptyView()
             }
         }
@@ -110,7 +109,7 @@ struct CIImageView: View {
             .resizable()
             .aspectRatio(contentMode: .fit)
             .frame(width: size, height: size)
-            .foregroundColor(metaColor)
+            .foregroundColor(.white)
             .padding(padding)
     }
 

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

@@ -1,79 +0,0 @@
-//
-//  CIMemberCreatedContactView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 19.09.2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct CIMemberCreatedContactView: View {
-    var chatItem: ChatItem
-    
-    var body: some View {
-        HStack(alignment: .bottom, spacing: 0) {
-            switch chatItem.chatDir {
-            case let .groupRcv(groupMember):
-                if let contactId = groupMember.memberContactId {
-                    memberCreatedContactView(openText: "Open")
-                        .onTapGesture {
-                            dismissAllSheets(animated: true)
-                            DispatchQueue.main.async {
-                                ChatModel.shared.chatId = "@\(contactId)"
-                            }
-                        }
-                } else {
-                    memberCreatedContactView()
-                }
-            default:
-                EmptyView()
-            }
-        }
-        .padding(.leading, 6)
-        .padding(.bottom, 6)
-        .textSelection(.disabled)
-    }
-    
-    private func memberCreatedContactView(openText: LocalizedStringKey? = nil) -> some View {
-        var r = eventText()
-        if let openText {
-            r = r
-            + Text(openText)
-                .fontWeight(.medium)
-                .foregroundColor(.accentColor)
-            + Text("  ")
-        }
-        r = r + chatItem.timestampText
-            .fontWeight(.light)
-            .foregroundColor(.secondary)
-        return r.font(.caption)
-    }
-    
-    private func eventText() -> Text {
-        if let member = chatItem.memberDisplayName {
-            return Text(member + " " + chatItem.content.text + "  ")
-                .fontWeight(.light)
-                .foregroundColor(.secondary)
-        } else {
-            return Text(chatItem.content.text + "  ")
-                .fontWeight(.light)
-                .foregroundColor(.secondary)
-        }
-    }
-}
-
-struct CIMemberCreatedContactView_Previews: PreviewProvider {
-    static var previews: some View {
-        let content = CIContent.rcvGroupEvent(rcvGroupEvent: .memberCreatedContact)
-        let chatItem = ChatItem(
-            chatDir: .groupRcv(groupMember: GroupMember.sampleData),
-            meta: CIMeta.getSample(1, .now, content.text, .rcvRead),
-            content: content,
-            quotedItem: nil,
-            file: nil
-        )
-        CIMemberCreatedContactView(chatItem: chatItem)
-    }
-}

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

@@ -13,7 +13,6 @@ struct CIMetaView: View {
     @EnvironmentObject var chat: Chat
     var chatItem: ChatItem
     var metaColor = Color.secondary
-    var paleMetaColor = Color(UIColor.tertiaryLabel)
 
     var body: some View {
         if chatItem.isDeletedContent {
@@ -21,28 +20,16 @@ struct CIMetaView: View {
         } else {
             let meta = chatItem.meta
             let ttl = chat.chatInfo.timedMessagesTTL
-            let encrypted = chatItem.encryptedFile
             switch meta.itemStatus {
-            case let .sndSent(sndProgress):
-                switch sndProgress {
-                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent)
-                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent)
-                }
-            case let .sndRcvd(_, sndProgress):
-                switch sndProgress {
-                case .complete:
-                    ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2)
-                    }
-                case .partial:
-                    ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2)
-                    }
+            case .sndSent:
+                ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .sent)
+            case .sndRcvd:
+                ZStack {
+                    ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .rcvd1)
+                    ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .rcvd2)
                 }
             default:
-                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor)
+                ciMetaText(meta, chatTTL: ttl, color: metaColor)
             }
         }
     }
@@ -54,7 +41,7 @@ enum SentCheckmark {
     case rcvd2
 }
 
-func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
+func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
     var r = Text("")
     if meta.itemEdited {
         r = r + statusIconText("pencil", color)
@@ -74,18 +61,14 @@ func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color =
         switch sent {
         case nil: r = r + t1
         case .sent: r = r + t1 + gap
-        case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67)) + gap
+        case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : color.opacity(0.67)) + gap
         case .rcvd2: r = r + gap + t1
         }
         r = r + Text(" ")
     } else if !meta.disappearing {
         r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
     }
-    if let enc = encrypted {
-        r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
-    }
-    r = r + meta.timestampText.foregroundColor(color)
-    return r.font(.caption)
+    return (r + meta.timestampText.foregroundColor(color)).font(.caption)
 }
 
 private func statusIconText(_ icon: String, _ color: Color) -> Text {
@@ -95,12 +78,8 @@ private func statusIconText(_ icon: String, _ color: Color) -> Text {
 struct CIMetaView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
-            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent))
+            CIMetaView(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, itemEdited: true))
             CIMetaView(chatItem: ChatItem.getDeletedContentSample())
         }
         .previewLayout(.fixed(width: 360, height: 100))

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

@@ -16,6 +16,7 @@ struct CIRcvDecryptionError: View {
     var msgDecryptError: MsgDecryptError
     var msgCount: UInt32
     var chatItem: ChatItem
+    var showMember = false
     @State private var alert: CIRcvDecryptionErrorAlert?
 
     enum CIRcvDecryptionErrorAlert: Identifiable {
@@ -105,6 +106,9 @@ struct CIRcvDecryptionError: View {
         ZStack(alignment: .bottomTrailing) {
             VStack(alignment: .leading, spacing: 2) {
                 HStack {
+                    if showMember, let member = chatItem.memberDisplayName {
+                        Text(member).fontWeight(.medium) + Text(": ")
+                    }
                     Text(chatItem.content.text)
                         .foregroundColor(.red)
                         .italic()
@@ -118,7 +122,7 @@ struct CIRcvDecryptionError: View {
                         .foregroundColor(syncSupported ? .accentColor : .secondary)
                         .font(.callout)
                     + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
                 )
             }
             .padding(.horizontal, 12)
@@ -133,13 +137,20 @@ struct CIRcvDecryptionError: View {
     }
 
     private func decryptionErrorItem(_ onClick: @escaping (() -> Void)) -> some View {
+        func text() -> Text {
+            Text(chatItem.content.text)
+                .foregroundColor(.red)
+                .italic()
+            + Text("   ")
+            + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
+        }
         return ZStack(alignment: .bottomTrailing) {
             HStack {
-                Text(chatItem.content.text)
-                    .foregroundColor(.red)
-                    .italic()
-                + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
+                if showMember, let member = chatItem.memberDisplayName {
+                    Text(member).fontWeight(.medium) + Text(": ") + text()
+                } else {
+                    text()
+                }
             }
             .padding(.horizontal, 12)
             CIMetaView(chatItem: chatItem)

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

@@ -22,7 +22,6 @@ struct CIVideoView: View {
     @State private var scrollProxy: ScrollViewProxy?
     @State private var preview: UIImage? = nil
     @State private var player: AVPlayer?
-    @State private var fullPlayer: AVPlayer?
     @State private var url: URL?
     @State private var showFullScreenPlayer = false
     @State private var timeObserver: Any? = nil
@@ -37,7 +36,6 @@ struct CIVideoView: View {
         self.scrollProxy = scrollProxy
         if let url = getLoadedVideo(chatItem.file) {
             self._player = State(initialValue: VideoPlayerView.getOrCreatePlayer(url, false))
-            self._fullPlayer = State(initialValue: AVPlayer(url: url))
             self._url = State(initialValue: url)
         }
         if let data = Data(base64Encoded: dropImagePrefix(image)),
@@ -59,7 +57,7 @@ struct CIVideoView: View {
                         if let file = file {
                             switch file.fileStatus {
                             case .rcvInvitation:
-                                receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
+                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                             case .rcvAccepted:
                                 switch file.fileProtocol {
                                 case .xftp:
@@ -85,7 +83,7 @@ struct CIVideoView: View {
             }
             if let file = file, case .rcvInvitation = file.fileStatus {
                 Button {
-                    receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
+                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                 } label: {
                     playPauseIcon("play.fill")
                 }
@@ -98,7 +96,6 @@ struct CIVideoView: View {
         DispatchQueue.main.async { videoWidth = w }
         return ZStack(alignment: .topTrailing) {
             ZStack(alignment: .center) {
-                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete
                 VideoPlayerView(player: player, url: url, showControls: false)
                 .frame(width: w, height: w * preview.size.height / preview.size.width)
                 .onChange(of: ChatModel.shared.stopPreviousRecPlay) { playingUrl in
@@ -116,9 +113,7 @@ struct CIVideoView: View {
                         player.pause()
                         videoPlaying = false
                     case .paused:
-                        if canBePlayed {
-                            showFullScreenPlayer = true
-                        }
+                        showFullScreenPlayer = true
                     default: ()
                     }
                 }
@@ -127,9 +122,8 @@ struct CIVideoView: View {
                         ChatModel.shared.stopPreviousRecPlay = url
                         player.play()
                     } label: {
-                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
+                        playPauseIcon("play.fill")
                     }
-                    .disabled(!canBePlayed)
                 }
             }
             loadingIndicator()
@@ -218,7 +212,6 @@ struct CIVideoView: View {
                 }
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case .rcvError: fileIcon("xmark", 10, 13)
-            case .invalid: fileIcon("questionmark", 10, 13)
             default: EmptyView()
             }
         }
@@ -253,11 +246,10 @@ struct CIVideoView: View {
         .padding([.trailing, .top], 11)
     }
 
-    // TODO encrypt: where file size is checked?
-    private func receiveFileIfValidSize(file: CIFile, encrypted: Bool, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64) async -> Void) {
         Task {
             if let user = ChatModel.shared.currentUser {
-                await receiveFile(user, file.fileId, encrypted, false)
+                await receiveFile(user, file.fileId)
             }
         }
     }
@@ -265,7 +257,8 @@ struct CIVideoView: View {
     private func fullScreenPlayer(_ url: URL) -> some View {
         ZStack {
             Color.black.edgesIgnoringSafeArea(.all)
-            VideoPlayer(player: fullPlayer)
+            VideoPlayer(player: createFullScreenPlayerAndPlay(url)) {
+            }
             .overlay(alignment: .topLeading, content: {
                 Button(action: { showFullScreenPlayer = false },
                     label: {
@@ -288,29 +281,28 @@ struct CIVideoView: View {
                     }
                 }
             )
-            .onAppear {
-                DispatchQueue.main.asyncAfter(deadline: .now()) {
-                    ChatModel.shared.stopPreviousRecPlay = url
-                    if let player = fullPlayer {
-                        player.play()
-                        fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
-                            player.seek(to: CMTime.zero)
-                            player.play()
-                        }
-                    }
-                }
-            }
             .onDisappear {
                 if let fullScreenTimeObserver = fullScreenTimeObserver {
                     NotificationCenter.default.removeObserver(fullScreenTimeObserver)
                 }
                 fullScreenTimeObserver = nil
-                fullPlayer?.pause()
-                fullPlayer?.seek(to: CMTime.zero)
             }
         }
     }
 
+    private func createFullScreenPlayerAndPlay(_ url: URL) -> AVPlayer {
+        let player = AVPlayer(url: url)
+        DispatchQueue.main.asyncAfter(deadline: .now()) {
+            ChatModel.shared.stopPreviousRecPlay = url
+            player.play()
+            fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
+                player.seek(to: CMTime.zero)
+                player.play()
+            }
+        }
+        return player
+    }
+
     private func addObserver(_ player: AVPlayer, _ url: URL) {
         timeObserver = player.addPeriodicTimeObserver(forInterval: CMTime(seconds: 0.01, preferredTimescale: CMTimeScale(NSEC_PER_SEC)), queue: .main) { time in
             if let item = player.currentItem {

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

@@ -144,7 +144,6 @@ struct VoiceMessagePlayer: View {
                 case .rcvComplete: playbackButton()
                 case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
-                case .invalid: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 }
             } else {
                 playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
@@ -159,8 +158,7 @@ struct VoiceMessagePlayer: View {
             }
         }
         .onChange(of: chatModel.stopPreviousRecPlay) { it in
-            if let recordingFileName = getLoadedFileSource(recordingFile)?.filePath,
-               chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
+            if let recordingFileName = getLoadedFileName(recordingFile), chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
                 audioPlayer?.stop()
                 playbackState = .noPlayback
                 playbackTime = TimeInterval(0)
@@ -175,8 +173,8 @@ struct VoiceMessagePlayer: View {
         switch playbackState {
         case .noPlayback:
             Button {
-                if let recordingSource = getLoadedFileSource(recordingFile) {
-                    startPlayback(recordingSource)
+                if let recordingFileName = getLoadedFileName(recordingFile) {
+                    startPlayback(recordingFileName)
                 }
             } label: {
                 playPauseIcon("play.fill")
@@ -220,7 +218,7 @@ struct VoiceMessagePlayer: View {
         Button {
             Task {
                 if let user = ChatModel.shared.currentUser {
-                    await receiveFile(user: user, fileId: recordingFile.fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get())
+                    await receiveFile(user: user, fileId: recordingFile.fileId)
                 }
             }
         } label: {
@@ -252,8 +250,8 @@ struct VoiceMessagePlayer: View {
             .clipShape(Circle())
     }
 
-    private func startPlayback(_ recordingSource: CryptoFile) {
-        chatModel.stopPreviousRecPlay = getAppFilePath(recordingSource.filePath)
+    private func startPlayback(_ recordingFileName: String) {
+        chatModel.stopPreviousRecPlay = getAppFilePath(recordingFileName)
         audioPlayer = AudioPlayer(
             onTimer: { playbackTime = $0 },
             onFinishPlayback: {
@@ -261,7 +259,7 @@ struct VoiceMessagePlayer: View {
                 playbackTime = TimeInterval(0)
             }
         )
-        audioPlayer?.start(fileSource: recordingSource, at: playbackTime)
+        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
         playbackState = .playing
     }
 }
@@ -270,7 +268,7 @@ struct CIVoiceView_Previews: PreviewProvider {
     static var previews: some View {
         let sentVoiceMessage: ChatItem = ChatItem(
             chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
             content: .sndMsgContent(msgContent: .voice(text: "", duration: 30)),
             quotedItem: nil,
             file: CIFile.getSample(fileStatus: .sndComplete)

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

@@ -12,9 +12,13 @@ import SimpleXChat
 struct DeletedItemView: View {
     @Environment(\.colorScheme) var colorScheme
     var chatItem: ChatItem
+    var showMember = false
 
     var body: some View {
         HStack(alignment: .bottom, spacing: 0) {
+            if showMember, let member = chatItem.memberDisplayName {
+                Text(member).fontWeight(.medium) + Text(": ")
+            }
             Text(chatItem.content.text)
                 .foregroundColor(.secondary)
                 .italic()
@@ -33,7 +37,10 @@ struct DeletedItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
             DeletedItemView(chatItem: ChatItem.getDeletedContentSample())
-            DeletedItemView(chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
+            DeletedItemView(
+                chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)),
+                showMember: true
+            )
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -32,7 +32,7 @@ func emojiText(_ text: String) -> Text {
 struct EmojiItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
+            EmojiItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent))
             EmojiItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
         }
         .previewLayout(.fixed(width: 360, height: 70))

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

@@ -75,14 +75,14 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
     static var previews: some View {
         let sentVoiceMessage: ChatItem = ChatItem(
             chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
             content: .sndMsgContent(msgContent: .voice(text: "Hello there", duration: 30)),
             quotedItem: nil,
             file: CIFile.getSample(fileStatus: .sndComplete)
         )
         let voiceMessageWithQuote: ChatItem = ChatItem(
             chatDir: .directSnd,
-            meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
+            meta: CIMeta.getSample(1, .now, "", .sndSent, itemEdited: true),
             content: .sndMsgContent(msgContent: .voice(text: "", duration: 30)),
             quotedItem: CIQuote.getSample(1, .now, "Hi", chatDir: .directRcv),
             file: CIFile.getSample(fileStatus: .sndComplete)

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

@@ -18,6 +18,7 @@ struct FramedItemView: View {
     @Environment(\.colorScheme) var colorScheme
     var chatInfo: ChatInfo
     var chatItem: ChatItem
+    var showMember = false
     var maxWidth: CGFloat = .infinity
     @State var scrollProxy: ScrollViewProxy? = nil
     @State var msgWidth: CGFloat = 0
@@ -56,7 +57,7 @@ struct FramedItemView: View {
                         }
                 }
 
-                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, msgContentView: framedMsgContentView)
+                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, msgContentView: framedMsgContentView)
                     .padding(chatItem.content.msgContent != nil ? 0 : 4)
                     .overlay(DetermineWidth())
             }
@@ -67,7 +68,6 @@ struct FramedItemView: View {
                     .padding(.horizontal, 12)
                     .padding(.bottom, 6)
                     .overlay(DetermineWidth())
-                    .accessibilityLabel("")
             }
         }
             .background(chatItemFrameColorMaybeImageOrVideo(chatItem, colorScheme))
@@ -97,7 +97,7 @@ struct FramedItemView: View {
         } else {
             switch (chatItem.content.msgContent) {
             case let .image(text, image):
-                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy, metaColor: metaColor)
+                CIImageView(chatItem: chatItem, image: image, maxWidth: maxWidth, imgWidth: $imgWidth, scrollProxy: scrollProxy)
                     .overlay(DetermineWidth())
                 if text == "" && !chatItem.meta.isLive {
                     Color.clear
@@ -107,7 +107,7 @@ struct FramedItemView: View {
                             value: .white
                         )
                 } else {
-                    ciMsgContentView(chatItem)
+                    ciMsgContentView (chatItem, showMember)
                 }
             case let .video(text, image, duration):
                 CIVideoView(chatItem: chatItem, image: image, duration: duration, maxWidth: maxWidth, videoWidth: $videoWidth, scrollProxy: scrollProxy)
@@ -120,27 +120,27 @@ struct FramedItemView: View {
                         value: .white
                     )
                 } else {
-                    ciMsgContentView(chatItem)
+                    ciMsgContentView (chatItem, showMember)
                 }
             case let .voice(text, duration):
                 FramedCIVoiceView(chatItem: chatItem, recordingFile: chatItem.file, duration: duration, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
                     .overlay(DetermineWidth())
                 if text != "" {
-                    ciMsgContentView(chatItem)
+                    ciMsgContentView (chatItem, showMember)
                 }
             case let .file(text):
                 ciFileView(chatItem, text)
             case let .link(_, preview):
                 CILinkView(linkPreview: preview)
-                ciMsgContentView(chatItem)
+                ciMsgContentView (chatItem, showMember)
             case let .unknown(_, text: text):
                 if chatItem.file == nil {
-                    ciMsgContentView(chatItem)
+                    ciMsgContentView (chatItem, showMember)
                 } else {
                     ciFileView(chatItem, text)
                 }
             default:
-                ciMsgContentView(chatItem)
+                ciMsgContentView (chatItem, showMember)
             }
         }
     }
@@ -232,27 +232,17 @@ struct FramedItemView: View {
     }
     
     private func ciQuotedMsgView(_ qi: CIQuote) -> some View {
-        Group {
-            if let sender = qi.getSender(membership()) {
-                VStack(alignment: .leading, spacing: 2) {
-                    Text(sender).font(.caption).foregroundColor(.secondary)
-                    ciQuotedMsgTextView(qi, lines: 2)
-                }
-            } else {
-                ciQuotedMsgTextView(qi, lines: 3)
-            }
-        }
-        .padding(.top, 6)
+        MsgContentView(
+            text: qi.text,
+            formattedText: qi.formattedText,
+            sender: qi.getSender(membership())
+        )
+        .lineLimit(3)
+        .font(.subheadline)
+        .padding(.vertical, 6)
         .padding(.horizontal, 12)
     }
     
-    private func ciQuotedMsgTextView(_ qi: CIQuote, lines: Int) -> some View {
-        MsgContentView(text: qi.text, formattedText: qi.formattedText)
-            .lineLimit(lines)
-            .font(.subheadline)
-            .padding(.bottom, 6)
-    }
-
     private func ciQuoteIconView(_ image: String) -> some View {
         Image(systemName: image)
             .resizable()
@@ -270,12 +260,13 @@ struct FramedItemView: View {
         }
     }
     
-    @ViewBuilder private func ciMsgContentView(_ ci: ChatItem) -> some View {
+    @ViewBuilder private func ciMsgContentView(_ ci: ChatItem, _ showMember: Bool = false) -> some View {
         let text = ci.meta.isLive ? ci.content.msgContent?.text ?? ci.text : ci.text
         let rtl = isRightToLeft(text)
         let v = MsgContentView(
             text: text,
             formattedText: text == "" ? [] : ci.formattedText,
+            sender: showMember ? ci.memberDisplayName : nil,
             meta: ci.meta,
             rightToLeft: rtl
         )
@@ -297,7 +288,7 @@ struct FramedItemView: View {
         CIFileView(file: chatItem.file, edited: chatItem.meta.itemEdited)
             .overlay(DetermineWidth())
         if text != "" || ci.meta.isLive {
-            ciMsgContentView (chatItem)
+            ciMsgContentView (chatItem, showMember)
         }
     }
 
@@ -358,8 +349,8 @@ struct FramedItemView_Previews: PreviewProvider {
         Group{
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -"), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line "), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat"), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
@@ -372,10 +363,10 @@ struct FramedItemView_Previews: PreviewProvider {
 struct FramedItemView_Edited_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, itemEdited: true), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
@@ -390,10 +381,10 @@ struct FramedItemView_Edited_Previews: PreviewProvider {
 struct FramedItemView_Deleted_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .groupRcv(groupMember: GroupMember.sampleData), .now, "hello", quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directSnd), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent(sndProgress: .complete), quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent, quotedItem: CIQuote.getSample(1, .now, "hi", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directSnd, .now, "👍", .sndSent, quotedItem: CIQuote.getSample(1, .now, "Hello too", chatDir: .directRcv), itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this covers -", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too!!! this text has the time on the same line ", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
             FramedItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "https://simplex.chat", .rcvRead, itemDeleted: .deleted(deletedTs: .now)), allowMenu: Binding.constant(true), audioPlayer: .constant(nil), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))

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

@@ -12,9 +12,10 @@ import SimpleXChat
 struct IntegrityErrorItemView: View {
     var msgError: MsgErrorType
     var chatItem: ChatItem
+    var showMember = false
 
     var body: some View {
-        CIMsgError(chatItem: chatItem) {
+        CIMsgError(chatItem: chatItem, showMember: showMember) {
             switch msgError {
             case .msgSkipped:
                 AlertManager.shared.showAlertMsg(
@@ -53,10 +54,14 @@ struct IntegrityErrorItemView: View {
 
 struct CIMsgError: View {
     var chatItem: ChatItem
+    var showMember = false
     var onTap: () -> Void
 
     var body: some View {
         HStack(alignment: .bottom, spacing: 0) {
+            if showMember, let member = chatItem.memberDisplayName {
+                Text(member).fontWeight(.medium) + Text(": ")
+            }
             Text(chatItem.content.text)
                 .foregroundColor(.red)
                 .italic()

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

@@ -12,9 +12,13 @@ import SimpleXChat
 struct MarkedDeletedItemView: View {
     @Environment(\.colorScheme) var colorScheme
     var chatItem: ChatItem
+    var showMember = false
 
     var body: some View {
         HStack(alignment: .bottom, spacing: 0) {
+            if showMember, let member = chatItem.memberDisplayName {
+                Text(member).font(.caption).fontWeight(.medium) + Text(": ").font(.caption)
+            }
             if case let .moderated(_, byGroupMember) = chatItem.meta.itemDeleted {
                 markedDeletedText("moderated by \(byGroupMember.chatViewName)")
             } else {
@@ -42,7 +46,7 @@ struct MarkedDeletedItemView: View {
 struct MarkedDeletedItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
+            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now)))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -80,14 +80,14 @@ struct MsgContentView: View {
     }
 
     private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, transparent: true)
     }
 }
 
 func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false) -> Text {
     let s = text
     var res: Text
-    if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
+    if let ft = formattedText, ft.count > 0 {
         res = formatText(ft[0], preview)
         var i = 1
         while i < ft.count {

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

@@ -14,23 +14,11 @@ struct ChatItemInfoView: View {
     var ci: ChatItem
     @Binding var chatItemInfo: ChatItemInfo?
     @State private var selection: CIInfoTab = .history
-    @State private var alert: CIInfoViewAlert? = nil
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
     enum CIInfoTab {
         case history
         case quote
-        case delivery
-    }
-
-    enum CIInfoViewAlert: Identifiable {
-        case alert(title: String, text: String)
-
-        var id: String {
-            switch self {
-            case let .alert(title, text): return "alert \(title) \(text)"
-            }
-        }
     }
     
     var body: some View {
@@ -43,11 +31,6 @@ struct ChatItemInfoView: View {
                         }
                     }
                 }
-                .alert(item: $alert) { a in
-                    switch(a) {
-                    case let .alert(title, text): return Alert(title: Text(title), message: Text(text))
-                    }
-                }
         }
     }
 
@@ -57,44 +40,19 @@ struct ChatItemInfoView: View {
         : NSLocalizedString("Received message", comment: "message info title")
     }
 
-    private var numTabs: Int {
-        var numTabs = 1
-        if chatItemInfo?.memberDeliveryStatuses != nil {
-            numTabs += 1
-        }
-        if ci.quotedItem != nil {
-            numTabs += 1
-        }
-        return numTabs
-    }
-
     @ViewBuilder private func itemInfoView() -> some View {
-        if numTabs > 1 {
+        if let qi = ci.quotedItem {
             TabView(selection: $selection) {
-                if let mdss = chatItemInfo?.memberDeliveryStatuses {
-                    deliveryTab(mdss)
-                        .tabItem {
-                            Label("Delivery", systemImage: "checkmark.message")
-                        }
-                        .tag(CIInfoTab.delivery)
-                }
                 historyTab()
                     .tabItem {
                         Label("History", systemImage: "clock")
                     }
                     .tag(CIInfoTab.history)
-                if let qi = ci.quotedItem {
-                    quoteTab(qi)
-                        .tabItem {
-                            Label("In reply to", systemImage: "arrowshape.turn.up.left")
-                        }
-                        .tag(CIInfoTab.quote)
-                }
-            }
-            .onAppear {
-                if chatItemInfo?.memberDeliveryStatuses != nil {
-                    selection = .delivery
-                }
+                quoteTab(qi)
+                    .tabItem {
+                        Label("In reply to", systemImage: "arrowshape.turn.up.left")
+                    }
+                    .tag(CIInfoTab.quote)
             }
         } else {
             historyTab()
@@ -259,87 +217,9 @@ struct ChatItemInfoView: View {
         : Color(uiColor: .tertiarySystemGroupedBackground)
     }
 
-    @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
-        ScrollView {
-            VStack(alignment: .leading, spacing: 16) {
-                details()
-                Divider().padding(.vertical)
-                Text("Delivery")
-                    .font(.title2)
-                    .padding(.bottom, 4)
-                memberDeliveryStatusesView(memberDeliveryStatuses)
-            }
-            .padding()
-        }
-        .frame(maxHeight: .infinity, alignment: .top)
-    }
-
-    @ViewBuilder private func memberDeliveryStatusesView(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
-        VStack(alignment: .leading, spacing: 12) {
-            let mss = membersStatuses(memberDeliveryStatuses)
-            if !mss.isEmpty {
-                ForEach(mss, id: \.0.groupMemberId) { memberStatus in
-                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
-                }
-            } else {
-                Text("No delivery information")
-                    .foregroundColor(.secondary)
-            }
-        }
-    }
-
-    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus)] {
-        memberDeliveryStatuses.compactMap({ mds in
-            if let mem = ChatModel.shared.groupMembers.first(where: { $0.groupMemberId == mds.groupMemberId }) {
-                return (mem, mds.memberDeliveryStatus)
-            } else {
-                return nil
-            }
-        })
-    }
-
-    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
-        HStack{
-            ProfileImage(imageStr: member.image)
-                .frame(width: 30, height: 30)
-                .padding(.trailing, 2)
-            Text(member.chatViewName)
-                .lineLimit(1)
-            Spacer()
-            let v = Group {
-                if let (icon, statusColor) = status.statusIcon(Color.secondary) {
-                    switch status {
-                    case .sndRcvd:
-                        ZStack(alignment: .trailing) {
-                            Image(systemName: icon)
-                                .foregroundColor(statusColor.opacity(0.67))
-                                .padding(.trailing, 6)
-                            Image(systemName: icon)
-                                .foregroundColor(statusColor.opacity(0.67))
-                        }
-                    default:
-                        Image(systemName: icon)
-                            .foregroundColor(statusColor)
-                    }
-                } else {
-                    Image(systemName: "ellipsis")
-                        .foregroundColor(Color.secondary)
-                }
-            }
-
-            if let (title, text) = status.statusInfo {
-                v.onTapGesture {
-                    alert = .alert(title: title, text: text)
-                }
-            } else {
-                v
-            }
-        }
-    }
-
     private func itemInfoShareText() -> String {
         let meta = ci.meta
-        var shareText: [String] = [String.localizedStringWithFormat(NSLocalizedString("# %@", comment: "copied message info title, # <title>"), title), ""]
+        var shareText: [String] = [title, ""]
         shareText += [String.localizedStringWithFormat(NSLocalizedString("Sent at: %@", comment: "copied message info"), localTimestamp(meta.itemTs))]
         if !ci.chatDir.sent {
             shareText += [String.localizedStringWithFormat(NSLocalizedString("Received at: %@", comment: "copied message info"), localTimestamp(meta.createdAt))]
@@ -365,7 +245,7 @@ struct ChatItemInfoView: View {
             ]
         }
         if let qi = ci.quotedItem {
-            shareText += ["", NSLocalizedString("## In reply to", comment: "copied message info")]
+            shareText += ["", NSLocalizedString("In reply to", comment: "copied message info")]
             let t = qi.text
             shareText += [""]
             if let sender = qi.getSender(nil) {
@@ -384,7 +264,7 @@ struct ChatItemInfoView: View {
         }
         if let chatItemInfo = chatItemInfo,
            !chatItemInfo.itemVersions.isEmpty {
-            shareText += ["", NSLocalizedString("## History", comment: "copied message info")]
+            shareText += ["", NSLocalizedString("History", comment: "copied message info")]
             for (index, itemVersion) in chatItemInfo.itemVersions.enumerated() {
                 let t = itemVersion.msgContent.text
                 shareText += [

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

@@ -12,6 +12,7 @@ import SimpleXChat
 struct ChatItemView: View {
     var chatInfo: ChatInfo
     var chatItem: ChatItem
+    var showMember = false
     var maxWidth: CGFloat = .infinity
     @State var scrollProxy: ScrollViewProxy? = nil
     @Binding var revealed: Bool
@@ -22,6 +23,7 @@ struct ChatItemView: View {
     init(chatInfo: ChatInfo, chatItem: ChatItem, showMember: Bool = false, maxWidth: CGFloat = .infinity, scrollProxy: ScrollViewProxy? = nil, revealed: Binding<Bool>, allowMenu: Binding<Bool> = .constant(false), audioPlayer: Binding<AudioPlayer?> = .constant(nil), playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback), playbackTime: Binding<TimeInterval?> = .constant(nil)) {
         self.chatInfo = chatInfo
         self.chatItem = chatItem
+        self.showMember = showMember
         self.maxWidth = maxWidth
         _scrollProxy = .init(initialValue: scrollProxy)
         _revealed = revealed
@@ -34,14 +36,14 @@ struct ChatItemView: View {
     var body: some View {
         let ci = chatItem
         if chatItem.meta.itemDeleted != nil && !revealed {
-            MarkedDeletedItemView(chatItem: chatItem)
+            MarkedDeletedItemView(chatItem: chatItem, showMember: showMember)
         } else if ci.quotedItem == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
             if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
                 EmojiItemView(chatItem: ci)
             } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
                 CIVoiceView(chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
             } else if ci.content.msgContent == nil {
-                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
             } else {
                 framedItemView()
             }
@@ -51,14 +53,14 @@ struct ChatItemView: View {
     }
 
     private func framedItemView() -> some View {
-        FramedItemView(chatInfo: chatInfo, chatItem: chatItem, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+        FramedItemView(chatInfo: chatInfo, chatItem: chatItem, showMember: showMember, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
     }
 }
 
 struct ChatItemContentView<Content: View>: View {
-    @EnvironmentObject var chatModel: ChatModel
     var chatInfo: ChatInfo
     var chatItem: ChatItem
+    var showMember: Bool
     var msgContentView: () -> Content
 
     var body: some View {
@@ -69,12 +71,10 @@ struct ChatItemContentView<Content: View>: View {
         case .rcvDeleted: deletedItemView()
         case let .sndCall(status, duration): callItemView(status, duration)
         case let .rcvCall(status, duration): callItemView(status, duration)
-        case let .rcvIntegrityError(msgError): IntegrityErrorItemView(msgError: msgError, chatItem: chatItem)
-        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
+        case let .rcvIntegrityError(msgError): IntegrityErrorItemView(msgError: msgError, chatItem: chatItem, showMember: showMember)
+        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem, showMember: showMember)
         case let .rcvGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
         case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
-        case .rcvGroupEvent(.memberConnected): CIEventView(eventText: membersConnectedItemText)
-        case .rcvGroupEvent(.memberCreatedContact): CIMemberCreatedContactView(chatItem: chatItem)
         case .rcvGroupEvent: eventItemView()
         case .sndGroupEvent: eventItemView()
         case .rcvConnEvent: eventItemView()
@@ -96,7 +96,7 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func deletedItemView() -> some View {
-        DeletedItemView(chatItem: chatItem)
+        DeletedItemView(chatItem: chatItem, showMember: showMember)
     }
 
     private func callItemView(_ status: CICallStatus, _ duration: Int) -> some View {
@@ -108,54 +108,12 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func eventItemView() -> some View {
-        return CIEventView(eventText: eventItemViewText())
-    }
-
-    private func eventItemViewText() -> Text {
-        if let member = chatItem.memberDisplayName {
-            return Text(member + " ")
-                    .font(.caption)
-                    .foregroundColor(.secondary)
-                    .fontWeight(.light)
-                + chatEventText(chatItem)
-        } else {
-            return chatEventText(chatItem)
-        }
+        CIEventView(chatItem: chatItem)
     }
 
     private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
         CIChatFeatureView(chatItem: chatItem, feature: feature, iconColor: iconColor)
     }
-
-    private var membersConnectedItemText: Text {
-        if let t = membersConnectedText {
-            return chatEventText(t, chatItem.timestampText)
-        } else {
-            return eventItemViewText()
-        }
-    }
-
-    private var membersConnectedText: LocalizedStringKey? {
-        let ns = chatModel.getConnectedMemberNames(chatItem)
-        return ns.count > 3
-            ? "\(ns[0]), \(ns[1]) and \(ns.count - 2) other members connected"
-            : ns.count == 3
-            ? "\(ns[0] + ", " + ns[1]) and \(ns[2]) connected"
-            : ns.count == 2
-            ? "\(ns[0]) and \(ns[1]) connected"
-            : nil
-    }
-}
-
-func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text) -> Text {
-    (Text(eventText) + Text(" ") + ts)
-        .font(.caption)
-        .foregroundColor(.secondary)
-        .fontWeight(.light)
-}
-
-func chatEventText(_ ci: ChatItem) -> Text {
-    chatEventText("\(ci.content.text)", ci.timestampText)
 }
 
 struct ChatItemView_Previews: PreviewProvider {
@@ -167,9 +125,9 @@ struct ChatItemView_Previews: PreviewProvider {
             ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
             ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
             ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent, itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemLive: true), revealed: Binding.constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 70))
         .environmentObject(Chat.sampleData)

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

@@ -64,7 +64,6 @@ struct ChatView: View {
             
             Spacer(minLength: 0)
 
-            connectingText()
             ComposeView(
                 chat: chat,
                 composeState: $composeState,
@@ -150,7 +149,6 @@ struct ChatView: View {
                     HStack {
                         if contact.allowsFeature(.calls) {
                             callButton(contact, .audio, imageName: "phone")
-                                .disabled(!contact.ready)
                         }
                         Menu {
                             if contact.allowsFeature(.calls) {
@@ -159,11 +157,9 @@ struct ChatView: View {
                                 } label: {
                                     Label("Video call", systemImage: "video")
                                 }
-                                .disabled(!contact.ready)
                             }
                             searchButton()
                             toggleNtfsButton(chat)
-                                .disabled(!contact.ready)
                         } label: {
                             Image(systemName: "ellipsis")
                         }
@@ -265,7 +261,7 @@ struct ChatView: View {
         return GeometryReader { g in
             ScrollViewReader { proxy in
                 ScrollView {
-                    LazyVStack(spacing: 0)  {
+                    LazyVStack(spacing: 5)  {
                         ForEach(chatModel.reversedChatItems, id: \.viewId) { ci in
                             let voiceNoFrame = voiceWithoutFrame(ci)
                             let maxWidth = cInfo.chatType == .group
@@ -317,19 +313,6 @@ struct ChatView: View {
         }
         .scaleEffect(x: 1, y: -1, anchor: .center)
     }
-
-    @ViewBuilder private func connectingText() -> some View {
-        if case let .direct(contact) = chat.chatInfo,
-           !contact.ready,
-           !contact.nextSendGrpInv {
-            Text("connecting…")
-                .font(.caption)
-                .foregroundColor(.secondary)
-                .padding(.top)
-        } else {
-            EmptyView()
-        }
-    }
     
     private func floatingButtons(_ proxy: ScrollViewProxy) -> some View {
         let counts = chatModel.unreadChatItemCounts(itemsInView: itemsInView)
@@ -447,77 +430,68 @@ struct ChatView: View {
     @ViewBuilder private func chatItemView(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
         if case let .groupRcv(member) = ci.chatDir,
            case let .group(groupInfo) = chat.chatInfo {
-            let (prevItem, nextItem) = chatModel.getChatItemNeighbors(ci)
-            if ci.memberConnected != nil && nextItem?.memberConnected != nil {
-                // memberConnected events are aggregated at the last chat item in a row of such events, see ChatItemView
-                ZStack {} // scroll doesn't work if it's EmptyView()
-            } else {
-                if prevItem == nil || showMemberImage(member, prevItem) {
-                    VStack(alignment: .leading, spacing: 4) {
-                        if ci.content.showMemberName {
-                            Text(member.displayName)
-                                .font(.caption)
-                                .foregroundStyle(.secondary)
-                                .padding(.leading, memberImageSize + 14)
-                                .padding(.top, 7)
+            let prevItem = chatModel.getPrevChatItem(ci)
+            HStack(alignment: .top, spacing: 0) {
+                let showMember = prevItem == nil || showMemberImage(member, prevItem)
+                if showMember {
+                    ProfileImage(imageStr: member.memberProfile.image)
+                        .frame(width: memberImageSize, height: memberImageSize)
+                        .onTapGesture { selectedMember = member }
+                        .appSheet(item: $selectedMember) { member in
+                            GroupMemberInfoView(groupInfo: groupInfo, member: member, navigation: true)
                         }
-                        HStack(alignment: .top, spacing: 8) {
-                            ProfileImage(imageStr: member.memberProfile.image)
-                                .frame(width: memberImageSize, height: memberImageSize)
-                                .onTapGesture { selectedMember = member }
-                                .appSheet(item: $selectedMember) { member in
-                                    GroupMemberInfoView(groupInfo: groupInfo, member: member, navigation: true)
-                                }
-                            chatItemWithMenu(ci, maxWidth)
-                        }
-                    }
-                    .padding(.top, 5)
-                    .padding(.trailing)
-                    .padding(.leading, 12)
                 } else {
-                    chatItemWithMenu(ci, maxWidth)
-                        .padding(.top, 5)
-                        .padding(.trailing)
-                        .padding(.leading, memberImageSize + 8 + 12)
+                    Rectangle().fill(.clear)
+                        .frame(width: memberImageSize, height: memberImageSize)
                 }
+                ChatItemWithMenu(
+                    ci: ci,
+                    showMember: showMember,
+                    maxWidth: maxWidth,
+                    scrollProxy: scrollProxy,
+                    deleteMessage: deleteMessage,
+                    deletingItem: $deletingItem,
+                    composeState: $composeState,
+                    showDeleteMessage: $showDeleteMessage
+                )
+                .padding(.leading, 8)
+                .environmentObject(chat)
             }
+            .padding(.trailing)
+            .padding(.leading, 12)
         } else {
-            chatItemWithMenu(ci, maxWidth)
-                .padding(.horizontal)
-                .padding(.top, 5)
+            ChatItemWithMenu(
+                ci: ci,
+                maxWidth: maxWidth,
+                scrollProxy: scrollProxy,
+                deleteMessage: deleteMessage,
+                deletingItem: $deletingItem,
+                composeState: $composeState,
+                showDeleteMessage: $showDeleteMessage
+            )
+            .padding(.horizontal)
+            .environmentObject(chat)
         }
     }
-
-    private func chatItemWithMenu(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
-        ChatItemWithMenu(
-            ci: ci,
-            maxWidth: maxWidth,
-            scrollProxy: scrollProxy,
-            deleteMessage: deleteMessage,
-            deletingItem: $deletingItem,
-            composeState: $composeState,
-            showDeleteMessage: $showDeleteMessage
-        )
-        .environmentObject(chat)
-    }
-
+    
     private struct ChatItemWithMenu: View {
         @EnvironmentObject var chat: Chat
         @Environment(\.colorScheme) var colorScheme
         var ci: ChatItem
+        var showMember: Bool = false
         var maxWidth: CGFloat
         var scrollProxy: ScrollViewProxy?
         var deleteMessage: (CIDeleteMode) -> Void
         @Binding var deletingItem: ChatItem?
         @Binding var composeState: ComposeState
         @Binding var showDeleteMessage: Bool
-
+        
         @State private var revealed = false
         @State private var showChatItemInfoSheet: Bool = false
         @State private var chatItemInfo: ChatItemInfo?
-
+        
         @State private var allowMenu: Bool = true
-
+        
         @State private var audioPlayer: AudioPlayer?
         @State private var playbackState: VoiceMessagePlaybackState = .noPlayback
         @State private var playbackTime: TimeInterval?
@@ -530,9 +504,8 @@ struct ChatView: View {
             )
             
             VStack(alignment: alignment.horizontal, spacing: 3) {
-                ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, maxWidth: maxWidth, scrollProxy: scrollProxy, revealed: $revealed, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+                ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, showMember: showMember, maxWidth: maxWidth, scrollProxy: scrollProxy, revealed: $revealed, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
                     .uiKitContextMenu(menu: uiMenu, allowMenu: $allowMenu)
-                    .accessibilityLabel("")
                 if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
                     chatItemReactions()
                         .padding(.bottom, 4)
@@ -618,15 +591,15 @@ struct ChatView: View {
                 }
                 menu.append(shareUIAction())
                 menu.append(copyUIAction())
-                if let fileSource = getLoadedFileSource(ci.file) {
+                if let filePath = getLoadedFilePath(ci.file) {
                     if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                         if image.imageData != nil {
-                            menu.append(saveFileAction(fileSource))
+                            menu.append(saveFileAction(filePath))
                         } else {
                             menu.append(saveImageAction(image))
                         }
                     } else {
-                        menu.append(saveFileAction(fileSource))
+                        menu.append(saveFileAction(filePath))
                     }
                 }
                 if ci.meta.editable && !mc.isVoice && !live {
@@ -764,12 +737,13 @@ struct ChatView: View {
             }
         }
         
-        private func saveFileAction(_ fileSource: CryptoFile) -> UIAction {
+        private func saveFileAction(_ filePath: String) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Save", comment: "chat item action"),
-                image: UIImage(systemName: fileSource.cryptoArgs == nil ? "square.and.arrow.down" : "lock.open")
+                image: UIImage(systemName: "square.and.arrow.down")
             ) { _ in
-                saveCryptoFile(fileSource)
+                let fileURL = URL(fileURLWithPath: filePath)
+                showShareSheet(items: [fileURL])
             }
         }
         
@@ -796,12 +770,6 @@ struct ChatView: View {
                         await MainActor.run {
                             chatItemInfo = ciInfo
                         }
-                        if case let .group(gInfo) = chat.chatInfo {
-                            let groupMembers = await apiListMembers(gInfo.groupId)
-                            await MainActor.run {
-                                ChatModel.shared.groupMembers = groupMembers
-                            }
-                        }
                     } catch let error {
                         logger.error("apiGetChatItemInfo error: \(responseError(error))")
                     }

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

@@ -44,6 +44,7 @@ struct ComposeState {
     var contextItem: ComposeContextItem
     var voiceMessageRecordingState: VoiceMessageRecordingState
     var inProgress = false
+    var disabled = false
     var useLinkPreviews: Bool = UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
 
     init(
@@ -167,23 +168,25 @@ struct ComposeState {
 }
 
 func chatItemPreview(chatItem: ChatItem) -> ComposePreview {
+    let chatItemPreview: ComposePreview
     switch chatItem.content.msgContent {
     case .text:
-        return .noPreview
+        chatItemPreview = .noPreview
     case let .link(_, preview: preview):
-        return .linkPreview(linkPreview: preview)
+        chatItemPreview = .linkPreview(linkPreview: preview)
     case let .image(_, image):
-        return .mediaPreviews(mediaPreviews: [(image, nil)])
+        chatItemPreview = .mediaPreviews(mediaPreviews: [(image, nil)])
     case let .video(_, image, _):
-        return .mediaPreviews(mediaPreviews: [(image, nil)])
+        chatItemPreview = .mediaPreviews(mediaPreviews: [(image, nil)])
     case let .voice(_, duration):
-        return .voicePreview(recordingFileName: chatItem.file?.fileName ?? "", duration: duration)
+        chatItemPreview = .voicePreview(recordingFileName: chatItem.file?.fileName ?? "", duration: duration)
     case .file:
         let fileName = chatItem.file?.fileName ?? ""
-        return .filePreview(fileName: fileName, file: getAppFilePath(fileName))
+        chatItemPreview = .filePreview(fileName: fileName, file: getAppFilePath(fileName))
     default:
-        return .noPreview
+        chatItemPreview = .noPreview
     }
+    return chatItemPreview
 }
 
 enum UploadContent: Equatable {
@@ -238,7 +241,6 @@ struct ComposeView: View {
     @State var pendingLinkUrl: URL? = nil
     @State var cancelledLinks: Set<String> = []
 
-    @Environment(\.colorScheme) private var colorScheme
     @State private var showChooseSource = false
     @State private var showMediaPicker = false
     @State private var showTakePhoto = false
@@ -253,13 +255,8 @@ struct ComposeView: View {
     // this is a workaround to fire an explicit event in certain cases
     @State private var stopPlayback: Bool = false
 
-    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
-
     var body: some View {
         VStack(spacing: 0) {
-            if chat.chatInfo.contact?.nextSendGrpInv ?? false {
-                ContextInvitingContactMemberView()
-            }
             contextItemView()
             switch (composeState.editing, composeState.preview) {
             case (true, .filePreview): EmptyView()
@@ -273,7 +270,7 @@ struct ComposeView: View {
                     Image(systemName: "paperclip")
                         .resizable()
                 }
-                .disabled(composeState.attachmentDisabled || !chat.userCanSend || (chat.chatInfo.contact?.nextSendGrpInv ?? false))
+                .disabled(composeState.attachmentDisabled || !chat.userCanSend)
                 .frame(width: 25, height: 25)
                 .padding(.bottom, 12)
                 .padding(.leading, 12)
@@ -301,7 +298,6 @@ struct ComposeView: View {
                             composeState.liveMessage = nil
                             chatModel.removeLiveDummy()
                         },
-                        nextSendGrpInv: chat.chatInfo.contact?.nextSendGrpInv ?? false,
                         voiceMessageAllowed: chat.chatInfo.featureEnabled(.voice),
                         showEnableVoiceMessagesAlert: chat.chatInfo.showEnableVoiceMessagesAlert,
                         startVoiceMessageRecording: {
@@ -313,10 +309,7 @@ struct ComposeView: View {
                         allowVoiceMessagesToContact: allowVoiceMessagesToContact,
                         timedMessageAllowed: chat.chatInfo.featureEnabled(.timedMessages),
                         onMediaAdded: { media in if !media.isEmpty { chosenMedia = media }},
-                        keyboardVisible: $keyboardVisible,
-                        sendButtonColor: chat.chatInfo.incognito
-                            ? .indigo.opacity(colorScheme == .dark ? 1 : 0.7)
-                            : .accentColor
+                        keyboardVisible: $keyboardVisible
                     )
                     .padding(.trailing, 12)
                     .background(.background)
@@ -449,15 +442,7 @@ struct ComposeView: View {
             } else if (composeState.inProgress) {
                 clearCurrentDraft()
             } else if !composeState.empty  {
-                if case .recording = composeState.voiceMessageRecordingState {
-                    finishVoiceMessageRecording()
-                    if let fileName = composeState.voiceMessageRecordingFileName {
-                        chatModel.filesToDelete.insert(getAppFilePath(fileName))
-                    }
-                }
-                if saveLastDraft {
-                    saveCurrentDraft()
-                }
+                saveCurrentDraft()
             } else {
                 cancelCurrentVoiceRecording()
                 clearCurrentDraft()
@@ -621,9 +606,7 @@ struct ComposeView: View {
             if liveMessage != nil { composeState = composeState.copy(liveMessage: nil) }
             await sending()
         }
-        if chat.chatInfo.contact?.nextSendGrpInv ?? false {
-            await sendMemberContactInvitation()
-        } else if case let .editingItem(ci) = composeState.contextItem {
+        if case let .editingItem(ci) = composeState.contextItem {
             sent = await updateMessage(ci, live: live)
         } else if let liveMessage = liveMessage, liveMessage.sentMsg != nil {
             sent = await updateMessage(liveMessage.chatItem, live: live)
@@ -660,10 +643,10 @@ struct ComposeView: View {
                 }
             case let .voicePreview(recordingFileName, duration):
                 stopPlayback.toggle()
-                let file = voiceCryptoFile(recordingFileName)
-                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: file, ttl: ttl)
+                chatModel.filesToDelete.remove(getAppFilePath(recordingFileName))
+                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: recordingFileName, ttl: ttl)
             case let .filePreview(_, file):
-                if let savedFile = saveFileFromURL(file, encrypted: privacyEncryptLocalFilesGroupDefault.get()) {
+                if let savedFile = saveFileFromURL(file) {
                     sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl)
                 }
             }
@@ -672,19 +655,9 @@ struct ComposeView: View {
         return sent
 
         func sending() async {
-            await MainActor.run { composeState.inProgress = true }
-        }
-
-        func sendMemberContactInvitation() async {
-            do {
-                let mc = checkLinkPreview()
-                let contact = try await apiSendMemberContactInvitation(chat.chatInfo.apiId, mc)
-                await MainActor.run {
-                    self.chatModel.updateContact(contact)
-                }
-            } catch {
-                logger.error("ChatView.sendMemberContactInvitation error: \(error.localizedDescription)")
-                AlertManager.shared.showAlertMsg(title: "Error sending member contact invitation", message: "Error: \(responseError(error))")
+            await MainActor.run { composeState.disabled = true }
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                if composeState.disabled { composeState.inProgress = true }
             }
         }
 
@@ -744,28 +717,13 @@ struct ComposeView: View {
 
         func sendVideo(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
             let (image, data) = imageData
-            if case let .video(_, url, duration) = data, let savedFile = moveTempFileFromURL(url) {
+            if case let .video(_, url, duration) = data, let savedFile = saveFileFromURLWithoutLoad(url) {
                 return await send(.video(text: text, image: image, duration: duration), quoted: quoted, file: savedFile, live: live, ttl: ttl)
             }
             return nil
         }
 
-        func voiceCryptoFile(_ fileName: String) -> CryptoFile? {
-            if !privacyEncryptLocalFilesGroupDefault.get() {
-                return CryptoFile.plain(fileName)
-            }
-            let url = getAppFilePath(fileName)
-            let toFile = generateNewFileName("voice", "m4a")
-            let toUrl = getAppFilePath(toFile)
-            if let cfArgs = try? encryptCryptoFile(fromPath: url.path, toPath: toUrl.path) {
-                removeFile(url)
-                return CryptoFile(filePath: toFile, cryptoArgs: cfArgs)
-            } else {
-                return nil
-            }
-        }
-
-        func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
+        func send(_ mc: MsgContent, quoted: Int64?, file: String? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
             if let chatItem = await apiSendMessage(
                 type: chat.chatInfo.chatType,
                 id: chat.chatInfo.apiId,
@@ -782,7 +740,7 @@ struct ComposeView: View {
                 return chatItem
             }
             if let file = file {
-                removeFile(file.filePath)
+                removeFile(file)
             }
             return nil
         }
@@ -802,7 +760,7 @@ struct ComposeView: View {
             }
         }
 
-        func saveAnyImage(_ img: UploadContent) -> CryptoFile? {
+        func saveAnyImage(_ img: UploadContent) -> String? {
             switch img {
             case let .simpleImage(image): return saveImage(image)
             case let .animatedImage(image): return saveAnimImage(image)
@@ -894,6 +852,7 @@ struct ComposeView: View {
 
     private func clearState(live: Bool = false) {
         if live {
+            composeState.disabled = false
             composeState.inProgress = false
         } else {
             composeState = ComposeState()
@@ -906,6 +865,12 @@ struct ComposeView: View {
     }
 
     private func saveCurrentDraft() {
+        if case .recording = composeState.voiceMessageRecordingState {
+            finishVoiceMessageRecording()
+            if let fileName = composeState.voiceMessageRecordingFileName {
+                chatModel.filesToDelete.insert(getAppFilePath(fileName))
+            }
+        }
         chatModel.draft = composeState
         chatModel.draftChatId = chat.id
     }

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

@@ -188,7 +188,7 @@ struct ComposeVoiceView: View {
                 playbackTime = recordingTime // animate progress bar to the end
             }
         )
-        audioPlayer?.start(fileSource: CryptoFile.plain(recordingFileName), at: playbackTime)
+        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
         playbackState = .playing
     }
 }

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

@@ -1,32 +0,0 @@
-//
-//  ContextInvitingContactMemberView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 18.09.2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct ContextInvitingContactMemberView: View {
-    @Environment(\.colorScheme) var colorScheme
-
-    var body: some View {
-        HStack {
-            Image(systemName: "message")
-                .foregroundColor(.secondary)
-            Text("Send direct message to connect")
-        }
-        .padding(12)
-        .frame(minHeight: 50)
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .background(colorScheme == .light ? sentColorLight : sentColorDark)
-        .padding(.top, 8)
-    }
-}
-
-struct ContextInvitingContactMemberView_Previews: PreviewProvider {
-    static var previews: some View {
-        ContextInvitingContactMemberView()
-    }
-}

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

@@ -22,14 +22,13 @@ struct ContextItemView: View {
                 .aspectRatio(contentMode: .fit)
                 .frame(width: 16, height: 16)
                 .foregroundColor(.secondary)
-            if let sender = contextItem.memberDisplayName {
-                VStack(alignment: .leading, spacing: 4) {
-                    Text(sender).font(.caption).foregroundColor(.secondary)
-                    msgContentView(lines: 2)
-                }
-            } else {
-                msgContentView(lines: 3)
-            }
+            MsgContentView(
+                text: contextItem.text,
+                formattedText: contextItem.formattedText,
+                sender: contextItem.memberDisplayName
+            )
+            .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
+            .lineLimit(3)
             Spacer()
             Button {
                 withAnimation {
@@ -45,15 +44,6 @@ struct ContextItemView: View {
         .background(chatItemFrameColor(contextItem, colorScheme))
         .padding(.top, 8)
     }
-
-    private func msgContentView(lines: Int) -> some View {
-        MsgContentView(
-            text: contextItem.text,
-            formattedText: contextItem.formattedText
-        )
-        .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
-        .lineLimit(lines)
-    }
 }
 
 struct ContextItemView_Previews: PreviewProvider {

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

@@ -17,7 +17,6 @@ struct SendMessageView: View {
     var sendLiveMessage: (() async -> Void)? = nil
     var updateLiveMessage: (() async -> Void)? = nil
     var cancelLiveMessage: (() -> Void)? = nil
-    var nextSendGrpInv: Bool = false
     var showVoiceMessageButton: Bool = true
     var voiceMessageAllowed: Bool = true
     var showEnableVoiceMessagesAlert: ChatInfo.ShowEnableVoiceMessagesAlert = .other
@@ -29,7 +28,6 @@ struct SendMessageView: View {
     @State private var holdingVMR = false
     @Namespace var namespace
     @Binding var keyboardVisible: Bool
-    var sendButtonColor = Color.accentColor
     @State private var teHeight: CGFloat = 42
     @State private var teFont: Font = .body
     @State private var teUiFont: UIFont = UIFont.preferredFont(forTextStyle: .body)
@@ -38,7 +36,6 @@ struct SendMessageView: View {
     @State private var showCustomDisappearingMessageDialogue = false
     @State private var showCustomTimePicker = false
     @State private var selectedDisappearingMessageTime: Int? = customDisappearingMessageTimeDefault.get()
-    @State private var progressByTimeout = false
     var maxHeight: CGFloat = 360
     var minHeight: CGFloat = 37
     @AppStorage(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
@@ -84,7 +81,7 @@ struct SendMessageView: View {
                     }
                 }
 
-                if progressByTimeout {
+                if composeState.inProgress {
                     ProgressView()
                         .scaleEffect(1.4)
                         .frame(width: 31, height: 31, alignment: .center)
@@ -105,23 +102,12 @@ struct SendMessageView: View {
                 .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
                 .frame(height: teHeight)
         }
-        .onChange(of: composeState.inProgress) { inProgress in
-            if inProgress {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
-                    progressByTimeout = composeState.inProgress
-                }
-            } else {
-                progressByTimeout = false
-            }
-        }
         .padding(.vertical, 8)
     }
 
     @ViewBuilder private func composeActionButtons() -> some View {
         let vmrs = composeState.voiceMessageRecordingState
-        if nextSendGrpInv {
-            inviteMemberContactButton()
-        } else if showVoiceMessageButton
+        if showVoiceMessageButton
             && composeState.message.isEmpty
             && !composeState.editing
             && composeState.liveMessage == nil
@@ -133,7 +119,7 @@ struct SendMessageView: View {
                         startVoiceMessageRecording: startVoiceMessageRecording,
                         finishVoiceMessageRecording: finishVoiceMessageRecording,
                         holdingVMR: $holdingVMR,
-                        disabled: composeState.inProgress
+                        disabled: composeState.disabled
                     )
                 } else {
                     voiceMessageNotAllowedButton()
@@ -165,24 +151,6 @@ struct SendMessageView: View {
         .padding([.top, .trailing], 4)
     }
 
-    private func inviteMemberContactButton() -> some View {
-        Button {
-            sendMessage(nil)
-        } label: {
-            Image(systemName: "arrow.up.circle.fill")
-                .resizable()
-                .foregroundColor(sendButtonColor)
-                .frame(width: sendButtonSize, height: sendButtonSize)
-                .opacity(sendButtonOpacity)
-        }
-        .disabled(
-            !composeState.sendEnabled ||
-            composeState.inProgress
-        )
-        .frame(width: 29, height: 29)
-        .padding([.bottom, .trailing], 4)
-    }
-
     private func sendMessageButton() -> some View {
         Button {
             sendMessage(nil)
@@ -191,13 +159,13 @@ struct SendMessageView: View {
                   ? "checkmark.circle.fill"
                   : "arrow.up.circle.fill")
             .resizable()
-            .foregroundColor(sendButtonColor)
+            .foregroundColor(.accentColor)
             .frame(width: sendButtonSize, height: sendButtonSize)
             .opacity(sendButtonOpacity)
         }
         .disabled(
             !composeState.sendEnabled ||
-            composeState.inProgress ||
+            composeState.disabled ||
             (!voiceMessageAllowed && composeState.voicePreview) ||
             composeState.endLiveDisabled
         )
@@ -325,7 +293,7 @@ struct SendMessageView: View {
             Image(systemName: "mic")
                 .foregroundColor(.secondary)
         }
-        .disabled(composeState.inProgress)
+        .disabled(composeState.disabled)
         .frame(width: 29, height: 29)
         .padding([.bottom, .trailing], 4)
     }
@@ -410,7 +378,7 @@ struct SendMessageView: View {
             Image(systemName: "stop.fill")
                 .foregroundColor(.accentColor)
         }
-        .disabled(composeState.inProgress)
+        .disabled(composeState.disabled)
         .frame(width: 29, height: 29)
         .padding([.bottom, .trailing], 4)
     }

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

@@ -9,8 +9,6 @@
 import SwiftUI
 import SimpleXChat
 
-let SMALL_GROUPS_RCPS_MEM_LIMIT: Int = 20
-
 struct GroupChatInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
@@ -23,8 +21,6 @@ struct GroupChatInfoView: View {
     @State private var showAddMembersSheet: Bool = false
     @State private var connectionStats: ConnectionStats?
     @State private var connectionCode: String?
-    @State private var sendReceipts = SendReceipts.userDefault(true)
-    @State private var sendReceiptsUserDefault = true
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @State private var searchText: String = ""
     @FocusState private var searchFocussed
@@ -34,7 +30,6 @@ struct GroupChatInfoView: View {
         case clearChatAlert
         case leaveGroupAlert
         case cantInviteIncognitoAlert
-        case largeGroupReceiptsDisabled
 
         var id: GroupChatInfoViewAlert { get { self } }
     }
@@ -57,11 +52,6 @@ struct GroupChatInfoView: View {
                         addOrEditWelcomeMessage()
                     }
                     groupPreferencesButton($groupInfo)
-                    if members.filter({ $0.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
-                        sendReceiptsOption()
-                    } else {
-                        sendReceiptsOptionDisabled()
-                    }
                 } header: {
                     Text("")
                 } footer: {
@@ -125,14 +115,9 @@ struct GroupChatInfoView: View {
             case .clearChatAlert: return clearChatAlert()
             case .leaveGroupAlert: return leaveGroupAlert()
             case .cantInviteIncognitoAlert: return cantInviteIncognitoAlert()
-            case .largeGroupReceiptsDisabled: return largeGroupReceiptsDisabledAlert()
             }
         }
         .onAppear {
-            if let currentUser = chatModel.currentUser {
-                sendReceiptsUserDefault = currentUser.sendRcptsSmallGroups
-            }
-            sendReceipts = SendReceipts.fromBool(groupInfo.chatSettings.sendRcpts, userDefault: sendReceiptsUserDefault)
             do {
                 if let link = try apiGetGroupLink(groupInfo.groupId) {
                     (groupLink, groupLinkMemberRole) = link
@@ -343,38 +328,6 @@ struct GroupChatInfoView: View {
             secondaryButton: .cancel()
         )
     }
-
-    private func sendReceiptsOption() -> some View {
-        Picker(selection: $sendReceipts) {
-            ForEach([.yes, .no, .userDefault(sendReceiptsUserDefault)]) { (opt: SendReceipts) in
-                Text(opt.text)
-            }
-        } label: {
-            Label("Send receipts", systemImage: "checkmark.message")
-        }
-        .frame(height: 36)
-        .onChange(of: sendReceipts) { _ in
-            setSendReceipts()
-        }
-    }
-
-    private func setSendReceipts() {
-        var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
-        chatSettings.sendRcpts = sendReceipts.bool()
-        updateChatSettings(chat, chatSettings: chatSettings)
-    }
-
-    private func sendReceiptsOptionDisabled() -> some View {
-        HStack {
-            Label("Send receipts", systemImage: "checkmark.message")
-            Spacer()
-            Text("disabled")
-                .foregroundStyle(.secondary)
-        }
-        .onTapGesture {
-            alert = .largeGroupReceiptsDisabled
-        }
-    }
 }
 
 func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bool = false) -> some View {
@@ -403,13 +356,6 @@ func cantInviteIncognitoAlert() -> Alert {
     )
 }
 
-func largeGroupReceiptsDisabledAlert() -> Alert {
-    Alert(
-        title: Text("Receipts are disabled"),
-        message: Text("This group has over \(SMALL_GROUPS_RCPS_MEM_LIMIT) members, delivery receipts are not sent.")
-    )
-}
-
 struct GroupChatInfoView_Previews: PreviewProvider {
     static var previews: some View {
         GroupChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []), groupInfo: GroupInfo.sampleData)

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

@@ -19,10 +19,8 @@ struct GroupMemberInfoView: View {
     @State private var connectionCode: String? = nil
     @State private var newRole: GroupMemberRole = .member
     @State private var alert: GroupMemberInfoViewAlert?
-    @State private var connectToMemberDialog: Bool = false
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @State private var justOpened = true
-    @State private var progressIndicator = false
 
     enum GroupMemberInfoViewAlert: Identifiable {
         case removeMemberAlert(mem: GroupMember)
@@ -40,8 +38,8 @@ struct GroupMemberInfoView: View {
             case let .changeMemberRoleAlert(_, role): return "changeMemberRoleAlert \(role.rawValue)"
             case .switchAddressAlert: return "switchAddressAlert"
             case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
-            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
             case .connRequestSentAlert: return "connRequestSentAlert"
+            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
             case let .error(title, _): return "error \(title)"
             case let .other(alert): return "other \(alert)"
             }
@@ -66,173 +64,161 @@ struct GroupMemberInfoView: View {
     }
 
     private func groupMemberInfoView() -> some View {
-        ZStack {
-            VStack {
-                List {
-                    groupMemberInfoHeader(member)
-                        .listRowBackground(Color.clear)
+        VStack {
+            List {
+                groupMemberInfoHeader(member)
+                    .listRowBackground(Color.clear)
 
-                    if member.memberActive {
-                        Section {
-                            if let contactId = member.memberContactId, let chat = knownDirectChat(contactId) {
+                if member.memberActive {
+                    Section {
+                        if let contactId = member.memberContactId {
+                            if let chat = knownDirectChat(contactId) {
                                 knownDirectChatButton(chat)
                             } else if groupInfo.fullGroupPreferences.directMessages.on {
-                                if let contactId = member.memberContactId {
-                                    newDirectChatButton(contactId)
-                                } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
-                                    createMemberContactButton()
-                                }
+                                newDirectChatButton(contactId)
                             }
-                            if let code = connectionCode { verifyCodeButton(code) }
-                            if let connStats = connectionStats,
-                               connStats.ratchetSyncAllowed {
-                                synchronizeConnectionButton()
-                            }
-                            // } else if developerTools {
-                            //     synchronizeConnectionButtonForce()
-                            // }
                         }
+                        if let code = connectionCode { verifyCodeButton(code) }
+                        if let connStats = connectionStats,
+                           connStats.ratchetSyncAllowed {
+                            synchronizeConnectionButton()
+                        }
+//                        } else if developerTools {
+//                            synchronizeConnectionButtonForce()
+//                        }
                     }
+                }
 
-                    if let contactLink = member.contactLink {
-                        Section {
-                            QRCode(uri: contactLink)
-                            Button {
-                                showShareSheet(items: [contactLink])
-                            } label: {
-                                Label("Share address", systemImage: "square.and.arrow.up")
-                            }
-                            if let contactId = member.memberContactId {
-                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on {
-                                    connectViaAddressButton(contactLink)
-                                }
-                            } else {
+                if let contactLink = member.contactLink {
+                    Section {
+                        QRCode(uri: contactLink)
+                        Button {
+                            showShareSheet(items: [contactLink])
+                        } label: {
+                            Label("Share address", systemImage: "square.and.arrow.up")
+                        }
+                        if let contactId = member.memberContactId {
+                            if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on {
                                 connectViaAddressButton(contactLink)
                             }
-                        } header: {
-                            Text("Address")
-                        } footer: {
-                            Text("You can share this address with your contacts to let them connect with **\(member.displayName)**.")
-                        }
-                    }
-
-                    Section("Member") {
-                        infoRow("Group", groupInfo.displayName)
-
-                        if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
-                            Picker("Change role", selection: $newRole) {
-                                ForEach(roles) { role in
-                                    Text(role.text)
-                                }
-                            }
-                            .frame(height: 36)
                         } else {
-                            infoRow("Role", member.memberRole.text)
+                            connectViaAddressButton(contactLink)
                         }
+                    } header: {
+                        Text("Address")
+                    } footer: {
+                        Text("You can share this address with your contacts to let them connect with **\(member.displayName)**.")
+                    }
+                }
 
-                        // TODO invited by - need to get contact by contact id
-                        if let conn = member.activeConn {
-                            let connLevelDesc = conn.connLevel == 0 ? NSLocalizedString("direct", comment: "connection level description") : String.localizedStringWithFormat(NSLocalizedString("indirect (%d)", comment: "connection level description"), conn.connLevel)
-                            infoRow("Connection", connLevelDesc)
+                Section("Member") {
+                    infoRow("Group", groupInfo.displayName)
+
+                    if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
+                        Picker("Change role", selection: $newRole) {
+                            ForEach(roles) { role in
+                                Text(role.text)
+                            }
                         }
+                        .frame(height: 36)
+                    } else {
+                        infoRow("Role", member.memberRole.text)
                     }
 
-                    if let connStats = connectionStats {
-                        Section("Servers") {
-                            // TODO network connection status
-                            Button("Change receiving address") {
-                                alert = .switchAddressAlert
+                    // TODO invited by - need to get contact by contact id
+                    if let conn = member.activeConn {
+                        let connLevelDesc = conn.connLevel == 0 ? NSLocalizedString("direct", comment: "connection level description") : String.localizedStringWithFormat(NSLocalizedString("indirect (%d)", comment: "connection level description"), conn.connLevel)
+                        infoRow("Connection", connLevelDesc)
+                    }
+                }
+
+                if let connStats = connectionStats {
+                    Section("Servers") {
+                        // TODO network connection status
+                        Button("Change receiving address") {
+                            alert = .switchAddressAlert
+                        }
+                        .disabled(
+                            connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                            || connStats.ratchetSyncSendProhibited
+                        )
+                        if connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil } {
+                            Button("Abort changing address") {
+                                alert = .abortSwitchAddressAlert
                             }
                             .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
                                 || connStats.ratchetSyncSendProhibited
                             )
-                            if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
-                                Button("Abort changing address") {
-                                    alert = .abortSwitchAddressAlert
-                                }
-                                .disabled(
-                                    connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
-                                    || connStats.ratchetSyncSendProhibited
-                                )
-                            }
-                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer })
-                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer })
-                        }
-                    }
-
-                    if member.canBeRemoved(groupInfo: groupInfo) {
-                        Section {
-                            removeMemberButton(member)
-                        }
-                    }
-
-                    if developerTools {
-                        Section("For console") {
-                            infoRow("Local name", member.localDisplayName)
-                            infoRow("Database ID", "\(member.groupMemberId)")
                         }
+                        smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer })
+                        smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer })
                     }
                 }
-                .navigationBarHidden(true)
-                .onAppear {
-                    if #unavailable(iOS 16) {
-                        // this condition prevents re-setting picker
-                        if !justOpened { return }
+
+                if member.canBeRemoved(groupInfo: groupInfo) {
+                    Section {
+                        removeMemberButton(member)
                     }
-                    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)
-                        member = mem
-                        connectionStats = stats
-                        connectionCode = code
-                    } catch let error {
-                        logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
-                    }
-                    justOpened = false
                 }
-                .onChange(of: newRole) { _ in
-                    if newRole != member.memberRole {
-                        alert = .changeMemberRoleAlert(mem: member, role: newRole)
+
+                if developerTools {
+                    Section("For console") {
+                        infoRow("Local name", member.localDisplayName)
+                        infoRow("Database ID", "\(member.groupMemberId)")
                     }
                 }
             }
-            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
-            .alert(item: $alert) { alertItem in
-                switch(alertItem) {
-                case let .removeMemberAlert(mem): return removeMemberAlert(mem)
-                case let .changeMemberRoleAlert(mem, _): return changeMemberRoleAlert(mem)
-                case .switchAddressAlert: return switchAddressAlert(switchMemberAddress)
-                case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchMemberAddress)
-                case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
-                case let .connRequestSentAlert(type): return connReqSentAlert(type)
-                case let .error(title, error): return Alert(title: Text(title), message: Text(error))
-                case let .other(alert): return alert
+            .navigationBarHidden(true)
+            .onAppear {
+                if #unavailable(iOS 16) {
+                    // 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)
+                    member = mem
+                    connectionStats = stats
+                    connectionCode = code
+                } catch let error {
+                    logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
+                }
+                justOpened = false
+            }
+            .onChange(of: newRole) { _ in
+                if newRole != member.memberRole {
+                    alert = .changeMemberRoleAlert(mem: member, role: newRole)
                 }
             }
-
-            if progressIndicator {
-                ProgressView().scaleEffect(2)
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+        .alert(item: $alert) { alertItem in
+            switch(alertItem) {
+            case let .removeMemberAlert(mem): return removeMemberAlert(mem)
+            case let .changeMemberRoleAlert(mem, _): return changeMemberRoleAlert(mem)
+            case .switchAddressAlert: return switchAddressAlert(switchMemberAddress)
+            case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchMemberAddress)
+            case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
+            case let .connRequestSentAlert(type): return connReqSentAlert(type)
+            case let .error(title, error): return Alert(title: Text(title), message: Text(error))
+            case let .other(alert): return alert
             }
         }
     }
 
     func connectViaAddressButton(_ contactLink: String) -> some View {
         Button {
-            connectToMemberDialog = true
+            connectViaAddress(contactLink)
         } label: {
             Label("Connect", systemImage: "link")
         }
-        .confirmationDialog("Connect directly", isPresented: $connectToMemberDialog, titleVisibility: .visible) {
-            Button("Use current profile") { connectViaAddress(incognito: false, contactLink: contactLink) }
-            Button("Use new incognito profile") { connectViaAddress(incognito: true, contactLink: contactLink) }
-        }
     }
 
-    func connectViaAddress(incognito: Bool, contactLink: String) {
+    func connectViaAddress(_ contactLink: String) {
         Task {
-            let (connReqType, connectAlert) = await apiConnect_(incognito: incognito, connReq: contactLink)
+            let (connReqType, connectAlert) = await apiConnect_(connReq: contactLink)
             if let connReqType = connReqType {
                 alert = .connRequestSentAlert(type: connReqType)
             } else if let connectAlert = connectAlert {
@@ -269,33 +255,6 @@ struct GroupMemberInfoView: View {
         }
     }
 
-    func createMemberContactButton() -> some View {
-        Button {
-            progressIndicator = true
-            Task {
-                do {
-                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, member.groupMemberId)
-                    await MainActor.run {
-                        progressIndicator = false
-                        chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
-                        dismissAllSheets(animated: true)
-                        chatModel.chatId = memberContact.id
-                        chatModel.setContactNetworkStatus(memberContact, .connected)
-                    }
-                } catch let error {
-                    logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
-                    let a = getErrorAlert(error, "Error creating member contact")
-                    await MainActor.run {
-                        progressIndicator = false
-                        alert = .error(title: a.title, error: a.message)
-                    }
-                }
-            }
-        } label: {
-            Label("Send direct message", systemImage: "message")
-        }
-    }
-
     private func groupMemberInfoHeader(_ mem: GroupMember) -> some View {
         VStack {
             ProfileImage(imageStr: mem.image, color: Color(uiColor: .tertiarySystemFill))

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

@@ -130,7 +130,7 @@ struct GroupProfileView: View {
                 let err = responseError(error)
                 saveGroupError = err
                 showSaveErrorAlert = true
-                logger.error("GroupProfile apiUpdateGroup error: \(err)")
+                logger.error("UserProfile apiUpdateProfile error: \(err)")
             }
         }
     }

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

@@ -19,7 +19,7 @@ struct ScanCodeView: View {
         VStack(alignment: .leading) {
             CodeScannerView(codeTypes: [.qr], completion: processQRCode)
                 .aspectRatio(1, contentMode: .fit)
-                .cornerRadius(12)
+                .border(.gray)
             Text("Scan security code from your contact's app.")
                 .padding(.top)
         }

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

@@ -64,7 +64,7 @@ struct VerifyCodeView: View {
                         HStack {
                             NavigationLink {
                                 ScanCodeView(connectionVerified: $connectionVerified, verify: verify)
-                                    .navigationBarTitleDisplayMode(.large)
+                                    .navigationBarTitleDisplayMode(.inline)
                                     .navigationTitle("Scan code")
                             } label: {
                                 Label("Scan code", systemImage: "qrcode")

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

@@ -49,10 +49,11 @@ struct ChatListNavLink: View {
     }
 
     @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
-        NavLinkPlain(
+        let v = NavLinkPlain(
             tag: chat.chatInfo.id,
             selection: $chatModel.chatId,
-            label: { ChatPreviewView(chat: chat) }
+            label: { ChatPreviewView(chat: chat) },
+            disabled: !contact.ready
         )
         .swipeActions(edge: .leading, allowsFullSwipe: true) {
             markReadButton()
@@ -75,6 +76,14 @@ struct ChatListNavLink: View {
             .tint(.red)
         }
         .frame(height: rowHeights[dynamicTypeSize])
+
+        if contact.ready {
+            v
+        } else {
+            v.onTapGesture {
+                AlertManager.shared.showAlert(pendingContactAlert(chat, contact))
+            }
+        }
     }
 
     @ViewBuilder private func groupNavLink(_ groupInfo: GroupInfo) -> some View {
@@ -213,15 +222,9 @@ struct ChatListNavLink: View {
         ContactRequestView(contactRequest: contactRequest, chat: chat)
         .swipeActions(edge: .trailing, allowsFullSwipe: true) {
             Button {
-                Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
-            } label: { Label("Accept", systemImage: "checkmark") }
-                .tint(.accentColor)
-            Button {
-                Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) }
-            } label: {
-                Label("Accept incognito", systemImage: "theatermasks")
-            }
-            .tint(.indigo)
+                Task { await acceptContactRequest(contactRequest) }
+            } label: { Label("Accept", systemImage: chatModel.incognito ? "theatermasks" : "checkmark") }
+                .tint(chatModel.incognito ? .indigo : .accentColor)
             Button {
                 AlertManager.shared.showAlert(rejectContactRequestAlert(contactRequest))
             } label: {
@@ -231,10 +234,9 @@ struct ChatListNavLink: View {
         }
         .frame(height: rowHeights[dynamicTypeSize])
         .onTapGesture { showContactRequestDialog = true }
-        .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
-            Button("Accept") { Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) } }
-            Button("Accept incognito") { Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) } }
-            Button("Reject (sender NOT notified)", role: .destructive) { Task { await rejectContactRequest(contactRequest) } }
+        .confirmationDialog("Connection request", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
+            Button(chatModel.incognito ? "Accept incognito" : "Accept contact") { Task { await acceptContactRequest(contactRequest) } }
+            Button("Reject contact (sender NOT notified)", role: .destructive) { Task { await rejectContactRequest(contactRequest) } }
         }
     }
 

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

@@ -60,6 +60,8 @@ struct ChatListView: View {
                 chatList
             }
         }
+        .onChange(of: chatModel.appOpenUrl) { _ in connectViaUrl() }
+        .onAppear() { connectViaUrl() }
         .onDisappear() { withAnimation { userPickerVisible = false } }
         .refreshable {
             AlertManager.shared.showAlert(Alert(
@@ -106,6 +108,11 @@ struct ChatListView: View {
             }
             ToolbarItem(placement: .principal) {
                 HStack(spacing: 4) {
+                    if (chatModel.incognito) {
+                        Image(systemName: "theatermasks")
+                            .foregroundColor(.indigo)
+                            .padding(.trailing, 8)
+                    }
                     Text("Chats")
                         .font(.headline)
                     if chatModel.chats.count > 0 {

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

@@ -15,8 +15,6 @@ struct ChatPreviewView: View {
     @Environment(\.colorScheme) var colorScheme
     var darkGreen = Color(red: 0, green: 0.5, blue: 0)
 
-    @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
-
     var body: some View {
         let cItem = chat.chatItems.last
         return HStack(spacing: 8) {
@@ -43,9 +41,11 @@ struct ChatPreviewView: View {
 
                 ZStack(alignment: .topTrailing) {
                     chatMessagePreview(cItem)
-                    chatStatusImage()
-                        .padding(.top, 26)
-                        .frame(maxWidth: .infinity, alignment: .trailing)
+                    if case .direct = chat.chatInfo {
+                        chatStatusImage()
+                            .padding(.top, 24)
+                            .frame(maxWidth: .infinity, alignment: .trailing)
+                    }
                 }
                 .padding(.trailing, 8)
                 
@@ -59,9 +59,12 @@ struct ChatPreviewView: View {
     @ViewBuilder private func chatPreviewImageOverlayIcon() -> some View {
         if case let .group(groupInfo) = chat.chatInfo {
             switch (groupInfo.membership.memberStatus) {
-            case .memLeft: groupInactiveIcon()
-            case .memRemoved: groupInactiveIcon()
-            case .memGroupDeleted: groupInactiveIcon()
+            case .memLeft:
+                groupInactiveIcon()
+            case .memRemoved:
+                groupInactiveIcon()
+            case .memGroupDeleted:
+                groupInactiveIcon()
             default: EmptyView()
             }
         } else {
@@ -71,7 +74,7 @@ struct ChatPreviewView: View {
 
     @ViewBuilder private func groupInactiveIcon() -> some View {
         Image(systemName: "multiply.circle.fill")
-            .foregroundColor(.secondary.opacity(0.65))
+            .foregroundColor(.secondary)
             .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
     }
 
@@ -103,7 +106,7 @@ struct ChatPreviewView: View {
             .kerning(-2)
     }
 
-    private func chatPreviewLayout(_ text: Text, draft: Bool = false) -> some View {
+    private func chatPreviewLayout(_ text: Text) -> some View {
         ZStack(alignment: .topTrailing) {
             text
                 .lineLimit(2)
@@ -111,8 +114,6 @@ struct ChatPreviewView: View {
                 .frame(maxWidth: .infinity, alignment: .topLeading)
                 .padding(.leading, 8)
                 .padding(.trailing, 36)
-                .privacySensitive(!showChatPreviews && !draft)
-                .redacted(reason: .privacy)
             let s = chat.chatStats
             if s.unreadCount > 0 || s.unreadChat {
                 unreadCountText(s.unreadCount)
@@ -174,18 +175,14 @@ struct ChatPreviewView: View {
 
     @ViewBuilder private func chatMessagePreview(_ cItem: ChatItem?) -> some View {
         if chatModel.draftChatId == chat.id, let draft = chatModel.draft {
-            chatPreviewLayout(messageDraft(draft), draft: true)
+            chatPreviewLayout(messageDraft(draft))
         } else if let cItem = cItem {
             chatPreviewLayout(itemStatusMark(cItem) + chatItemPreview(cItem))
         } else {
             switch (chat.chatInfo) {
             case let .direct(contact):
                 if !contact.ready {
-                    if contact.nextSendGrpInv {
-                        chatPreviewInfoText("send direct message")
-                    } else {
-                        chatPreviewInfoText("connecting…")
-                    }
+                    chatPreviewInfoText("connecting…")
                 }
             case let .group(groupInfo):
                 switch (groupInfo.membership.memberStatus) {
@@ -201,7 +198,10 @@ struct ChatPreviewView: View {
     @ViewBuilder private func groupInvitationPreviewText(_ groupInfo: GroupInfo) -> some View {
         groupInfo.membership.memberIncognito
         ? chatPreviewInfoText("join as \(groupInfo.membership.memberProfile.displayName)")
-        : chatPreviewInfoText("you are invited to group")
+        : (chatModel.incognito
+           ? chatPreviewInfoText("join as \(chatModel.currentUser?.profile.displayName ?? "yourself")")
+           : chatPreviewInfoText("you are invited to group")
+        )
     }
 
     @ViewBuilder private func chatPreviewInfoText(_ text: LocalizedStringKey) -> some View {
@@ -229,7 +229,7 @@ struct ChatPreviewView: View {
         switch chat.chatInfo {
         case let .direct(contact):
             switch (chatModel.contactNetworkStatus(contact)) {
-            case .connected: incognitoIcon(chat.chatInfo.incognito)
+            case .connected: EmptyView()
             case .error:
                 Image(systemName: "exclamationmark.circle")
                     .resizable()
@@ -240,23 +240,11 @@ struct ChatPreviewView: View {
                 ProgressView()
             }
         default:
-            incognitoIcon(chat.chatInfo.incognito)
+            EmptyView()
         }
     }
 }
 
-@ViewBuilder func incognitoIcon(_ incognito: Bool) -> some View {
-    if incognito {
-        Image(systemName: "theatermasks")
-            .resizable()
-            .scaledToFit()
-            .frame(width: 22, height: 22)
-            .foregroundColor(.secondary)
-    } else {
-        EmptyView()
-    }
-}
-
 func unreadCountText(_ n: Int) -> Text {
     Text(n > 999 ? "\(n / 1000)k" : n > 0 ? "\(n)" : "")
 }
@@ -270,20 +258,20 @@ struct ChatPreviewView_Previews: PreviewProvider {
             ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))]
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent)]
             ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent)],
                 chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
             ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))]
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent, itemDeleted: .deleted(deletedTs: .now))]
             ))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
-                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
+                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent)],
                 chatStats: ChatStats(unreadCount: 3, minUnreadItemId: 0)
             ))
             ChatPreviewView(chat: Chat(

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

@@ -15,7 +15,6 @@ struct ContactConnectionInfo: View {
     @State var contactConnection: PendingContactConnection
     @State private var alert: CCInfoAlert?
     @State private var localAlias = ""
-    @State private var showIncognitoSheet = false
     @FocusState private var aliasTextFieldFocused: Bool
 
     enum CCInfoAlert: Identifiable {
@@ -32,14 +31,19 @@ struct ContactConnectionInfo: View {
 
     var body: some View {
         NavigationView {
-            let v = List {
+            List {
                 Group {
-                    Text(contactConnection.initiated ? "You invited a contact" : "You accepted connection")
+                    Text(contactConnection.initiated ? "You invited your contact" : "You accepted connection")
                         .font(.largeTitle)
                         .bold()
-                        .padding(.bottom)
+                        .padding(.bottom, 16)
 
                     Text(contactConnectionText(contactConnection))
+                        .padding(.bottom, 16)
+
+                    if let connReqInv = contactConnection.connReqInv {
+                        OneTimeLinkProfileText(contactConnection: contactConnection, connReqInvitation: connReqInv)
+                    }
                 }
                 .listRowBackground(Color.clear)
                 .listRowSeparator(.hidden)
@@ -61,16 +65,10 @@ struct ContactConnectionInfo: View {
 
                     if contactConnection.initiated,
                        let connReqInv = contactConnection.connReqInv {
-                        QRCode(uri: connReqInv)
-                        incognitoEnabled()
-                        shareLinkButton(connReqInv)
-                        oneTimeLinkLearnMoreButton()
+                        oneTimeLinkSection(contactConnection: contactConnection, connReqInvitation: connReqInv)
                     } else {
-                        incognitoEnabled()
                         oneTimeLinkLearnMoreButton()
                     }
-                } footer: {
-                    sharedProfileInfo(contactConnection.incognito)
                 }
 
                 Section {
@@ -82,14 +80,6 @@ struct ContactConnectionInfo: View {
                     }
                 }
             }
-            if #available(iOS 16, *) {
-                v
-            } else {
-                // navigationBarHidden is added conditionally,
-                // because the view jumps in iOS 17 if this is added,
-                // and on iOS 16+ it is hidden without it.
-                v.navigationBarHidden(true)
-            }
         }
         .alert(item: $alert) { _alert in
             switch _alert {
@@ -138,30 +128,6 @@ struct ContactConnectionInfo: View {
         )
         : "You will be connected when your contact's device is online, please wait or check later!"
     }
-
-    @ViewBuilder private func incognitoEnabled() -> some View {
-        if contactConnection.incognito {
-            ZStack(alignment: .leading) {
-                Image(systemName: "theatermasks.fill")
-                    .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
-                    .foregroundColor(Color.indigo)
-                    .font(.system(size: 14))
-                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()
-            }
-        }
-    }
 }
 
 struct ContactConnectionInfo_Previews: PreviewProvider {

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

@@ -58,14 +58,10 @@ struct ContactConnectionView: View {
                 }
                 .padding(.bottom, 2)
 
-                ZStack(alignment: .topTrailing) {
-                    Text(contactConnection.description)
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                    incognitoIcon(contactConnection.incognito)
-                        .padding(.top, 26)
-                        .frame(maxWidth: .infinity, alignment: .trailing)
-                }
-                .padding(.horizontal, 8)
+                Text(contactConnection.description)
+                    .frame(alignment: .topLeading)
+                    .padding(.horizontal, 8)
+                    .padding(.bottom, 2)
 
                 Spacer()
             }

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

@@ -24,7 +24,7 @@ struct ContactRequestView: View {
                     Text(contactRequest.chatViewName)
                         .font(.title3)
                         .fontWeight(.bold)
-                        .foregroundColor(.accentColor)
+                        .foregroundColor(chatModel.incognito ? .indigo : .accentColor)
                         .padding(.leading, 8)
                         .frame(alignment: .topLeading)
                     Spacer()

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

@@ -133,7 +133,7 @@ struct LibraryMediaListPicker: UIViewControllerRepresentable {
         config.filter = .any(of: [.images, .videos])
         config.selectionLimit = selectionLimit
         config.selection = .ordered
-        config.preferredAssetRepresentationMode = .current
+        //config.preferredAssetRepresentationMode = .current
         let controller = PHPickerViewController(configuration: config)
         controller.delegate = context.coordinator
         return controller

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

@@ -8,15 +8,11 @@
 
 import SwiftUI
 
-func showShareSheet(items: [Any], completed: (() -> Void)? = nil) {
+func showShareSheet(items: [Any]) {
     let keyWindowScene = UIApplication.shared.connectedScenes.first { $0.activationState == .foregroundActive } as? UIWindowScene
     if let keyWindow = keyWindowScene?.windows.filter(\.isKeyWindow).first,
        let presentedViewController = keyWindow.rootViewController?.presentedViewController ?? keyWindow.rootViewController {
         let activityViewController = UIActivityViewController(activityItems: items, applicationActivities: nil)
-        if let completed = completed {
-            let handler: UIActivityViewController.CompletionWithItemsHandler = { _,_,_,_ in completed() }
-            activityViewController.completionWithItemsHandler = handler
-        }
         presentedViewController.present(activityViewController, animated: true)
     }
 }

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

@@ -12,92 +12,38 @@ import SimpleXChat
 
 struct AddContactView: View {
     @EnvironmentObject private var chatModel: ChatModel
-    @Binding var contactConnection: PendingContactConnection?
+    var contactConnection: PendingContactConnection? = nil
     var connReqInvitation: String
-    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
 
     var body: some View {
-        VStack {
-            List {
-                Section {
-                    if connReqInvitation != "" {
-                        QRCode(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)
-                }
+        List {
+            OneTimeLinkProfileText(contactConnection: contactConnection, connReqInvitation: connReqInvitation)
+                .listRowBackground(Color.clear)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+
+            Section("1-time link") {
+                oneTimeLinkSection(contactConnection: contactConnection, connReqInvitation: connReqInvitation)
             }
         }
         .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.shared.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()
-        }
+@ViewBuilder func oneTimeLinkSection(contactConnection: PendingContactConnection? = nil, connReqInvitation: String) -> some View {
+    if connReqInvitation != "" {
+        QRCode(uri: connReqInvitation)
+    } else {
+        ProgressView()
+            .progressViewStyle(.circular)
+            .scaleEffect(2)
+            .frame(maxWidth: .infinity)
+            .padding(.vertical)
     }
+    shareLinkButton(connReqInvitation)
+    oneTimeLinkLearnMoreButton()
 }
 
-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 {
+private func shareLinkButton(_ connReqInvitation: String) -> some View {
     Button {
         showShareSheet(items: [connReqInvitation])
     } label: {
@@ -119,11 +65,26 @@ func oneTimeLinkLearnMoreButton() -> some View {
     }
 }
 
-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"
-        )
+struct OneTimeLinkProfileText: View {
+    @EnvironmentObject private var chatModel: ChatModel
+    var contactConnection: PendingContactConnection? = nil
+    var connReqInvitation: String
+
+    var body: some View {
+        HStack {
+            if (contactConnection?.incognito ?? chatModel.incognito) {
+                Image(systemName: "theatermasks").foregroundColor(.indigo)
+                Text("A random profile will be sent to your contact")
+            } else {
+                Image(systemName: "info.circle").foregroundColor(.secondary)
+                Text("Your chat profile will be sent to your contact")
+            }
+        }
+    }
+}
+
+struct AddContactView_Previews: PreviewProvider {
+    static var previews: some View {
+        AddContactView(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")
     }
 }

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

@@ -47,13 +47,21 @@ struct AddGroupView: View {
                 .padding(.vertical, 4)
             Text("The group is fully decentralized – it is visible only to the members.")
                 .padding(.bottom, 4)
-
-            HStack {
-                Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
-                Spacer().frame(width: 8)
-                Text("Your chat profile will be sent to group members").font(.footnote)
+            if (m.incognito) {
+                HStack {
+                    Image(systemName: "info.circle").foregroundColor(.orange).font(.footnote)
+                    Spacer().frame(width: 8)
+                    Text("Incognito mode is not supported here - your main profile will be sent to group members").font(.footnote)
+                }
+                .padding(.bottom)
+            } else {
+                HStack {
+                    Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
+                    Spacer().frame(width: 8)
+                    Text("Your chat profile will be sent to group members").font(.footnote)
+                }
+                .padding(.bottom)
             }
-            .padding(.bottom)
 
             ZStack(alignment: .center) {
                 ZStack(alignment: .topTrailing) {

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

@@ -7,7 +7,6 @@
 //
 
 import SwiftUI
-import SimpleXChat
 
 enum CreateLinkTab {
     case oneTime
@@ -25,7 +24,6 @@ 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
 
@@ -41,7 +39,7 @@ struct CreateLinkView: View {
 
     private func createLinkView() -> some View {
         TabView(selection: $selection) {
-            AddContactView(contactConnection: $contactConnection, connReqInvitation: connReqInvitation)
+            AddContactView(connReqInvitation: connReqInvitation)
                 .tabItem {
                     Label(
                         connReqInvitation == ""
@@ -58,7 +56,7 @@ struct CreateLinkView: View {
                 .tag(CreateLinkTab.longTerm)
         }
         .onChange(of: selection) { _ in
-            if case .oneTime = selection, connReqInvitation == "", contactConnection == nil && !creatingConnReq {
+            if case .oneTime = selection, connReqInvitation == "" && !creatingConnReq {
                 createInvitation()
             }
         }
@@ -71,14 +69,12 @@ struct CreateLinkView: View {
     private func createInvitation() {
         creatingConnReq = true
         Task {
-            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
-                await MainActor.run {
+            let connReq = await apiAddContact()
+            await MainActor.run {
+                if let connReq = connReq {
                     connReqInvitation = connReq
-                    contactConnection = pcc
                     m.connReqInv = connReq
-                }
-            } else {
-                await MainActor.run {
+                } else {
                     creatingConnReq = false
                 }
             }

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

@@ -10,13 +10,13 @@ import SwiftUI
 import SimpleXChat
 
 enum NewChatAction: Identifiable {
-    case createLink(link: String, connection: PendingContactConnection)
+    case createLink(link: String)
     case connectViaLink
     case createGroup
 
     var id: String {
         switch self {
-        case let .createLink(link, _): return "createLink \(link)"
+        case let .createLink(link): return "createLink \(link)"
         case .connectViaLink: return "connectViaLink"
         case .createGroup: return "createGroup"
         }
@@ -41,8 +41,8 @@ struct NewChatButton: View {
         }
         .sheet(item: $actionSheet) { sheet in
             switch sheet {
-            case let .createLink(link, pcc):
-                CreateLinkView(selection: .oneTime, connReqInvitation: link, contactConnection: pcc)
+            case let .createLink(link):
+                CreateLinkView(selection: .oneTime, connReqInvitation: link)
             case .connectViaLink: ConnectViaLinkView()
             case .createGroup: AddGroupView()
             }
@@ -51,8 +51,8 @@ struct NewChatButton: View {
 
     func addContactAction() {
         Task {
-            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
-                actionSheet = .createLink(link: connReq, connection: pcc)
+            if let connReq = await apiAddContact() {
+                actionSheet = .createLink(link: connReq)
             }
         }
     }
@@ -63,9 +63,9 @@ enum ConnReqType: Equatable {
     case invitation
 }
 
-func connectViaLink(_ connectionLink: String, dismiss: DismissAction? = nil, incognito: Bool) {
+func connectViaLink(_ connectionLink: String, _ dismiss: DismissAction? = nil) {
     Task {
-        if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
+        if let connReqType = await apiConnect(connReq: connectionLink) {
             DispatchQueue.main.async {
                 dismiss?()
                 AlertManager.shared.showAlert(connReqSentAlert(connReqType))
@@ -100,12 +100,12 @@ func checkCRDataGroup(_ crData: CReqClientData) -> Bool {
     return crData.type == "group" && crData.groupLinkId != nil
 }
 
-func groupLinkAlert(_ connectionLink: String, incognito: Bool) -> Alert {
+func groupLinkAlert(_ connectionLink: String) -> Alert {
     return Alert(
         title: Text("Connect via group link?"),
         message: Text("You will join a group this link refers to and connect to its group members."),
-        primaryButton: .default(Text(incognito ? "Connect incognito" : "Connect")) {
-            connectViaLink(connectionLink, incognito: incognito)
+        primaryButton: .default(Text("Connect")) {
+            connectViaLink(connectionLink)
         },
         secondaryButton: .cancel()
     )

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

@@ -7,77 +7,76 @@
 //
 
 import SwiftUI
-import SimpleXChat
 
 struct PasteToConnectView: View {
+    @EnvironmentObject var chatModel: ChatModel
     @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
 
     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 = ""
+        ScrollView {
+            VStack(alignment: .leading) {
+                Text("Connect via link")
+                    .font(.largeTitle)
+                    .bold()
+                    .fixedSize(horizontal: false, vertical: true)
+                    .padding(.vertical)
+                Text("Paste the link you received into the box below to connect with your contact.")
+                    .padding(.bottom, 4)
+                if (chatModel.incognito) {
+                    HStack {
+                        Image(systemName: "theatermasks").foregroundColor(.indigo).font(.footnote)
+                        Spacer().frame(width: 8)
+                        Text("A random profile will be sent to the contact that you received this link from").font(.footnote)
                     }
-                } label: {
-                    if connectionLink == "" {
-                        settingsRow("doc.plaintext") { Text("Paste") }
-                    } else {
-                        settingsRow("multiply") { Text("Clear") }
+                    .padding(.bottom)
+                } else {
+                    HStack {
+                        Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
+                        Spacer().frame(width: 8)
+                        Text("Your profile will be sent to the contact that you received this link from").font(.footnote)
                     }
-                }
-                
-                Button {
-                    connect()
-                } label: {
-                    settingsRow("link") { Text("Connect") }
-                }
-                .disabled(connectionLink == "" || connectionLink.trimmingCharacters(in: .whitespaces).firstIndex(of: " ") != nil)
-                
-                IncognitoToggle(incognitoEnabled: $incognitoDefault)
-            } footer: {
-                sharedProfileInfo(incognitoDefault)
-                + Text(String("\n\n"))
-                + Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
-            }
-        }
-    }
-
-    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)
+                    .padding(.bottom)
                 }
                 TextEditor(text: $connectionLink)
                     .onSubmit(connect)
                     .textInputAutocapitalization(.never)
                     .disableAutocorrection(true)
-                    .focused($linkEditorFocused)
+                    .allowsTightening(false)
+                    .frame(height: 180)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 10)
+                            .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
+                    )
+
+                HStack(spacing: 20) {
+                    if connectionLink == "" {
+                        Button {
+                            connectionLink = UIPasteboard.general.string ?? ""
+                        } label: {
+                            Label("Paste", systemImage: "doc.plaintext")
+                        }
+                    } else {
+                        Button {
+                            connectionLink = ""
+                        } label: {
+                            Label("Clear", systemImage: "multiply")
+                        }
+
+                    }
+                    Spacer()
+                    Button(action: connect, label: {
+                        Label("Connect", systemImage: "link")
+                    })
+                    .disabled(connectionLink == "" || connectionLink.trimmingCharacters(in: .whitespaces).firstIndex(of: " ") != nil)
+                }
+                .frame(height: 48)
+                .padding(.bottom)
+
+                Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
             }
-            .allowsTightening(false)
-            .padding(.horizontal, -5)
-            .padding(.top, -8)
-            .frame(height: 180, alignment: .topLeading)
-            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding()
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
         }
     }
 
@@ -86,9 +85,9 @@ struct PasteToConnectView: View {
         if let crData = parseLinkQueryData(link),
            checkCRDataGroup(crData) {
             dismiss()
-            AlertManager.shared.showAlert(groupLinkAlert(link, incognito: incognitoDefault))
+            AlertManager.shared.showAlert(groupLinkAlert(link))
         } else {
-            connectViaLink(link, dismiss: dismiss, incognito: incognitoDefault)
+            connectViaLink(link, dismiss)
         }
     }
 }

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

@@ -7,12 +7,11 @@
 //
 
 import SwiftUI
-import SimpleXChat
 import CodeScanner
 
 struct ScanToConnectView: View {
+    @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
-    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
 
     var body: some View {
         ScrollView {
@@ -20,35 +19,34 @@ struct ScanToConnectView: View {
                 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)
-
-                Group {
-                    sharedProfileInfo(incognitoDefault)
-                    + Text(String("\n\n"))
-                    + Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
+                if (chatModel.incognito) {
+                    HStack {
+                        Image(systemName: "theatermasks").foregroundColor(.indigo).font(.footnote)
+                        Spacer().frame(width: 8)
+                        Text("A random profile will be sent to your contact").font(.footnote)
+                    }
+                    .padding(.bottom)
+                } else {
+                    HStack {
+                        Image(systemName: "info.circle").foregroundColor(.secondary).font(.footnote)
+                        Spacer().frame(width: 8)
+                        Text("Your chat profile will be sent to your contact").font(.footnote)
+                    }
+                    .padding(.bottom)
                 }
-                .font(.footnote)
-                .foregroundColor(.secondary)
-                .padding(.horizontal)
+                ZStack {
+                    CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+                        .aspectRatio(1, contentMode: .fit)
+                        .border(.gray)
+                }
+                .padding(.bottom)
+                Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
+                    .padding(.bottom)
             }
             .padding()
             .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
         }
-        .background(Color(.systemGroupedBackground))
     }
 
     func processQRCode(_ resp: Result<ScanResult, ScanError>) {
@@ -57,9 +55,9 @@ struct ScanToConnectView: View {
             if let crData = parseLinkQueryData(r.string),
                checkCRDataGroup(crData) {
                 dismiss()
-                AlertManager.shared.showAlert(groupLinkAlert(r.string, incognito: incognitoDefault))
+                AlertManager.shared.showAlert(groupLinkAlert(r.string))
             } else {
-                Task { connectViaLink(r.string, dismiss: dismiss, incognito: incognitoDefault) }
+                Task { connectViaLink(r.string, dismiss) }
             }
         case let .failure(e):
             logger.error("ConnectContactView.processQRCode QR code error: \(e.localizedDescription)")

apps/ios/Shared/Views/Onboarding/WhatsNewView.swift

@@ -251,38 +251,7 @@ private let versionDescriptions: [VersionDescription] = [
                 description: "- more stable message delivery.\n- a bit better groups.\n- and more!"
             ),
         ]
-    ),
-    VersionDescription(
-        version: "v5.3",
-        post: URL(string: "https://simplex.chat/blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.html"),
-        features: [
-            FeatureDescription(
-                icon: "desktopcomputer",
-                title: "New desktop app!",
-                description: "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻"
-            ),
-            FeatureDescription(
-                icon: "lock",
-                title: "Encrypt stored files & media",
-                description: "App encrypts new local files (except videos)."
-            ),
-            FeatureDescription(
-                icon: "magnifyingglass",
-                title: "Discover and join groups",
-                description: "- connect to [directory service](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!\n- delivery receipts (up to 20 members).\n- faster and more stable."
-            ),
-            FeatureDescription(
-                icon: "theatermasks",
-                title: "Simplified incognito mode",
-                description: "Toggle incognito when connecting."
-            ),
-            FeatureDescription(
-                icon: "character",
-                title: "\(4) new interface languages",
-                description: "Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
-            ),
-        ]
-    ),
+    )
 ]
 
 private let lastVersion = versionDescriptions.last!.version
@@ -352,15 +321,12 @@ struct WhatsNewView: View {
     private func featureDescription(_ icon: String, _ title: LocalizedStringKey, _ description: LocalizedStringKey) -> some View {
         VStack(alignment: .leading, spacing: 4) {
             HStack(alignment: .center, spacing: 4) {
-                Image(systemName: icon)
-                    .symbolRenderingMode(.monochrome)
-                    .foregroundColor(.secondary)
+                Image(systemName: icon).foregroundColor(.secondary)
                     .frame(minWidth: 30, alignment: .center)
                 Text(title).font(.title3).bold()
             }
             Text(description)
                 .multilineTextAlignment(.leading)
-                .lineLimit(10)
         }
     }
 

apps/ios/Shared/Views/TerminalView.swift

@@ -22,28 +22,10 @@ struct TerminalView: View {
     @State var authorized = !UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA)
     @State private var terminalItem: TerminalItem?
     @State private var scrolled = false
-    @State private var showing = false
 
     var body: some View {
         if authorized {
             terminalView()
-                .onAppear {
-                    if showing { return }
-                    showing = true
-                    Task {
-                        let items = await TerminalItems.shared.items()
-                        await MainActor.run {
-                            chatModel.terminalItems = items
-                            chatModel.showingTerminal = true
-                        }
-                    }
-                }
-                .onDisappear {
-                    if terminalItem == nil {
-                        chatModel.showingTerminal = false
-                        chatModel.terminalItems = []
-                    }
-                }
         } else {
             Button(action: runAuth) { Label("Unlock", systemImage: "lock") }
             .onAppear(perform: runAuth)
@@ -136,8 +118,9 @@ struct TerminalView: View {
         let cmd = ChatCommand.string(composeState.message)
         if composeState.message.starts(with: "/sql") && (!prefPerformLA || !developerTools) {
             let resp = ChatResponse.chatCmdError(user_: nil, chatError: ChatError.error(errorType: ChatErrorType.commandError(message: "Failed reading: empty")))
-            Task {
-                await TerminalItems.shared.addCommand(.now, cmd, resp)
+            DispatchQueue.main.async {
+                ChatModel.shared.addTerminalItem(.cmd(.now, cmd))
+                ChatModel.shared.addTerminalItem(.resp(.now, resp))
             }
         } else {
             DispatchQueue.global().async {

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

@@ -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: [2_500000, 5_000000, 7_500000, 10_000000, 15_000000, 20_000000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [1_500000, 3_000000, 5_000000, 7_000000, 10_000000, 15_000000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [5_000, 10_000, 20_000, 40_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)
@@ -153,9 +153,7 @@ struct AdvancedNetworkSettings: View {
 
     private func timeoutSettingPicker(_ title: LocalizedStringKey, selection: Binding<Int>, values: [Int], label: String) -> some View {
         Picker(title, selection: selection) {
-            let v = selection.wrappedValue
-            let vs = values.contains(v) ? values : values + [v]
-            ForEach(vs, id: \.self) { value in
+            ForEach(values, id: \.self) { value in
                 Text("\(String(format: "%g", (Double(value) / 1000000))) \(secondsLabel)")
             }
         }

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

@@ -18,9 +18,10 @@ struct IncognitoHelp: View {
             ScrollView {
                 VStack(alignment: .leading) {
                     Group {
-                    Text("Incognito mode protects your privacy by using a new random profile for each contact.")
+                    Text("Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.")
                     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("To find the profile used for an incognito connection, tap the contact or group name on top of the chat.")
                     }
                     .padding(.bottom)
                 }

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

@@ -71,10 +71,9 @@ struct PreferencesView: View {
             do {
                 var p = fromLocalProfile(profile)
                 p.preferences = fullPreferencesToPreferences(preferences)
-                if let (newProfile, updatedContacts) = try await apiUpdateProfile(profile: p) {
+                if let newProfile = try await apiUpdateProfile(profile: p) {
                     await MainActor.run {
                         chatModel.updateCurrentUser(newProfile, preferences)
-                        updatedContacts.forEach(chatModel.updateContact)
                         currentPreferences = preferences
                     }
                 }

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

@@ -13,9 +13,6 @@ struct PrivacySettings: View {
     @EnvironmentObject var m: ChatModel
     @AppStorage(DEFAULT_PRIVACY_ACCEPT_IMAGES) private var autoAcceptImages = true
     @AppStorage(DEFAULT_PRIVACY_LINK_PREVIEWS) private var useLinkPreviews = true
-    @AppStorage(DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) private var showChatPreviews = true
-    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
-    @AppStorage(GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES, store: groupDefaults) private var encryptLocalFiles = true
     @State private var simplexLinkMode = privacySimplexLinkModeDefault.get()
     @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -24,10 +21,6 @@ struct PrivacySettings: View {
     @State private var contactReceiptsReset = false
     @State private var contactReceiptsOverrides = 0
     @State private var contactReceiptsDialogue = false
-    @State private var groupReceipts = false
-    @State private var groupReceiptsReset = false
-    @State private var groupReceiptsOverrides = 0
-    @State private var groupReceiptsDialogue = false
     @State private var alert: PrivacySettingsViewAlert?
 
     enum PrivacySettingsViewAlert: Identifiable {
@@ -64,9 +57,6 @@ struct PrivacySettings: View {
                 }
 
                 Section {
-                    settingsRow("lock.doc") {
-                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
-                    }
                     settingsRow("photo") {
                         Toggle("Auto-accept images", isOn: $autoAcceptImages)
                             .onChange(of: autoAcceptImages) {
@@ -76,18 +66,6 @@ struct PrivacySettings: View {
                     settingsRow("network") {
                         Toggle("Send link previews", isOn: $useLinkPreviews)
                     }
-                    settingsRow("message") {
-                        Toggle("Show last messages", isOn: $showChatPreviews)
-                    }
-                    settingsRow("rectangle.and.pencil.and.ellipsis") {
-                        Toggle("Message draft", isOn: $saveLastDraft)
-                    }
-                    .onChange(of: saveLastDraft) { saveDraft in
-                        if !saveDraft {
-                            m.draft = nil
-                            m.draftChatId = nil
-                        }
-                    }
                     settingsRow("link") {
                         Picker("SimpleX links", selection: $simplexLinkMode) {
                             ForEach(SimpleXLinkMode.values) { mode in
@@ -111,15 +89,15 @@ struct PrivacySettings: View {
                     settingsRow("person") {
                         Toggle("Contacts", isOn: $contactReceipts)
                     }
-                    settingsRow("person.2") {
-                        Toggle("Small groups (max 20)", isOn: $groupReceipts)
-                    }
+//                    settingsRow("person.2") {
+//                        Toggle("Small groups (max 20)", isOn: Binding.constant(false))
+//                    }
                 } header: {
                     Text("Send delivery receipts to")
                 } footer: {
                     VStack(alignment: .leading) {
                         Text("These settings are for your current profile **\(ChatModel.shared.currentUser?.displayName ?? "")**.")
-                        Text("They can be overridden in contact and group settings.")
+                        Text("They can be overridden in contact settings")
                     }
                     .frame(maxWidth: .infinity, alignment: .leading)
                 }
@@ -135,44 +113,19 @@ struct PrivacySettings: View {
                         contactReceipts.toggle()
                     }
                 }
-                .confirmationDialog(groupReceiptsDialogTitle, isPresented: $groupReceiptsDialogue, titleVisibility: .visible) {
-                    Button(groupReceipts ? "Enable (keep overrides)" : "Disable (keep overrides)") {
-                        setSendReceiptsGroups(groupReceipts, clearOverrides: false)
-                    }
-                    Button(groupReceipts ? "Enable for all" : "Disable for all", role: .destructive) {
-                        setSendReceiptsGroups(groupReceipts, clearOverrides: true)
-                    }
-                    Button("Cancel", role: .cancel) {
-                        groupReceiptsReset = true
-                        groupReceipts.toggle()
-                    }
-                }
             }
         }
-        .onChange(of: contactReceipts) { _ in
+        .onChange(of: contactReceipts) { _ in // sometimes there is race with onAppear
             if contactReceiptsReset {
                 contactReceiptsReset = false
             } else {
                 setOrAskSendReceiptsContacts(contactReceipts)
             }
         }
-        .onChange(of: groupReceipts) { _ in
-            if groupReceiptsReset {
-                groupReceiptsReset = false
-            } else {
-                setOrAskSendReceiptsGroups(groupReceipts)
-            }
-        }
         .onAppear {
-            if let u = m.currentUser {
-                if contactReceipts != u.sendRcptsContacts {
-                    contactReceiptsReset = true
-                    contactReceipts = u.sendRcptsContacts
-                }
-                if groupReceipts != u.sendRcptsSmallGroups {
-                    groupReceiptsReset = true
-                    groupReceipts = u.sendRcptsSmallGroups
-                }
+            if let u = m.currentUser, contactReceipts != u.sendRcptsContacts {
+                contactReceiptsReset = true
+                contactReceipts = u.sendRcptsContacts
             }
         }
         .alert(item: $alert) { alert in
@@ -231,54 +184,6 @@ struct PrivacySettings: View {
         }
     }
 
-    private func setOrAskSendReceiptsGroups(_ enable: Bool) {
-        groupReceiptsOverrides = m.chats.reduce(0) { count, chat in
-            let sendRcpts = chat.chatInfo.groupInfo?.chatSettings.sendRcpts
-            return count + (sendRcpts == nil || sendRcpts == enable ? 0 : 1)
-        }
-        if groupReceiptsOverrides == 0 {
-            setSendReceiptsGroups(enable, clearOverrides: false)
-        } else {
-            groupReceiptsDialogue = true
-        }
-    }
-
-    private var groupReceiptsDialogTitle: LocalizedStringKey {
-        groupReceipts
-        ? "Sending receipts is disabled for \(groupReceiptsOverrides) groups"
-        : "Sending receipts is enabled for \(groupReceiptsOverrides) groups"
-    }
-
-    private func setSendReceiptsGroups(_ enable: Bool, clearOverrides: Bool) {
-        Task {
-            do {
-                if let currentUser = m.currentUser {
-                    let userMsgReceiptSettings = UserMsgReceiptSettings(enable: enable, clearOverrides: clearOverrides)
-                    try await apiSetUserGroupReceipts(currentUser.userId, userMsgReceiptSettings: userMsgReceiptSettings)
-                    privacyDeliveryReceiptsSet.set(true)
-                    await MainActor.run {
-                        var updatedUser = currentUser
-                        updatedUser.sendRcptsSmallGroups = enable
-                        m.updateUser(updatedUser)
-                        if clearOverrides {
-                            m.chats.forEach { chat in
-                                if var groupInfo = chat.chatInfo.groupInfo {
-                                    let sendRcpts = groupInfo.chatSettings.sendRcpts
-                                    if sendRcpts != nil && sendRcpts != enable {
-                                        groupInfo.chatSettings.sendRcpts = nil
-                                        m.updateGroup(groupInfo)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            } catch let error {
-                alert = .error(title: "Error setting delivery receipts!", error: "Error: \(responseError(error))")
-            }
-        }
-    }
-
     private func simplexLockRow(_ value: LocalizedStringKey) -> some View {
         HStack {
             Text("SimpleX Lock")

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

@@ -21,10 +21,11 @@ struct ScanProtocolServer: View {
                 .font(.largeTitle)
                 .bold()
                 .padding(.vertical)
-            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
-                .aspectRatio(1, contentMode: .fit)
-                .cornerRadius(12)
-                .padding(.top)
+            ZStack {
+                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+                    .aspectRatio(1, contentMode: .fit)
+                    .border(.gray)
+            }
         }
         .padding()
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)

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

@@ -30,8 +30,6 @@ let DEFAULT_CALL_KIT_CALLS_IN_RECENTS = "callKitCallsInRecents"
 let DEFAULT_PRIVACY_ACCEPT_IMAGES = "privacyAcceptImages"
 let DEFAULT_PRIVACY_LINK_PREVIEWS = "privacyLinkPreviews"
 let DEFAULT_PRIVACY_SIMPLEX_LINK_MODE = "privacySimplexLinkMode"
-let DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS = "privacyShowChatPreviews"
-let DEFAULT_PRIVACY_SAVE_LAST_DRAFT = "privacySaveLastDraft"
 let DEFAULT_PRIVACY_PROTECT_SCREEN = "privacyProtectScreen"
 let DEFAULT_PRIVACY_DELIVERY_RECEIPTS_SET = "privacyDeliveryReceiptsSet"
 let DEFAULT_EXPERIMENTAL_CALLS = "experimentalCalls"
@@ -67,8 +65,6 @@ let appDefaults: [String: Any] = [
     DEFAULT_PRIVACY_ACCEPT_IMAGES: true,
     DEFAULT_PRIVACY_LINK_PREVIEWS: true,
     DEFAULT_PRIVACY_SIMPLEX_LINK_MODE: SimpleXLinkMode.description.rawValue,
-    DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS: true,
-    DEFAULT_PRIVACY_SAVE_LAST_DRAFT: true,
     DEFAULT_PRIVACY_PROTECT_SCREEN: false,
     DEFAULT_PRIVACY_DELIVERY_RECEIPTS_SET: false,
     DEFAULT_EXPERIMENTAL_CALLS: false,
@@ -135,6 +131,7 @@ struct SettingsView: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var sceneDelegate: SceneDelegate
     @Binding var showSettings: Bool
+    @State private var settingsSheet: SettingsSheet?
 
     var body: some View {
         ZStack {
@@ -164,6 +161,8 @@ struct SettingsView: View {
                         settingsRow("person.crop.rectangle.stack") { Text("Your chat profiles") }
                     }
 
+                    incognitoRow()
+
                     NavigationLink {
                         UserAddressView(shareViaProfile: chatModel.currentUser!.addressShared)
                             .navigationTitle("SimpleX address")
@@ -299,9 +298,38 @@ struct SettingsView: View {
             }
             .navigationTitle("Your settings")
         }
-        .onDisappear {
-            chatModel.showingTerminal = false
-            chatModel.terminalItems = []
+        .sheet(item: $settingsSheet) { sheet in
+            switch sheet {
+            case .incognitoInfo: IncognitoHelp()
+            }
+        }
+    }
+
+    @ViewBuilder private func incognitoRow() -> some View {
+        ZStack(alignment: .leading) {
+            Image(systemName: chatModel.incognito ? "theatermasks.fill" : "theatermasks")
+                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+                .foregroundColor(chatModel.incognito ? Color.indigo : .secondary)
+            Toggle(isOn: $chatModel.incognito) {
+                HStack(spacing: 6) {
+                    Text("Incognito")
+                    Image(systemName: "info.circle")
+                        .foregroundColor(.accentColor)
+                        .font(.system(size: 14))
+                }
+                .onTapGesture {
+                    settingsSheet = .incognitoInfo
+                }
+            }
+            .onChange(of: chatModel.incognito) { incognito in
+                incognitoGroupDefault.set(incognito)
+                do {
+                    try apiSetIncognito(incognito: incognito)
+                } catch {
+                    logger.error("apiSetIncognito: cannot set incognito \(responseError(error))")
+                }
+            }
+            .padding(.leading, indent)
         }
     }
     
@@ -323,6 +351,12 @@ struct SettingsView: View {
         }
     }
 
+    private enum SettingsSheet: Identifiable {
+        case incognitoInfo
+
+        var id: SettingsSheet { get { self } }
+    }
+
     private enum NotificationAlert {
         case enable
         case error(LocalizedStringKey, String)

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

@@ -190,7 +190,7 @@ struct UserAddressView: View {
 
     @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
         Section {
-            MutableQRCode(uri: Binding.constant(userAddress.connReqContact))
+            QRCode(uri: userAddress.connReqContact)
             shareQRCodeButton(userAddress)
             if MFMailComposeViewController.canSendMail() {
                 shareViaEmailButton(userAddress)

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

@@ -144,7 +144,7 @@ struct UserProfile: View {
     func saveProfile() {
         Task {
             do {
-                if let (newProfile, _) = try await apiUpdateProfile(profile: profile) {
+                if let newProfile = try await apiUpdateProfile(profile: profile) {
                     DispatchQueue.main.async {
                         chatModel.updateCurrentUser(newProfile)
                         profile = newProfile

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

@@ -3630,51 +3630,6 @@ SimpleX servers cannot see your profile.</source>
         <source>\~strike~</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <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="%@ (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="%@:" xml:space="preserve" approved="no">
-        <source>%@:</source>
-        <target state="needs-translation">%@:</target>
-        <note>copied message info</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="# %@" xml:space="preserve" approved="no">
-        <source># %@</source>
-        <target state="needs-translation"># %@</target>
-        <note>copied message info title, # &lt;title&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="%@ 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="ar" datatype="plaintext">

apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/Shared/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,15 +0,0 @@
-{
-  "colors" : [
-    {
-      "idiom" : "universal",
-      "locale" : "bg"
-    }
-  ],
-  "properties" : {
-    "localizable" : true
-  },
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/Shared/Assets.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

apps/ios/SimpleX Localizations/bg.xcloc/Source Contents/Shared/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "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"
-  }
-}

apps/ios/SimpleX Localizations/bg.xcloc/Source Contents/Shared/Assets.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

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

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

@@ -1,30 +0,0 @@
-/* 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!";
-

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

@@ -1,10 +0,0 @@
-/* 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 - 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";

apps/ios/SimpleX Localizations/bg.xcloc/contents.json

@@ -1,12 +0,0 @@
-{
-  "developmentRegion" : "en",
-  "project" : "SimpleX.xcodeproj",
-  "targetLocale" : "bg",
-  "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
-    "toolID" : "com.apple.dt.xcode",
-    "toolName" : "Xcode",
-    "toolVersion" : "15.0"
-  },
-  "version" : "1.0"
-}

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

@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="cs" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="&#10;" xml:space="preserve">
@@ -42,21 +42,6 @@
         <target>!1 barevný!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="# %@" xml:space="preserve">
-        <source># %@</source>
-        <target># %@</target>
-        <note>copied message info title, # &lt;title&gt;</note>
-      </trans-unit>
-      <trans-unit id="## History" xml:space="preserve">
-        <source>## History</source>
-        <target>## Historie</target>
-        <note>copied message info</note>
-      </trans-unit>
-      <trans-unit id="## In reply to" xml:space="preserve">
-        <source>## In reply to</source>
-        <target>## Odpovídáno</target>
-        <note>copied message info</note>
-      </trans-unit>
       <trans-unit id="#secret#" xml:space="preserve">
         <source>#secret#</source>
         <target>#tajný#</target>
@@ -87,11 +72,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@ connected" xml:space="preserve">
-        <source>%@ and %@ connected</source>
-        <target>%@ a %@ připojen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ at %@:" xml:space="preserve">
         <source>%1$@ at %2$@:</source>
         <target>%1$@ na %2$@:</target>
@@ -122,11 +102,6 @@
         <target>%@ se chce připojit!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
-        <source>%@, %@ and %lld other members connected</source>
-        <target>%@, %@ a %lld ostatní členové připojeni</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@:" xml:space="preserve">
         <source>%@:</source>
         <target>%@:</target>
@@ -197,10 +172,6 @@
         <target>%lld minut</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld new interface languages" xml:space="preserve">
-        <source>%lld new interface languages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld second(s)" xml:space="preserve">
         <source>%lld second(s)</source>
         <target>%lld vteřin</target>
@@ -331,12 +302,6 @@
         <target>, </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
-        <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>
-        <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">
         <source>- more stable message delivery.
 - a bit better groups.
@@ -432,9 +397,14 @@
         <target>Nový kontakt</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="A new random profile will be shared." xml:space="preserve">
-        <source>A new random profile will be shared.</source>
-        <target>Nový náhodný profil bude sdílen.</target>
+      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
+        <source>A random profile will be sent to the contact that you received this link from</source>
+        <target>Náhodný profil bude zaslán kontaktu, od kterého jste obdrželi tento odkaz</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
+        <source>A random profile will be sent to your contact</source>
+        <target>Vašemu kontaktu bude zaslán náhodný profil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -490,9 +460,9 @@
         <note>accept contact request via notification
    accept incoming call via notification</note>
       </trans-unit>
-      <trans-unit id="Accept connection request?" xml:space="preserve">
-        <source>Accept connection request?</source>
-        <target>Přijmout kontakt?</target>
+      <trans-unit id="Accept contact" xml:space="preserve">
+        <source>Accept contact</source>
+        <target>Přijmout kontakt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -503,7 +473,7 @@
       <trans-unit id="Accept incognito" xml:space="preserve">
         <source>Accept incognito</source>
         <target>Přijmout inkognito</target>
-        <note>accept contact request via notification</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
         <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -710,10 +680,6 @@
         <target>Sestavení aplikace: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
-        <source>App encrypts new local files (except videos).</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Ikona aplikace</target>
@@ -849,10 +815,6 @@
         <target>Hlasové zprávy můžete posílat vy i váš kontakt.</target>
         <note>No comment provided by engineer.</note>
       </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>
-        <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">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>Podle chat profilu (výchozí) nebo [podle připojení](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1084,19 +1046,9 @@
         <target>Připojit</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Connect directly" xml:space="preserve">
-        <source>Connect directly</source>
-        <target>Připojit přímo</target>
-        <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>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact link" xml:space="preserve">
-        <source>Connect via contact link</source>
-        <target>Připojit se přes odkaz</target>
+      <trans-unit id="Connect via contact link?" xml:space="preserve">
+        <source>Connect via contact link?</source>
+        <target>Připojit se přes kontaktní odkaz?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1114,9 +1066,9 @@
         <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>
+      <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>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1144,6 +1096,11 @@
         <target>Chyba spojení (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection request" xml:space="preserve">
+        <source>Connection request</source>
+        <target>Žádost o připojení</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection request sent!" xml:space="preserve">
         <source>Connection request sent!</source>
         <target>Požadavek na připojení byl odeslán!</target>
@@ -1249,10 +1206,6 @@
         <target>Vytvořit odkaz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
-        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
-        <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>
@@ -1596,11 +1549,6 @@
         <target>Smazáno v: %@</target>
         <note>copied message info</note>
       </trans-unit>
-      <trans-unit id="Delivery" xml:space="preserve">
-        <source>Delivery</source>
-        <target>Doručenka</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>Potvrzení o doručení jsou vypnuté!</target>
@@ -1706,10 +1654,6 @@
         <target>Odpojit</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Discover and join groups" xml:space="preserve">
-        <source>Discover and join groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Display name" xml:space="preserve">
         <source>Display name</source>
         <target>Zobrazované jméno</target>
@@ -1845,14 +1789,6 @@
         <target>Šifrovat databázi?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Encrypt local files" xml:space="preserve">
-        <source>Encrypt local files</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve">
-        <source>Encrypt stored files &amp; media</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Encrypted database" xml:space="preserve">
         <source>Encrypted database</source>
         <target>Zašifrovaná databáze</target>
@@ -1978,19 +1914,11 @@
         <target>Chyba při vytváření odkazu skupiny</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error creating member contact" xml:space="preserve">
-        <source>Error creating member contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
         <source>Error creating profile!</source>
         <target>Chyba při vytváření profilu!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error decrypting file" xml:space="preserve">
-        <source>Error decrypting file</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error deleting chat database" xml:space="preserve">
         <source>Error deleting chat database</source>
         <target>Chyba při mazání databáze chatu</target>
@@ -2111,10 +2039,6 @@
         <target>Chyba odesílání e-mailu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error sending member contact invitation" xml:space="preserve">
-        <source>Error sending member contact invitation</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
         <source>Error sending message</source>
         <target>Chyba při odesílání zprávy</target>
@@ -2122,7 +2046,6 @@
       </trans-unit>
       <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
         <source>Error setting delivery receipts!</source>
-        <target>Chyba nastavování potvrzení o doručení!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error starting chat" xml:space="preserve">
@@ -2332,7 +2255,7 @@
       </trans-unit>
       <trans-unit id="Full name (optional)" xml:space="preserve">
         <source>Full name (optional)</source>
-        <target>Celé jméno (volitelně)</target>
+        <target>Celé jméno (volitelné)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Full name:" xml:space="preserve">
@@ -2513,7 +2436,7 @@
       <trans-unit id="History" xml:space="preserve">
         <source>History</source>
         <target>Historie</target>
-        <note>No comment provided by engineer.</note>
+        <note>copied message info</note>
       </trans-unit>
       <trans-unit id="How SimpleX works" xml:space="preserve">
         <source>How SimpleX works</source>
@@ -2623,7 +2546,7 @@
       <trans-unit id="In reply to" xml:space="preserve">
         <source>In reply to</source>
         <target>V odpovědi na</target>
-        <note>No comment provided by engineer.</note>
+        <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
@@ -2635,9 +2558,14 @@
         <target>Režim inkognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
-        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
-        <target>Režim inkognito chrání vaše soukromí používáním nového náhodného profilu pro každý kontakt.</target>
+      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
+        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
+        <target>Zde není podporován režim inkognito - členům skupiny bude zaslán váš hlavní profil</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
+        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
+        <target>Režim inkognito chrání soukromí vašeho hlavního profilového jména a obrázku - pro každý nový kontakt je vytvořen nový náhodný profil.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2712,11 +2640,6 @@
         <target>Neplatná adresa serveru!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid status" xml:space="preserve">
-        <source>Invalid status</source>
-        <target>Neplatný status</target>
-        <note>item status text</note>
-      </trans-unit>
       <trans-unit id="Invitation expired!" xml:space="preserve">
         <source>Invitation expired!</source>
         <target>Platnost pozvánky vypršela!</target>
@@ -2800,12 +2723,12 @@
       </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
-        <target>Připojit se inkognito</target>
+        <target>Připojte se inkognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Joining group" xml:space="preserve">
         <source>Joining group</source>
-        <target>Připojování ke skupině</target>
+        <target>Připojení ke skupině</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
@@ -2976,7 +2899,7 @@
       <trans-unit id="Message delivery error" xml:space="preserve">
         <source>Message delivery error</source>
         <target>Chyba doručení zprávy</target>
-        <note>item status text</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message delivery receipts!" xml:space="preserve">
         <source>Message delivery receipts!</source>
@@ -3063,11 +2986,6 @@
         <target>Další vylepšení se chystají již brzy!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
-        <source>Most likely this connection is deleted.</source>
-        <target>Pravděpodobně je toto spojení smazáno.</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
         <source>Most likely this contact has deleted the connection with you.</source>
         <target>Tento kontakt s největší pravděpodobností smazal spojení s vámi.</target>
@@ -3128,10 +3046,6 @@
         <target>Archiv nové databáze</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New desktop app!" xml:space="preserve">
-        <source>New desktop app!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New display name" xml:space="preserve">
         <source>New display name</source>
         <target>Nově zobrazované jméno</target>
@@ -3177,10 +3091,6 @@
         <target>Žádné kontakty k přidání</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No delivery information" xml:space="preserve">
-        <source>No delivery information</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No device token!" xml:space="preserve">
         <source>No device token!</source>
         <target>Žádný token zařízení!</target>
@@ -3345,10 +3255,6 @@
         <target>Hlasové zprávy může odesílat pouze váš kontakt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Open" xml:space="preserve">
-        <source>Open</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
         <target>Otevřít nastavení</target>
@@ -3439,10 +3345,10 @@
         <target>Vložení přijatého odkazu</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>
+      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received into the box below 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>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
         <source>People can connect to you only via the links you share.</source>
@@ -3641,7 +3547,6 @@
       </trans-unit>
       <trans-unit id="Protocol timeout per KB" xml:space="preserve">
         <source>Protocol timeout per KB</source>
-        <target>Časový limit protokolu na KB</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
@@ -3656,7 +3561,6 @@
       </trans-unit>
       <trans-unit id="React…" xml:space="preserve">
         <source>React…</source>
-        <target>Reagovat…</target>
         <note>chat item menu</note>
       </trans-unit>
       <trans-unit id="Read" xml:space="preserve">
@@ -3689,10 +3593,6 @@
         <target>Přečtěte si více v našem [GitHub repozitáři](https://github.com/simplex-chat/simplex-chat#readme).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receipts are disabled" xml:space="preserve">
-        <source>Receipts are disabled</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Received at" xml:space="preserve">
         <source>Received at</source>
         <target>Přijato v</target>
@@ -3715,7 +3615,6 @@
       </trans-unit>
       <trans-unit id="Receiving address will be changed to a different server. Address change will complete after sender comes online." xml:space="preserve">
         <source>Receiving address will be changed to a different server. Address change will complete after sender comes online.</source>
-        <target>Přijímací adresa bude změněna na jiný server. Změna adresy bude dokončena po připojení odesílatele.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
@@ -3735,12 +3634,10 @@
       </trans-unit>
       <trans-unit id="Reconnect all connected servers to force message delivery. It uses additional traffic." xml:space="preserve">
         <source>Reconnect all connected servers to force message delivery. It uses additional traffic.</source>
-        <target>Znovu připojte všechny připojené servery a vynuťte doručení zprávy. Využívá další provoz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reconnect servers?" xml:space="preserve">
         <source>Reconnect servers?</source>
-        <target>Znovu připojit servery?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Record updated at" xml:space="preserve">
@@ -3763,8 +3660,8 @@
         <target>Odmítnout</target>
         <note>reject incoming call via notification</note>
       </trans-unit>
-      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
-        <source>Reject (sender NOT notified)</source>
+      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
+        <source>Reject contact (sender NOT notified)</source>
         <target>Odmítnout kontakt (odesílatel NEBUDE upozorněn)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -4075,7 +3972,6 @@
       </trans-unit>
       <trans-unit id="Send delivery receipts to" xml:space="preserve">
         <source>Send delivery receipts to</source>
-        <target>Potvrzení o doručení zasílat na</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send direct message" xml:space="preserve">
@@ -4083,10 +3979,6 @@
         <target>Odeslat přímou zprávu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Send direct message to connect" xml:space="preserve">
-        <source>Send direct message to connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
         <source>Send disappearing message</source>
         <target>Poslat mizící zprávu</target>
@@ -4157,19 +4049,11 @@
         <target>Odesílání potvrzení o doručení je vypnuto pro %lld kontakty</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
-        <source>Sending receipts is disabled for %lld groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
         <source>Sending receipts is enabled for %lld contacts</source>
         <target>Odesílání potvrzení o doručení je povoleno pro %lld kontakty</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
-        <source>Sending receipts is enabled for %lld groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Sending via" xml:space="preserve">
         <source>Sending via</source>
         <target>Odesílání přes</target>
@@ -4310,10 +4194,6 @@
         <target>Zobrazit možnosti vývojáře</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Show last messages" xml:space="preserve">
-        <source>Show last messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Zobrazení náhledu</target>
@@ -4384,10 +4264,6 @@
         <target>Jednorázová pozvánka SimpleX</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="Simplified incognito mode" xml:space="preserve">
-        <source>Simplified incognito mode</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
         <source>Skip</source>
         <target>Přeskočit</target>
@@ -4398,10 +4274,6 @@
         <target>Přeskočené zprávy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Small groups (max 20)" xml:space="preserve">
-        <source>Small groups (max 20)</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Během importu došlo k nezávažným chybám - podrobnosti naleznete v chat konzoli.</target>
@@ -4661,7 +4533,6 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
       </trans-unit>
       <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
         <source>The second tick we missed! ✅</source>
-        <target>Druhé zaškrtnutí jsme přehlédli! ✅</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -4694,9 +4565,9 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
         <target>Toto nastavení je pro váš aktuální profil **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
-        <source>They can be overridden in contact and group settings.</source>
-        <target>Mohou být přepsány v nastavení kontaktů.</target>
+      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
+        <source>They can be overridden in contact settings</source>
+        <target>Mohou být přepsány v nastavení kontaktů</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4714,10 +4585,6 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
         <target>Tuto akci nelze vzít zpět - váš profil, kontakty, zprávy a soubory budou nenávratně ztraceny.</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>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group no longer exists." xml:space="preserve">
         <source>This group no longer exists.</source>
         <target>Tato skupina již neexistuje.</target>
@@ -4738,6 +4605,11 @@ 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 find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
+        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
+        <target>Chcete-li najít profil použitý pro inkognito připojení, klepněte na název kontaktu nebo skupiny v horní části chatu.</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>Vytvoření nového připojení</target>
@@ -4780,10 +4652,6 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
         <target>Chcete-li ověřit koncové šifrování u svého kontaktu, porovnejte (nebo naskenujte) kód na svých zařízeních.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
-        <source>Toggle incognito when connecting.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Transport isolation" xml:space="preserve">
         <source>Transport isolation</source>
         <target>Izolace transportu</target>
@@ -4822,7 +4690,7 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Neočekávaná chyba: %@</target>
-        <note>item status description</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
@@ -4961,10 +4829,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <target>Použijte chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use current profile" xml:space="preserve">
-        <source>Use current profile</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve">
         <source>Use for new connections</source>
         <target>Použít pro nová připojení</target>
@@ -4975,10 +4839,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <target>Použít rozhraní volání iOS</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use new incognito profile" xml:space="preserve">
-        <source>Use new incognito profile</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>
@@ -5269,8 +5129,8 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <target>Musíte zadat přístupovou frázi při každém spuštění aplikace - není uložena v zařízení.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You invited a contact" xml:space="preserve">
-        <source>You invited a contact</source>
+      <trans-unit id="You invited your contact" xml:space="preserve">
+        <source>You invited your contact</source>
         <target>Pozvali jste svůj kontakt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -5399,6 +5259,11 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <target>Váš chat profil bude zaslán členům skupiny</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
+        <source>Your chat profile will be sent to your contact</source>
+        <target>Váš chat profil bude odeslán vašemu kontaktu</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Vaše chat profily</target>
@@ -5453,10 +5318,6 @@ Můžete ji změnit v Nastavení.</target>
         <target>Vaše soukromí</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
-        <source>Your profile **%@** will be shared.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5464,6 +5325,11 @@ SimpleX servers cannot see your profile.</source>
 Servery SimpleX nevidí váš profil.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
+        <source>Your profile will be sent to the contact that you received this link from</source>
+        <target>Váš profil bude zaslán kontaktu, od kterého jste obdrželi tento odkaz</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
         <source>Your profile, contacts and delivered messages are stored on your device.</source>
         <target>Váš profil, kontakty a doručené zprávy jsou uloženy ve vašem zařízení.</target>
@@ -5629,10 +5495,6 @@ Servery SimpleX nevidí váš profil.</target>
         <target>připojeno</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="connected directly" xml:space="preserve">
-        <source>connected directly</source>
-        <note>rcv group event chat item</note>
-      </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
         <source>connecting</source>
         <target>připojování</target>
@@ -5715,12 +5577,10 @@ Servery SimpleX nevidí váš profil.</target>
       </trans-unit>
       <trans-unit id="default (no)" xml:space="preserve">
         <source>default (no)</source>
-        <target>výchozí (ne)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="default (yes)" xml:space="preserve">
         <source>default (yes)</source>
-        <target>výchozí (ano)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="deleted" xml:space="preserve">
@@ -5743,10 +5603,6 @@ Servery SimpleX nevidí váš profil.</target>
         <target>přímo</target>
         <note>connection level description</note>
       </trans-unit>
-      <trans-unit id="disabled" xml:space="preserve">
-        <source>disabled</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="duplicate message" xml:space="preserve">
         <source>duplicate message</source>
         <target>duplicitní zpráva</target>
@@ -5827,10 +5683,6 @@ Servery SimpleX nevidí váš profil.</target>
         <target>chyba</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="group deleted" xml:space="preserve">
         <source>group deleted</source>
         <target>skupina smazána</target>
@@ -6092,10 +5944,6 @@ Servery SimpleX nevidí váš profil.</target>
         <target>bezpečnostní kód změněn</target>
         <note>chat item text</note>
       </trans-unit>
-      <trans-unit id="send direct message" xml:space="preserve">
-        <source>send direct message</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
         <source>starting…</source>
         <target>začíná…</target>
@@ -6240,7 +6088,7 @@ Servery SimpleX nevidí váš profil.</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="cs" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6272,7 +6120,7 @@ Servery SimpleX nevidí váš profil.</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="cs" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">

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

@@ -0,0 +1 @@
+

apps/ios/SimpleX Localizations/cs.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "cs",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "14E300c",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "14.3.1"
   },
   "version" : "1.0"
 }

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

@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="de" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="&#10;" xml:space="preserve">
@@ -42,21 +42,6 @@
         <target>!1 farbig!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="# %@" xml:space="preserve">
-        <source># %@</source>
-        <target># %@</target>
-        <note>copied message info title, # &lt;title&gt;</note>
-      </trans-unit>
-      <trans-unit id="## History" xml:space="preserve">
-        <source>## History</source>
-        <target>## Vergangenheit</target>
-        <note>copied message info</note>
-      </trans-unit>
-      <trans-unit id="## In reply to" xml:space="preserve">
-        <source>## In reply to</source>
-        <target>## Als Antwort auf</target>
-        <note>copied message info</note>
-      </trans-unit>
       <trans-unit id="#secret#" xml:space="preserve">
         <source>#secret#</source>
         <target>#geheim#</target>
@@ -87,11 +72,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@ connected" xml:space="preserve">
-        <source>%@ and %@ connected</source>
-        <target>%@ und %@ wurden verbunden</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ at %@:" xml:space="preserve">
         <source>%1$@ at %2$@:</source>
         <target>%1$@ an %2$@:</target>
@@ -122,11 +102,6 @@
         <target>%@ will sich mit Ihnen verbinden!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
-        <source>%@, %@ and %lld other members connected</source>
-        <target>%@, %@ und %lld weitere Mitglieder wurden verbunden</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@:" xml:space="preserve">
         <source>%@:</source>
         <target>%@:</target>
@@ -197,10 +172,6 @@
         <target>%lld Minuten</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld new interface languages" xml:space="preserve">
-        <source>%lld new interface languages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld second(s)" xml:space="preserve">
         <source>%lld second(s)</source>
         <target>%lld Sekunde(n)</target>
@@ -331,12 +302,6 @@
         <target>, </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
-        <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>
-        <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">
         <source>- more stable message delivery.
 - a bit better groups.
@@ -432,9 +397,14 @@
         <target>Ein neuer Kontakt</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="A new random profile will be shared." xml:space="preserve">
-        <source>A new random profile will be shared.</source>
-        <target>Es wird ein neues Zufallsprofil geteilt.</target>
+      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
+        <source>A random profile will be sent to the contact that you received this link from</source>
+        <target>Ein zufälliges Profil wird an den Kontakt gesendet, von dem Sie diesen Link erhalten haben</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
+        <source>A random profile will be sent to your contact</source>
+        <target>Ein zufälliges Profil wird an Ihren Kontakt gesendet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -490,9 +460,9 @@
         <note>accept contact request via notification
    accept incoming call via notification</note>
       </trans-unit>
-      <trans-unit id="Accept connection request?" xml:space="preserve">
-        <source>Accept connection request?</source>
-        <target>Kontaktanfrage annehmen?</target>
+      <trans-unit id="Accept contact" xml:space="preserve">
+        <source>Accept contact</source>
+        <target>Kontakt annehmen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -503,7 +473,7 @@
       <trans-unit id="Accept incognito" xml:space="preserve">
         <source>Accept incognito</source>
         <target>Inkognito akzeptieren</target>
-        <note>accept contact request via notification</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
         <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -572,7 +542,7 @@
       </trans-unit>
       <trans-unit id="All data is erased when it is entered." xml:space="preserve">
         <source>All data is erased when it is entered.</source>
-        <target>Alle Daten werden gelöscht, sobald dieser eingegeben wird.</target>
+        <target>Alle Daten werden gelöscht, sobald diese eingegeben wird.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All group members will remain connected." xml:space="preserve">
@@ -602,12 +572,12 @@
       </trans-unit>
       <trans-unit id="Allow calls only if your contact allows them." xml:space="preserve">
         <source>Allow calls only if your contact allows them.</source>
-        <target>Erlauben Sie Anrufe nur dann, wenn es Ihr Kontakt ebenfalls erlaubt.</target>
+        <target>Anrufe sind nur erlaubt, wenn Ihr Kontakt das ebenfalls erlaubt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow disappearing messages only if your contact allows it to you." xml:space="preserve">
         <source>Allow disappearing messages only if your contact allows it to you.</source>
-        <target>Erlauben Sie verschwindende Nachrichten nur dann, wenn es Ihnen Ihr Kontakt ebenfalls erlaubt.</target>
+        <target>Verschwindende Nachrichten nur erlauben, wenn Ihr Kontakt das ebenfalls erlaubt.</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">
@@ -617,7 +587,7 @@
       </trans-unit>
       <trans-unit id="Allow message reactions only if your contact allows them." xml:space="preserve">
         <source>Allow message reactions only if your contact allows them.</source>
-        <target>Erlauben Sie Reaktionen auf Nachrichten nur dann, wenn es Ihr Kontakt ebenfalls erlaubt.</target>
+        <target>Reaktionen auf Nachrichten sind nur möglich, falls Ihr Kontakt dies erlaubt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow message reactions." xml:space="preserve">
@@ -652,7 +622,7 @@
       </trans-unit>
       <trans-unit id="Allow voice messages only if your contact allows them." xml:space="preserve">
         <source>Allow voice messages only if your contact allows them.</source>
-        <target>Erlauben Sie Sprachnachrichten nur dann, wenn es Ihr Kontakt ebenfalls erlaubt.</target>
+        <target>Erlauben Sie Sprachnachrichten nur dann, wenn Ihr Kontakt diese ebenfalls erlaubt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Allow voice messages?" xml:space="preserve">
@@ -710,13 +680,9 @@
         <target>App Build: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve">
-        <source>App encrypts new local files (except videos).</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
-        <target>App-Icon</target>
+        <target>App Icon</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="App passcode" xml:space="preserve">
@@ -761,12 +727,12 @@
       </trans-unit>
       <trans-unit id="Audio/video calls" xml:space="preserve">
         <source>Audio/video calls</source>
-        <target>Audio-/Video-Anrufe</target>
+        <target>Audio/Video Anrufe</target>
         <note>chat feature</note>
       </trans-unit>
       <trans-unit id="Audio/video calls are prohibited." xml:space="preserve">
         <source>Audio/video calls are prohibited.</source>
-        <target>Audio-/Video-Anrufe sind nicht erlaubt.</target>
+        <target>Audio/Video Anrufe sind nicht erlaubt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Authentication cancelled" xml:space="preserve">
@@ -849,10 +815,6 @@
         <target>Sowohl Ihr Kontakt, als auch Sie können Sprachnachrichten senden.</target>
         <note>No comment provided by engineer.</note>
       </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>
-        <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">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>Per Chat-Profil (Voreinstellung) oder [per Verbindung](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -986,7 +948,7 @@
       </trans-unit>
       <trans-unit id="Chat preferences" xml:space="preserve">
         <source>Chat preferences</source>
-        <target>Chat-Präferenzen</target>
+        <target>Chat Präferenzen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
@@ -1084,19 +1046,9 @@
         <target>Verbinden</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Connect directly" xml:space="preserve">
-        <source>Connect directly</source>
-        <target>Direkt verbinden</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect incognito" xml:space="preserve">
-        <source>Connect incognito</source>
-        <target>Inkognito verbinden</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact link" xml:space="preserve">
-        <source>Connect via contact link</source>
-        <target>Über den Kontakt-Link verbinden</target>
+      <trans-unit id="Connect via contact link?" xml:space="preserve">
+        <source>Connect via contact link?</source>
+        <target>Über den Kontakt-Link verbinden?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1114,9 +1066,9 @@
         <target>Über einen Link / QR-Code verbinden</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>Über einen Einmal-Link verbinden</target>
+      <trans-unit id="Connect via one-time link?" xml:space="preserve">
+        <source>Connect via one-time link?</source>
+        <target>Über einen Einmal-Link verbinden?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1144,6 +1096,11 @@
         <target>Verbindungsfehler (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection request" xml:space="preserve">
+        <source>Connection request</source>
+        <target>Verbindungsanfrage</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection request sent!" xml:space="preserve">
         <source>Connection request sent!</source>
         <target>Verbindungsanfrage wurde gesendet!</target>
@@ -1191,7 +1148,7 @@
       </trans-unit>
       <trans-unit id="Contact preferences" xml:space="preserve">
         <source>Contact preferences</source>
-        <target>Kontakt-Präferenzen</target>
+        <target>Kontakt Präferenzen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Contacts" xml:space="preserve">
@@ -1249,13 +1206,9 @@
         <target>Link erzeugen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
-        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
-        <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>Einmal-Einladungslink erstellen</target>
+        <target>Erstellen Sie einen einmaligen Einladungslink</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
@@ -1596,19 +1549,14 @@
         <target>Gelöscht um: %@</target>
         <note>copied message info</note>
       </trans-unit>
-      <trans-unit id="Delivery" xml:space="preserve">
-        <source>Delivery</source>
-        <target>Zustellung</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>Empfangsbestätigungen sind deaktiviert!</target>
+        <target>Zustellungs-Quittierungen sind deaktiviert!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delivery receipts!" xml:space="preserve">
         <source>Delivery receipts!</source>
-        <target>Empfangsbestätigungen!</target>
+        <target>Zustellungs-Quittierungen!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Description" xml:space="preserve">
@@ -1633,12 +1581,12 @@
       </trans-unit>
       <trans-unit id="Device authentication is disabled. Turning off SimpleX Lock." xml:space="preserve">
         <source>Device authentication is disabled. Turning off SimpleX Lock.</source>
-        <target>Die Geräteauthentifizierung ist deaktiviert. SimpleX-Sperre ist abgeschaltet.</target>
+        <target>Die Geräteauthentifizierung ist deaktiviert. SimpleX Sperre ist abgeschaltet.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication." xml:space="preserve">
         <source>Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication.</source>
-        <target>Die Geräteauthentifizierung ist deaktiviert. Sie können die SimpleX-Sperre über die Einstellungen aktivieren, sobald Sie die Geräteauthentifizierung aktiviert haben.</target>
+        <target>Die Geräteauthentifizierung ist deaktiviert. Sie können die SimpleX Sperre über die Einstellungen aktivieren, sobald Sie die Geräteauthentifizierung aktiviert haben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Different names, avatars and transport isolation." xml:space="preserve">
@@ -1663,7 +1611,7 @@
       </trans-unit>
       <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
         <source>Disable SimpleX Lock</source>
-        <target>SimpleX-Sperre deaktivieren</target>
+        <target>SimpleX Sperre deaktivieren</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Disable for all" xml:space="preserve">
@@ -1706,10 +1654,6 @@
         <target>Trennen</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Discover and join groups" xml:space="preserve">
-        <source>Discover and join groups</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Display name" xml:space="preserve">
         <source>Display name</source>
         <target>Angezeigter Name</target>
@@ -1787,7 +1731,7 @@
       </trans-unit>
       <trans-unit id="Enable SimpleX Lock" xml:space="preserve">
         <source>Enable SimpleX Lock</source>
-        <target>SimpleX-Sperre aktivieren</target>
+        <target>SimpleX Sperre aktivieren</target>
         <note>authentication reason</note>
       </trans-unit>
       <trans-unit id="Enable TCP keep-alive" xml:space="preserve">
@@ -1845,15 +1789,6 @@
         <target>Datenbank verschlüsseln?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Encrypt local files" xml:space="preserve">
-        <source>Encrypt local files</source>
-        <target>Lokale Dateien verschlüsseln</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve">
-        <source>Encrypt stored files &amp; media</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Encrypted database" xml:space="preserve">
         <source>Encrypted database</source>
         <target>Verschlüsselte Datenbank</target>
@@ -1979,20 +1914,11 @@
         <target>Fehler beim Erzeugen des Gruppen-Links</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error creating member contact" xml:space="preserve">
-        <source>Error creating member contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
         <source>Error creating profile!</source>
         <target>Fehler beim Erstellen des Profils!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error decrypting file" xml:space="preserve">
-        <source>Error decrypting file</source>
-        <target>Fehler beim Entschlüsseln der Datei</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error deleting chat database" xml:space="preserve">
         <source>Error deleting chat database</source>
         <target>Fehler beim Löschen der Chat-Datenbank</target>
@@ -2035,7 +1961,7 @@
       </trans-unit>
       <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
         <source>Error enabling delivery receipts!</source>
-        <target>Fehler beim Aktivieren von Empfangsbestätigungen!</target>
+        <target>Fehler beim Aktivieren der Empfangsbestätigungen!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error enabling notifications" xml:space="preserve">
@@ -2113,10 +2039,6 @@
         <target>Fehler beim Senden der eMail</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error sending member contact invitation" xml:space="preserve">
-        <source>Error sending member contact invitation</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
         <source>Error sending message</source>
         <target>Fehler beim Senden der Nachricht</target>
@@ -2124,7 +2046,7 @@
       </trans-unit>
       <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
         <source>Error setting delivery receipts!</source>
-        <target>Fehler beim Setzen von Empfangsbestätigungen!</target>
+        <target>Fehler beim Setzen der Empfangsbestätigungen!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error starting chat" xml:space="preserve">
@@ -2389,7 +2311,7 @@
       </trans-unit>
       <trans-unit id="Group invitation is no longer valid, it was removed by sender." xml:space="preserve">
         <source>Group invitation is no longer valid, it was removed by sender.</source>
-        <target>Die Gruppeneinladung ist nicht mehr gültig, da sie vom Absender entfernt wurde.</target>
+        <target>Die Gruppeneinladung ist nicht mehr gültig, sie wurde vom Absender entfernt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group link" xml:space="preserve">
@@ -2444,7 +2366,7 @@
       </trans-unit>
       <trans-unit id="Group preferences" xml:space="preserve">
         <source>Group preferences</source>
-        <target>Gruppen-Präferenzen</target>
+        <target>Gruppenpräferenzen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group profile" xml:space="preserve">
@@ -2515,7 +2437,7 @@
       <trans-unit id="History" xml:space="preserve">
         <source>History</source>
         <target>Vergangenheit</target>
-        <note>No comment provided by engineer.</note>
+        <note>copied message info</note>
       </trans-unit>
       <trans-unit id="How SimpleX works" xml:space="preserve">
         <source>How SimpleX works</source>
@@ -2625,7 +2547,7 @@
       <trans-unit id="In reply to" xml:space="preserve">
         <source>In reply to</source>
         <target>Als Antwort auf</target>
-        <note>No comment provided by engineer.</note>
+        <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
@@ -2634,12 +2556,17 @@
       </trans-unit>
       <trans-unit id="Incognito mode" xml:space="preserve">
         <source>Incognito mode</source>
-        <target>Inkognito-Modus</target>
+        <target>Inkognito Modus</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
-        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
-        <target>Der Inkognito-Modus schützt Ihre Privatsphäre, indem für jeden Kontakt ein neues Zufallsprofil erstellt wird.</target>
+      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
+        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
+        <target>Der Inkognito-Modus wird hier nicht unterstützt - Ihr Hauptprofil wird an die Gruppenmitglieder gesendet</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
+        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
+        <target>Der Inkognito-Modus schützt die Privatsphäre Ihres Hauptprofilnamens und -bildes – für jeden neuen Kontakt wird ein neues Zufallsprofil erstellt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2714,11 +2641,6 @@
         <target>Ungültige Serveradresse!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid status" xml:space="preserve">
-        <source>Invalid status</source>
-        <target>Ungültiger Status</target>
-        <note>item status text</note>
-      </trans-unit>
       <trans-unit id="Invitation expired!" xml:space="preserve">
         <source>Invitation expired!</source>
         <target>Einladung abgelaufen!</target>
@@ -2978,7 +2900,7 @@
       <trans-unit id="Message delivery error" xml:space="preserve">
         <source>Message delivery error</source>
         <target>Fehler bei der Nachrichtenzustellung</target>
-        <note>item status text</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message delivery receipts!" xml:space="preserve">
         <source>Message delivery receipts!</source>
@@ -3065,11 +2987,6 @@
         <target>Weitere Verbesserungen sind bald verfügbar!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
-        <source>Most likely this connection is deleted.</source>
-        <target>Wahrscheinlich ist diese Verbindung gelöscht worden.</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
         <source>Most likely this contact has deleted the connection with you.</source>
         <target>Dieser Kontakt hat sehr wahrscheinlich die Verbindung mit Ihnen gelöscht.</target>
@@ -3130,10 +3047,6 @@
         <target>Neues Datenbankarchiv</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New desktop app!" xml:space="preserve">
-        <source>New desktop app!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New display name" xml:space="preserve">
         <source>New display name</source>
         <target>Neuer Anzeigename</target>
@@ -3179,11 +3092,6 @@
         <target>Keine Kontakte zum Hinzufügen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No delivery information" xml:space="preserve">
-        <source>No delivery information</source>
-        <target>Keine Information über die Zustellung</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No device token!" xml:space="preserve">
         <source>No device token!</source>
         <target>Kein Geräte-Token!</target>
@@ -3285,7 +3193,7 @@
       </trans-unit>
       <trans-unit id="Only group owners can change group preferences." xml:space="preserve">
         <source>Only group owners can change group preferences.</source>
-        <target>Gruppen-Präferenzen können nur von Gruppen-Eigentümern geändert werden.</target>
+        <target>Gruppenpräferenzen können nur von Gruppen-Eigentümern geändert werden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only group owners can enable files and media." xml:space="preserve">
@@ -3348,10 +3256,6 @@
         <target>Nur Ihr Kontakt kann Sprachnachrichten versenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Open" xml:space="preserve">
-        <source>Open</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
         <target>Geräte-Einstellungen öffnen</target>
@@ -3389,7 +3293,7 @@
       </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
-        <target>PING-Zähler</target>
+        <target>PING Zähler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="PING interval" xml:space="preserve">
@@ -3442,10 +3346,10 @@
         <target>Fügen Sie den erhaltenen Link ein</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>
+      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received into the box below to connect with your contact.</source>
         <target>Um sich mit Ihrem Kontakt zu verbinden, fügen Sie den erhaltenen Link in das Feld unten ein.</target>
-        <note>placeholder</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
         <source>People can connect to you only via the links you share.</source>
@@ -3589,7 +3493,7 @@
       </trans-unit>
       <trans-unit id="Prohibit audio/video calls." xml:space="preserve">
         <source>Prohibit audio/video calls.</source>
-        <target>Audio-/Video-Anrufe nicht erlauben.</target>
+        <target>Audio/Video Anrufe nicht erlauben.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Prohibit irreversible message deletion." xml:space="preserve">
@@ -3692,11 +3596,6 @@
         <target>Erfahren Sie in unserem [GitHub-Repository](https://github.com/simplex-chat/simplex-chat#readme) mehr dazu.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receipts are disabled" xml:space="preserve">
-        <source>Receipts are disabled</source>
-        <target>Bestätigungen sind deaktiviert</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Received at" xml:space="preserve">
         <source>Received at</source>
         <target>Empfangen um</target>
@@ -3767,8 +3666,8 @@
         <target>Ablehnen</target>
         <note>reject incoming call via notification</note>
       </trans-unit>
-      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
-        <source>Reject (sender NOT notified)</source>
+      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
+        <source>Reject contact (sender NOT notified)</source>
         <target>Kontakt ablehnen (der Absender wird NICHT benachrichtigt)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -4079,7 +3978,7 @@
       </trans-unit>
       <trans-unit id="Send delivery receipts to" xml:space="preserve">
         <source>Send delivery receipts to</source>
-        <target>Empfangsbestätigungen senden an</target>
+        <target>Zustellungs-Quittierungen versenden an</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send direct message" xml:space="preserve">
@@ -4087,10 +3986,6 @@
         <target>Direktnachricht senden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Send direct message to connect" xml:space="preserve">
-        <source>Send direct message to connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
         <source>Send disappearing message</source>
         <target>Verschwindende Nachricht senden</target>
@@ -4123,7 +4018,7 @@
       </trans-unit>
       <trans-unit id="Send receipts" xml:space="preserve">
         <source>Send receipts</source>
-        <target>Bestätigungen senden</target>
+        <target>Quittierungen versenden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
@@ -4158,22 +4053,12 @@
       </trans-unit>
       <trans-unit id="Sending receipts is disabled for %lld contacts" xml:space="preserve">
         <source>Sending receipts is disabled for %lld contacts</source>
-        <target>Sendebestätigungen sind für %lld Kontakte deaktiviert</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
-        <source>Sending receipts is disabled for %lld groups</source>
-        <target>Sendebestätigungen sind für %lld Gruppen deaktiviert</target>
+        <target>Das Senden von Empfangsbestätigungen an %lld Kontakte ist deaktiviert</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
         <source>Sending receipts is enabled for %lld contacts</source>
-        <target>Sendebestätigungen sind für %lld Kontakte aktiviert</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
-        <source>Sending receipts is enabled for %lld groups</source>
-        <target>Sendebestätigungen sind für %lld Gruppen aktiviert</target>
+        <target>Das Senden von Empfangsbestätigungen an %lld Kontakte ist aktiviert</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending via" xml:space="preserve">
@@ -4238,7 +4123,7 @@
       </trans-unit>
       <trans-unit id="Set group preferences" xml:space="preserve">
         <source>Set group preferences</source>
-        <target>Gruppen-Präferenzen einstellen</target>
+        <target>Gruppenpräferenzen einstellen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set it instead of system authentication." xml:space="preserve">
@@ -4316,11 +4201,6 @@
         <target>Entwickleroptionen anzeigen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Show last messages" xml:space="preserve">
-        <source>Show last messages</source>
-        <target>Letzte Nachrichten anzeigen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Vorschau anzeigen</target>
@@ -4343,7 +4223,7 @@
       </trans-unit>
       <trans-unit id="SimpleX Lock" xml:space="preserve">
         <source>SimpleX Lock</source>
-        <target>SimpleX-Sperre</target>
+        <target>SimpleX Sperre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX Lock mode" xml:space="preserve">
@@ -4353,12 +4233,12 @@
       </trans-unit>
       <trans-unit id="SimpleX Lock not enabled!" xml:space="preserve">
         <source>SimpleX Lock not enabled!</source>
-        <target>SimpleX-Sperre ist nicht aktiviert!</target>
+        <target>SimpleX Sperre ist nicht aktiviert!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX Lock turned on" xml:space="preserve">
         <source>SimpleX Lock turned on</source>
-        <target>SimpleX-Sperre aktiviert</target>
+        <target>SimpleX Sperre aktiviert</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="SimpleX address" xml:space="preserve">
@@ -4368,7 +4248,7 @@
       </trans-unit>
       <trans-unit id="SimpleX contact address" xml:space="preserve">
         <source>SimpleX contact address</source>
-        <target>SimpleX-Kontaktadressen-Link</target>
+        <target>SimpleX Kontaktadressen-Link</target>
         <note>simplex link type</note>
       </trans-unit>
       <trans-unit id="SimpleX encrypted message or connection event" xml:space="preserve">
@@ -4388,13 +4268,9 @@
       </trans-unit>
       <trans-unit id="SimpleX one-time invitation" xml:space="preserve">
         <source>SimpleX one-time invitation</source>
-        <target>SimpleX-Einmal-Einladung</target>
+        <target>SimpleX Einmal-Link</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="Simplified incognito mode" xml:space="preserve">
-        <source>Simplified incognito mode</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
         <source>Skip</source>
         <target>Überspringen</target>
@@ -4405,11 +4281,6 @@
         <target>Übersprungene Nachrichten</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Small groups (max 20)" xml:space="preserve">
-        <source>Small groups (max 20)</source>
-        <target>Kleine Gruppen (max. 20)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Während des Imports sind einige nicht schwerwiegende Fehler aufgetreten - in der Chat-Konsole finden Sie weitere Einzelheiten.</target>
@@ -4669,7 +4540,7 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
       </trans-unit>
       <trans-unit id="The second tick we missed! ✅" xml:space="preserve">
         <source>The second tick we missed! ✅</source>
-        <target>Wir haben das zweite Häkchen vermisst! ✅</target>
+        <target>Das zweite Häkchen, welches wir vermisst haben! ✅</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The sender will NOT be notified" xml:space="preserve">
@@ -4702,9 +4573,9 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
         <target>Diese Einstellungen betreffen Ihr aktuelles Profil **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
-        <source>They can be overridden in contact and group settings.</source>
-        <target>Sie können in den Kontakteinstellungen überschrieben werden.</target>
+      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
+        <source>They can be overridden in contact settings</source>
+        <target>Diese können in den Kontakteinstellungen überschrieben werden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4722,11 +4593,6 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
         <target>Diese Aktion kann nicht rückgängig gemacht werden! Ihr Profil und Ihre Kontakte, Nachrichten und Dateien gehen unwiderruflich verloren.</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>Es werden keine Empfangsbestätigungen gesendet, da diese Gruppe über %lld Mitglieder hat.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group no longer exists." xml:space="preserve">
         <source>This group no longer exists.</source>
         <target>Diese Gruppe existiert nicht mehr.</target>
@@ -4747,6 +4613,11 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
         <target>Um eine Verbindung herzustellen, kann Ihr Kontakt den QR-Code scannen oder den Link in der App verwenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
+        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
+        <target>Um das für eine Inkognito-Verbindung verwendete Profil zu finden, tippen Sie oben im Chat auf den Kontakt- oder Gruppennamen.</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>Um eine Verbindung mit einem neuen Kontakt zu erstellen</target>
@@ -4765,7 +4636,7 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
       <trans-unit id="To protect your information, turn on SimpleX Lock.&#10;You will be prompted to complete authentication before this feature is enabled." xml:space="preserve">
         <source>To protect your information, turn on SimpleX Lock.
 You will be prompted to complete authentication before this feature is enabled.</source>
-        <target>Um Ihre Informationen zu schützen, schalten Sie die SimpleX-Sperre ein.
+        <target>Um Ihre Informationen zu schützen, schalten Sie die SimpleX Sperre ein.
 Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funktion aktiviert wird.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -4789,10 +4660,6 @@ Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funkt
         <target>Um die Ende-zu-Ende-Verschlüsselung mit Ihrem Kontakt zu überprüfen, müssen Sie den Sicherheitscode in Ihren Apps vergleichen oder scannen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
-        <source>Toggle incognito when connecting.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Transport isolation" xml:space="preserve">
         <source>Transport isolation</source>
         <target>Transport-Isolation</target>
@@ -4831,7 +4698,7 @@ Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funkt
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Unerwarteter Fehler: %@</target>
-        <note>item status description</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
@@ -4962,7 +4829,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
-        <target>Verwenden Sie SimpleX-Chat-Server?</target>
+        <target>Verwenden Sie SimpleX Chat Server?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use chat" xml:space="preserve">
@@ -4970,11 +4837,6 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Verwenden Sie Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use current profile" xml:space="preserve">
-        <source>Use current profile</source>
-        <target>Nutzen Sie das aktuelle Profil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve">
         <source>Use for new connections</source>
         <target>Für neue Verbindungen nutzen</target>
@@ -4985,11 +4847,6 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>iOS Anrufschnittstelle nutzen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use new incognito profile" xml:space="preserve">
-        <source>Use new incognito profile</source>
-        <target>Nutzen Sie das neue Inkognito-Profil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Server nutzen</target>
@@ -5007,7 +4864,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
-        <target>Verwendung von SimpleX-Chat-Servern.</target>
+        <target>Verwende SimpleX Chat Server.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
@@ -5247,7 +5104,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </trans-unit>
       <trans-unit id="You can turn on SimpleX Lock via Settings." xml:space="preserve">
         <source>You can turn on SimpleX Lock via Settings.</source>
-        <target>Sie können die SimpleX-Sperre über die Einstellungen aktivieren.</target>
+        <target>Sie können die SimpleX Sperre über die Einstellungen aktivieren.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can use markdown to format messages:" xml:space="preserve">
@@ -5280,8 +5137,8 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Sie müssen das Passwort jedes Mal eingeben, wenn die App startet. Es wird nicht auf dem Gerät gespeichert.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You invited a contact" xml:space="preserve">
-        <source>You invited a contact</source>
+      <trans-unit id="You invited your contact" xml:space="preserve">
+        <source>You invited your contact</source>
         <target>Sie haben Ihren Kontakt eingeladen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -5410,6 +5267,11 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Ihr Chat-Profil wird an Gruppenmitglieder gesendet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
+        <source>Your chat profile will be sent to your contact</source>
+        <target>Ihr Chat-Profil wird an Ihren Kontakt gesendet</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Meine Chat-Profile</target>
@@ -5464,11 +5326,6 @@ Sie können es in den Einstellungen ändern.</target>
         <target>Meine Privatsphäre</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
-        <source>Your profile **%@** will be shared.</source>
-        <target>Ihr Profil **%@** wird geteilt.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5476,6 +5333,11 @@ SimpleX servers cannot see your profile.</source>
 SimpleX-Server können Ihr Profil nicht einsehen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
+        <source>Your profile will be sent to the contact that you received this link from</source>
+        <target>Ihr Profil wird an den Kontakt gesendet, von dem Sie diesen Link erhalten haben</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
         <source>Your profile, contacts and delivered messages are stored on your device.</source>
         <target>Ihr Profil, Ihre Kontakte und zugestellten Nachrichten werden auf Ihrem Gerät gespeichert.</target>
@@ -5633,7 +5495,7 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
       </trans-unit>
       <trans-unit id="connect to SimpleX Chat developers." xml:space="preserve">
         <source>connect to SimpleX Chat developers.</source>
-        <target>Mit den SimpleX Chat-Entwicklern verbinden.</target>
+        <target>Mit den SimpleX Chat Entwicklern verbinden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="connected" xml:space="preserve">
@@ -5641,10 +5503,6 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
         <target>Verbunden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="connected directly" xml:space="preserve">
-        <source>connected directly</source>
-        <note>rcv group event chat item</note>
-      </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
         <source>connecting</source>
         <target>verbinde</target>
@@ -5667,7 +5525,7 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
       </trans-unit>
       <trans-unit id="connecting (introduction invitation)" xml:space="preserve">
         <source>connecting (introduction invitation)</source>
-        <target>Verbinde (nach einer Einladung)</target>
+        <target>Verbindung (eingeladen)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="connecting call" xml:space="preserve">
@@ -5755,11 +5613,6 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
         <target>direkt</target>
         <note>connection level description</note>
       </trans-unit>
-      <trans-unit id="disabled" xml:space="preserve">
-        <source>disabled</source>
-        <target>deaktiviert</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="duplicate message" xml:space="preserve">
         <source>duplicate message</source>
         <target>Doppelte Nachricht</target>
@@ -5840,11 +5693,6 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
         <target>Fehler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>event happened</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="group deleted" xml:space="preserve">
         <source>group deleted</source>
         <target>Gruppe gelöscht</target>
@@ -6106,10 +5954,6 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
         <target>Sicherheitscode wurde geändert</target>
         <note>chat item text</note>
       </trans-unit>
-      <trans-unit id="send direct message" xml:space="preserve">
-        <source>send direct message</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
         <source>starting…</source>
         <target>Verbindung wird gestartet…</target>
@@ -6254,7 +6098,7 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="de" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6286,7 +6130,7 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="de" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">

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

@@ -0,0 +1 @@
+

apps/ios/SimpleX Localizations/de.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "de",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "14E300c",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "14.3.1"
   },
   "version" : "1.0"
 }

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

@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="&#10;" xml:space="preserve">
@@ -42,21 +42,6 @@
         <target>!1 colored!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="# %@" xml:space="preserve">
-        <source># %@</source>
-        <target># %@</target>
-        <note>copied message info title, # &lt;title&gt;</note>
-      </trans-unit>
-      <trans-unit id="## History" xml:space="preserve">
-        <source>## History</source>
-        <target>## History</target>
-        <note>copied message info</note>
-      </trans-unit>
-      <trans-unit id="## In reply to" xml:space="preserve">
-        <source>## In reply to</source>
-        <target>## In reply to</target>
-        <note>copied message info</note>
-      </trans-unit>
       <trans-unit id="#secret#" xml:space="preserve">
         <source>#secret#</source>
         <target>#secret#</target>
@@ -87,11 +72,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@ connected" xml:space="preserve">
-        <source>%@ and %@ connected</source>
-        <target>%@ and %@ connected</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ at %@:" xml:space="preserve">
         <source>%1$@ at %2$@:</source>
         <target>%1$@ at %2$@:</target>
@@ -122,11 +102,6 @@
         <target>%@ wants to connect!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
-        <source>%@, %@ and %lld other members connected</source>
-        <target>%@, %@ and %lld other members connected</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@:" xml:space="preserve">
         <source>%@:</source>
         <target>%@:</target>
@@ -197,11 +172,6 @@
         <target>%lld minutes</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld new interface languages" xml:space="preserve">
-        <source>%lld new interface languages</source>
-        <target>%lld new interface languages</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld second(s)" xml:space="preserve">
         <source>%lld second(s)</source>
         <target>%lld second(s)</target>
@@ -332,15 +302,6 @@
         <target>, </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
-        <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>- 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.</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">
         <source>- more stable message delivery.
 - a bit better groups.
@@ -436,9 +397,14 @@
         <target>A new contact</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="A new random profile will be shared." xml:space="preserve">
-        <source>A new random profile will be shared.</source>
-        <target>A new random profile will be shared.</target>
+      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
+        <source>A random profile will be sent to the contact that you received this link from</source>
+        <target>A random profile will be sent to the contact that you received this link from</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
+        <source>A random profile will be sent to your contact</source>
+        <target>A random profile will be sent to your contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -494,9 +460,9 @@
         <note>accept contact request via notification
    accept incoming call via notification</note>
       </trans-unit>
-      <trans-unit id="Accept connection request?" xml:space="preserve">
-        <source>Accept connection request?</source>
-        <target>Accept connection request?</target>
+      <trans-unit id="Accept contact" xml:space="preserve">
+        <source>Accept contact</source>
+        <target>Accept contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -507,7 +473,7 @@
       <trans-unit id="Accept incognito" xml:space="preserve">
         <source>Accept incognito</source>
         <target>Accept incognito</target>
-        <note>accept contact request via notification</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
         <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -714,11 +680,6 @@
         <target>App build: %@</target>
         <note>No comment provided by engineer.</note>
       </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>App encrypts new local files (except videos).</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>App icon</target>
@@ -854,11 +815,6 @@
         <target>Both you and your contact can send voice messages.</target>
         <note>No comment provided by engineer.</note>
       </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>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [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">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1090,19 +1046,9 @@
         <target>Connect</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Connect directly" xml:space="preserve">
-        <source>Connect directly</source>
-        <target>Connect directly</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>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact link" xml:space="preserve">
-        <source>Connect via contact link</source>
-        <target>Connect via contact link</target>
+      <trans-unit id="Connect via contact link?" xml:space="preserve">
+        <source>Connect via contact link?</source>
+        <target>Connect via contact link?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1120,9 +1066,9 @@
         <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>
+      <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>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1150,6 +1096,11 @@
         <target>Connection error (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection request" xml:space="preserve">
+        <source>Connection request</source>
+        <target>Connection request</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection request sent!" xml:space="preserve">
         <source>Connection request sent!</source>
         <target>Connection request sent!</target>
@@ -1255,11 +1206,6 @@
         <target>Create link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
-        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
-        <target>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>
@@ -1603,11 +1549,6 @@
         <target>Deleted at: %@</target>
         <note>copied message info</note>
       </trans-unit>
-      <trans-unit id="Delivery" xml:space="preserve">
-        <source>Delivery</source>
-        <target>Delivery</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>
@@ -1713,11 +1654,6 @@
         <target>Disconnect</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Discover and join groups" xml:space="preserve">
-        <source>Discover and join groups</source>
-        <target>Discover and join groups</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Display name" xml:space="preserve">
         <source>Display name</source>
         <target>Display name</target>
@@ -1853,16 +1789,6 @@
         <target>Encrypt database?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Encrypt local files" xml:space="preserve">
-        <source>Encrypt local files</source>
-        <target>Encrypt local files</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve">
-        <source>Encrypt stored files &amp; media</source>
-        <target>Encrypt stored files &amp; media</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Encrypted database" xml:space="preserve">
         <source>Encrypted database</source>
         <target>Encrypted database</target>
@@ -1988,21 +1914,11 @@
         <target>Error creating group link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error creating member contact" xml:space="preserve">
-        <source>Error creating member contact</source>
-        <target>Error creating member contact</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
         <source>Error creating profile!</source>
         <target>Error creating profile!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error decrypting file" xml:space="preserve">
-        <source>Error decrypting file</source>
-        <target>Error decrypting file</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error deleting chat database" xml:space="preserve">
         <source>Error deleting chat database</source>
         <target>Error deleting chat database</target>
@@ -2123,11 +2039,6 @@
         <target>Error sending email</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error sending member contact invitation" xml:space="preserve">
-        <source>Error sending member contact invitation</source>
-        <target>Error sending member contact invitation</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
         <source>Error sending message</source>
         <target>Error sending message</target>
@@ -2526,7 +2437,7 @@
       <trans-unit id="History" xml:space="preserve">
         <source>History</source>
         <target>History</target>
-        <note>No comment provided by engineer.</note>
+        <note>copied message info</note>
       </trans-unit>
       <trans-unit id="How SimpleX works" xml:space="preserve">
         <source>How SimpleX works</source>
@@ -2636,7 +2547,7 @@
       <trans-unit id="In reply to" xml:space="preserve">
         <source>In reply to</source>
         <target>In reply to</target>
-        <note>No comment provided by engineer.</note>
+        <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
@@ -2648,9 +2559,14 @@
         <target>Incognito mode</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
-        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
-        <target>Incognito mode protects your privacy by using a new random profile for each contact.</target>
+      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
+        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
+        <target>Incognito mode is not supported here - your main profile will be sent to group members</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
+        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
+        <target>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2725,11 +2641,6 @@
         <target>Invalid server address!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid status" xml:space="preserve">
-        <source>Invalid status</source>
-        <target>Invalid status</target>
-        <note>item status text</note>
-      </trans-unit>
       <trans-unit id="Invitation expired!" xml:space="preserve">
         <source>Invitation expired!</source>
         <target>Invitation expired!</target>
@@ -2989,7 +2900,7 @@
       <trans-unit id="Message delivery error" xml:space="preserve">
         <source>Message delivery error</source>
         <target>Message delivery error</target>
-        <note>item status text</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message delivery receipts!" xml:space="preserve">
         <source>Message delivery receipts!</source>
@@ -3076,11 +2987,6 @@
         <target>More improvements are coming soon!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
-        <source>Most likely this connection is deleted.</source>
-        <target>Most likely this connection is deleted.</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
         <source>Most likely this contact has deleted the connection with you.</source>
         <target>Most likely this contact has deleted the connection with you.</target>
@@ -3141,11 +3047,6 @@
         <target>New database archive</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New desktop app!" xml:space="preserve">
-        <source>New desktop app!</source>
-        <target>New desktop app!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New display name" xml:space="preserve">
         <source>New display name</source>
         <target>New display name</target>
@@ -3191,11 +3092,6 @@
         <target>No contacts to add</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No delivery information" xml:space="preserve">
-        <source>No delivery information</source>
-        <target>No delivery information</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No device token!" xml:space="preserve">
         <source>No device token!</source>
         <target>No device token!</target>
@@ -3360,11 +3256,6 @@
         <target>Only your contact can send voice messages.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Open" xml:space="preserve">
-        <source>Open</source>
-        <target>Open</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
         <target>Open Settings</target>
@@ -3455,10 +3346,10 @@
         <target>Paste received link</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 id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received into the box below to connect with your contact.</source>
+        <target>Paste the link you received into the box below to connect with your contact.</target>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
         <source>People can connect to you only via the links you share.</source>
@@ -3705,11 +3596,6 @@
         <target>Read more in our [GitHub repository](https://github.com/simplex-chat/simplex-chat#readme).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receipts are disabled" xml:space="preserve">
-        <source>Receipts are disabled</source>
-        <target>Receipts are disabled</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Received at" xml:space="preserve">
         <source>Received at</source>
         <target>Received at</target>
@@ -3780,9 +3666,9 @@
         <target>Reject</target>
         <note>reject incoming call via notification</note>
       </trans-unit>
-      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
-        <source>Reject (sender NOT notified)</source>
-        <target>Reject (sender NOT notified)</target>
+      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
+        <source>Reject contact (sender NOT notified)</source>
+        <target>Reject contact (sender NOT notified)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Reject contact request" xml:space="preserve">
@@ -4100,11 +3986,6 @@
         <target>Send direct message</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Send direct message to connect" xml:space="preserve">
-        <source>Send direct message to connect</source>
-        <target>Send direct message to connect</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
         <source>Send disappearing message</source>
         <target>Send disappearing message</target>
@@ -4175,21 +4056,11 @@
         <target>Sending receipts is disabled for %lld contacts</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
-        <source>Sending receipts is disabled for %lld groups</source>
-        <target>Sending receipts is disabled for %lld groups</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
         <source>Sending receipts is enabled for %lld contacts</source>
         <target>Sending receipts is enabled for %lld contacts</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
-        <source>Sending receipts is enabled for %lld groups</source>
-        <target>Sending receipts is enabled for %lld groups</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Sending via" xml:space="preserve">
         <source>Sending via</source>
         <target>Sending via</target>
@@ -4330,11 +4201,6 @@
         <target>Show developer options</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Show last messages" xml:space="preserve">
-        <source>Show last messages</source>
-        <target>Show last messages</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Show preview</target>
@@ -4405,11 +4271,6 @@
         <target>SimpleX one-time invitation</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="Simplified incognito mode" xml:space="preserve">
-        <source>Simplified incognito mode</source>
-        <target>Simplified incognito mode</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
         <source>Skip</source>
         <target>Skip</target>
@@ -4420,11 +4281,6 @@
         <target>Skipped messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Small groups (max 20)" xml:space="preserve">
-        <source>Small groups (max 20)</source>
-        <target>Small groups (max 20)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Some non-fatal errors occurred during import - you may see Chat console for more details.</target>
@@ -4717,9 +4573,9 @@ It can happen because of some bug or when the connection is compromised.</target
         <target>These settings are for your current profile **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
-        <source>They can be overridden in contact and group settings.</source>
-        <target>They can be overridden in contact and group settings.</target>
+      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
+        <source>They can be overridden in contact settings</source>
+        <target>They can be overridden in contact settings</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4737,11 +4593,6 @@ It can happen because of some bug or when the connection is compromised.</target
         <target>This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.</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>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group no longer exists." xml:space="preserve">
         <source>This group no longer exists.</source>
         <target>This group no longer exists.</target>
@@ -4762,6 +4613,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 find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
+        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
+        <target>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</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>
@@ -4804,11 +4660,6 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>To verify end-to-end encryption with your contact compare (or scan) the code on your devices.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
-        <source>Toggle incognito when connecting.</source>
-        <target>Toggle incognito when connecting.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Transport isolation" xml:space="preserve">
         <source>Transport isolation</source>
         <target>Transport isolation</target>
@@ -4847,7 +4698,7 @@ You will be prompted to complete authentication before this feature is enabled.<
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Unexpected error: %@</target>
-        <note>item status description</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
@@ -4986,11 +4837,6 @@ To connect, please ask your contact to create another connection link and check
         <target>Use chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use current profile" xml:space="preserve">
-        <source>Use current profile</source>
-        <target>Use current profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve">
         <source>Use for new connections</source>
         <target>Use for new connections</target>
@@ -5001,11 +4847,6 @@ To connect, please ask your contact to create another connection link and check
         <target>Use iOS call interface</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use new incognito profile" xml:space="preserve">
-        <source>Use new incognito profile</source>
-        <target>Use new incognito profile</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>
@@ -5296,9 +5137,9 @@ To connect, please ask your contact to create another connection link and check
         <target>You have to enter passphrase every time the app starts - it is not stored on the device.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You invited a contact" xml:space="preserve">
-        <source>You invited a contact</source>
-        <target>You invited a contact</target>
+      <trans-unit id="You invited your contact" xml:space="preserve">
+        <source>You invited your contact</source>
+        <target>You invited your contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You joined this group" xml:space="preserve">
@@ -5426,6 +5267,11 @@ To connect, please ask your contact to create another connection link and check
         <target>Your chat profile will be sent to group members</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
+        <source>Your chat profile will be sent to your contact</source>
+        <target>Your chat profile will be sent to your contact</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Your chat profiles</target>
@@ -5480,11 +5326,6 @@ You can change it in Settings.</target>
         <target>Your privacy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
-        <source>Your profile **%@** will be shared.</source>
-        <target>Your profile **%@** will be shared.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5492,6 +5333,11 @@ SimpleX servers cannot see your profile.</source>
 SimpleX servers cannot see your profile.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
+        <source>Your profile will be sent to the contact that you received this link from</source>
+        <target>Your profile will be sent to the contact that you received this link from</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
         <source>Your profile, contacts and delivered messages are stored on your device.</source>
         <target>Your profile, contacts and delivered messages are stored on your device.</target>
@@ -5657,11 +5503,6 @@ SimpleX servers cannot see your profile.</target>
         <target>connected</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="connected directly" xml:space="preserve">
-        <source>connected directly</source>
-        <target>connected directly</target>
-        <note>rcv group event chat item</note>
-      </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
         <source>connecting</source>
         <target>connecting</target>
@@ -5772,11 +5613,6 @@ SimpleX servers cannot see your profile.</target>
         <target>direct</target>
         <note>connection level description</note>
       </trans-unit>
-      <trans-unit id="disabled" xml:space="preserve">
-        <source>disabled</source>
-        <target>disabled</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="duplicate message" xml:space="preserve">
         <source>duplicate message</source>
         <target>duplicate message</target>
@@ -5857,11 +5693,6 @@ SimpleX servers cannot see your profile.</target>
         <target>error</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>event happened</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="group deleted" xml:space="preserve">
         <source>group deleted</source>
         <target>group deleted</target>
@@ -6123,11 +5954,6 @@ SimpleX servers cannot see your profile.</target>
         <target>security code changed</target>
         <note>chat item text</note>
       </trans-unit>
-      <trans-unit id="send direct message" xml:space="preserve">
-        <source>send direct message</source>
-        <target>send direct message</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
         <source>starting…</source>
         <target>starting…</target>
@@ -6272,7 +6098,7 @@ SimpleX servers cannot see your profile.</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6304,7 +6130,7 @@ SimpleX servers cannot see your profile.</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="en" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">

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

@@ -0,0 +1 @@
+

apps/ios/SimpleX Localizations/en.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "en",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "14E300c",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "14.3.1"
   },
   "version" : "1.0"
 }

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

@@ -0,0 +1 @@
+

apps/ios/SimpleX Localizations/es.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "es",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "14E300c",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "14.3.1"
   },
   "version" : "1.0"
 }

apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/Shared/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,15 +0,0 @@
-{
-  "colors" : [
-    {
-      "idiom" : "universal",
-      "locale" : "fi"
-    }
-  ],
-  "properties" : {
-    "localizable" : true
-  },
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/Shared/Assets.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

apps/ios/SimpleX Localizations/fi.xcloc/Source Contents/Shared/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "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"
-  }
-}

apps/ios/SimpleX Localizations/fi.xcloc/Source Contents/Shared/Assets.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

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

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

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

@@ -1,30 +0,0 @@
-/* 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!";
-

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

@@ -1,10 +0,0 @@
-/* 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 - 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";

apps/ios/SimpleX Localizations/fi.xcloc/contents.json

@@ -1,12 +0,0 @@
-{
-  "developmentRegion" : "en",
-  "project" : "SimpleX.xcodeproj",
-  "targetLocale" : "fi",
-  "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
-    "toolID" : "com.apple.dt.xcode",
-    "toolName" : "Xcode",
-    "toolVersion" : "15.0"
-  },
-  "version" : "1.0"
-}

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

@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="fr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="&#10;" xml:space="preserve">
@@ -42,21 +42,6 @@
         <target>!1 coloré!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="# %@" xml:space="preserve">
-        <source># %@</source>
-        <target># %@</target>
-        <note>copied message info title, # &lt;title&gt;</note>
-      </trans-unit>
-      <trans-unit id="## History" xml:space="preserve">
-        <source>## History</source>
-        <target>## Historique</target>
-        <note>copied message info</note>
-      </trans-unit>
-      <trans-unit id="## In reply to" xml:space="preserve">
-        <source>## In reply to</source>
-        <target>## En réponse à</target>
-        <note>copied message info</note>
-      </trans-unit>
       <trans-unit id="#secret#" xml:space="preserve">
         <source>#secret#</source>
         <target>#secret#</target>
@@ -87,11 +72,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@ connected" xml:space="preserve">
-        <source>%@ and %@ connected</source>
-        <target>%@ et %@ sont connecté.es</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ at %@:" xml:space="preserve">
         <source>%1$@ at %2$@:</source>
         <target>%1$@ à %2$@ :</target>
@@ -122,11 +102,6 @@
         <target>%@ veut se connecter !</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
-        <source>%@, %@ and %lld other members connected</source>
-        <target>%@, %@ et %lld autres membres sont connectés</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@:" xml:space="preserve">
         <source>%@:</source>
         <target>%@ :</target>
@@ -197,11 +172,6 @@
         <target>%lld minutes</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld new interface languages" xml:space="preserve">
-        <source>%lld new interface languages</source>
-        <target>%lld nouvelles langues d'interface</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld second(s)" xml:space="preserve">
         <source>%lld second(s)</source>
         <target>%lld seconde·s</target>
@@ -332,15 +302,6 @@
         <target>, </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
-        <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>- connexion au [service d'annuaire](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) !
-- les accusés de réception (jusqu'à 20 membres).
-- plus rapide et plus stable.</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">
         <source>- more stable message delivery.
 - a bit better groups.
@@ -436,9 +397,14 @@
         <target>Un nouveau contact</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="A new random profile will be shared." xml:space="preserve">
-        <source>A new random profile will be shared.</source>
-        <target>Un nouveau profil aléatoire sera partagé.</target>
+      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
+        <source>A random profile will be sent to the contact that you received this link from</source>
+        <target>Un profil aléatoire sera envoyé au contact qui vous a envoyé ce lien</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
+        <source>A random profile will be sent to your contact</source>
+        <target>Un profil aléatoire sera envoyé à votre contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -494,9 +460,9 @@
         <note>accept contact request via notification
    accept incoming call via notification</note>
       </trans-unit>
-      <trans-unit id="Accept connection request?" xml:space="preserve">
-        <source>Accept connection request?</source>
-        <target>Accepter la demande de connexion ?</target>
+      <trans-unit id="Accept contact" xml:space="preserve">
+        <source>Accept contact</source>
+        <target>Accepter le contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -507,7 +473,7 @@
       <trans-unit id="Accept incognito" xml:space="preserve">
         <source>Accept incognito</source>
         <target>Accepter en incognito</target>
-        <note>accept contact request via notification</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
         <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -714,11 +680,6 @@
         <target>Build de l'app : %@</target>
         <note>No comment provided by engineer.</note>
       </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>L'application chiffre les nouveaux fichiers locaux (sauf les vidéos).</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Icône de l'app</target>
@@ -796,7 +757,7 @@
       </trans-unit>
       <trans-unit id="Auto-accept" xml:space="preserve">
         <source>Auto-accept</source>
-        <target>Auto-accepter</target>
+        <target>Auto-acceptation</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Auto-accept contact requests" xml:space="preserve">
@@ -854,11 +815,6 @@
         <target>Vous et votre contact êtes tous deux en mesure d'envoyer des messages vocaux.</target>
         <note>No comment provided by engineer.</note>
       </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>Bulgare, finnois, thaïlandais et ukrainien - grâce aux utilisateurs et à [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">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>Par profil de chat (par défaut) ou [par connexion](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1090,19 +1046,9 @@
         <target>Se connecter</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Connect directly" xml:space="preserve">
-        <source>Connect directly</source>
-        <target>Se connecter directement</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect incognito" xml:space="preserve">
-        <source>Connect incognito</source>
-        <target>Se connecter incognito</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact link" xml:space="preserve">
-        <source>Connect via contact link</source>
-        <target>Se connecter via un lien de contact</target>
+      <trans-unit id="Connect via contact link?" xml:space="preserve">
+        <source>Connect via contact link?</source>
+        <target>Se connecter via le lien du contact ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1120,9 +1066,9 @@
         <target>Se connecter via un lien / code 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>Se connecter via un lien unique</target>
+      <trans-unit id="Connect via one-time link?" xml:space="preserve">
+        <source>Connect via one-time link?</source>
+        <target>Se connecter via un lien unique ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1150,6 +1096,11 @@
         <target>Erreur de connexion (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection request" xml:space="preserve">
+        <source>Connection request</source>
+        <target>Demande de connexion</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection request sent!" xml:space="preserve">
         <source>Connection request sent!</source>
         <target>Demande de connexion envoyée !</target>
@@ -1255,11 +1206,6 @@
         <target>Créer un lien</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
-        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
-        <target>Créer un nouveau profil sur [l'application de bureau](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>Créer un lien d'invitation unique</target>
@@ -1322,7 +1268,7 @@
       </trans-unit>
       <trans-unit id="Database IDs and Transport isolation option." xml:space="preserve">
         <source>Database IDs and Transport isolation option.</source>
-        <target>IDs de base de données et option d'isolement du transport.</target>
+        <target>IDs de base de données et option d'isolation du transport.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database downgrade" xml:space="preserve">
@@ -1603,11 +1549,6 @@
         <target>Supprimé à : %@</target>
         <note>copied message info</note>
       </trans-unit>
-      <trans-unit id="Delivery" xml:space="preserve">
-        <source>Delivery</source>
-        <target>Distribution</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>Les accusés de réception sont désactivés !</target>
@@ -1650,7 +1591,7 @@
       </trans-unit>
       <trans-unit id="Different names, avatars and transport isolation." xml:space="preserve">
         <source>Different names, avatars and transport isolation.</source>
-        <target>Différents noms, avatars et modes d'isolement de transport.</target>
+        <target>Différents noms, avatars et mode d'isolation de transport.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Direct messages" xml:space="preserve">
@@ -1713,11 +1654,6 @@
         <target>Se déconnecter</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Discover and join groups" xml:space="preserve">
-        <source>Discover and join groups</source>
-        <target>Découvrir et rejoindre des groupes</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Display name" xml:space="preserve">
         <source>Display name</source>
         <target>Nom affiché</target>
@@ -1853,16 +1789,6 @@
         <target>Chiffrer la base de données ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Encrypt local files" xml:space="preserve">
-        <source>Encrypt local files</source>
-        <target>Chiffrer les fichiers locaux</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve">
-        <source>Encrypt stored files &amp; media</source>
-        <target>Chiffrement des fichiers et des médias stockés</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Encrypted database" xml:space="preserve">
         <source>Encrypted database</source>
         <target>Base de données chiffrée</target>
@@ -1988,20 +1914,11 @@
         <target>Erreur lors de la création du lien du groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error creating member contact" xml:space="preserve">
-        <source>Error creating member contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
         <source>Error creating profile!</source>
         <target>Erreur lors de la création du profil !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error decrypting file" xml:space="preserve">
-        <source>Error decrypting file</source>
-        <target>Erreur lors du déchiffrement du fichier</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error deleting chat database" xml:space="preserve">
         <source>Error deleting chat database</source>
         <target>Erreur lors de la suppression de la base de données du chat</target>
@@ -2122,10 +2039,6 @@
         <target>Erreur lors de l'envoi de l'e-mail</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error sending member contact invitation" xml:space="preserve">
-        <source>Error sending member contact invitation</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
         <source>Error sending message</source>
         <target>Erreur lors de l'envoi du message</target>
@@ -2524,7 +2437,7 @@
       <trans-unit id="History" xml:space="preserve">
         <source>History</source>
         <target>Historique</target>
-        <note>No comment provided by engineer.</note>
+        <note>copied message info</note>
       </trans-unit>
       <trans-unit id="How SimpleX works" xml:space="preserve">
         <source>How SimpleX works</source>
@@ -2634,7 +2547,7 @@
       <trans-unit id="In reply to" xml:space="preserve">
         <source>In reply to</source>
         <target>En réponse à</target>
-        <note>No comment provided by engineer.</note>
+        <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
@@ -2646,9 +2559,14 @@
         <target>Mode Incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
-        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
-        <target>Le mode incognito protège votre vie privée en utilisant un nouveau profil aléatoire pour chaque contact.</target>
+      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
+        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
+        <target>Le mode Incognito n'est pas supporté ici - votre profil principal sera envoyé aux membres du groupe</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
+        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
+        <target>Le mode Incognito protège la confidentialité de votre profil principal — pour chaque nouveau contact un nouveau profil aléatoire est créé.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2723,11 +2641,6 @@
         <target>Adresse de serveur invalide !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid status" xml:space="preserve">
-        <source>Invalid status</source>
-        <target>Statut invalide</target>
-        <note>item status text</note>
-      </trans-unit>
       <trans-unit id="Invitation expired!" xml:space="preserve">
         <source>Invitation expired!</source>
         <target>Invitation expirée !</target>
@@ -2987,7 +2900,7 @@
       <trans-unit id="Message delivery error" xml:space="preserve">
         <source>Message delivery error</source>
         <target>Erreur de distribution du message</target>
-        <note>item status text</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message delivery receipts!" xml:space="preserve">
         <source>Message delivery receipts!</source>
@@ -3074,11 +2987,6 @@
         <target>Plus d'améliorations à venir !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
-        <source>Most likely this connection is deleted.</source>
-        <target>Connexion probablement supprimée.</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
         <source>Most likely this contact has deleted the connection with you.</source>
         <target>Il est fort probable que ce contact ait supprimé la connexion avec vous.</target>
@@ -3139,11 +3047,6 @@
         <target>Nouvelle archive de base de données</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New desktop app!" xml:space="preserve">
-        <source>New desktop app!</source>
-        <target>Nouvelle application de bureau !</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New display name" xml:space="preserve">
         <source>New display name</source>
         <target>Nouveau nom d'affichage</target>
@@ -3189,11 +3092,6 @@
         <target>Aucun contact à ajouter</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No delivery information" xml:space="preserve">
-        <source>No delivery information</source>
-        <target>Pas d'information sur la distribution</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No device token!" xml:space="preserve">
         <source>No device token!</source>
         <target>Pas de token d'appareil !</target>
@@ -3358,10 +3256,6 @@
         <target>Seul votre contact peut envoyer des messages vocaux.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Open" xml:space="preserve">
-        <source>Open</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
         <target>Ouvrir les Paramètres</target>
@@ -3452,10 +3346,10 @@
         <target>Coller le lien reçu</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>
+      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received into the box below to connect with your contact.</source>
         <target>Collez le lien que vous avez reçu dans le cadre ci-dessous pour vous connecter avec votre contact.</target>
-        <note>placeholder</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
         <source>People can connect to you only via the links you share.</source>
@@ -3702,11 +3596,6 @@
         <target>Pour en savoir plus, consultez notre [dépôt GitHub](https://github.com/simplex-chat/simplex-chat#readme).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receipts are disabled" xml:space="preserve">
-        <source>Receipts are disabled</source>
-        <target>Les accusés de réception sont désactivés</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Received at" xml:space="preserve">
         <source>Received at</source>
         <target>Reçu à</target>
@@ -3777,8 +3666,8 @@
         <target>Rejeter</target>
         <note>reject incoming call via notification</note>
       </trans-unit>
-      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
-        <source>Reject (sender NOT notified)</source>
+      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
+        <source>Reject contact (sender NOT notified)</source>
         <target>Rejeter le contact (l'expéditeur N'en est PAS informé)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -4034,7 +3923,7 @@
       </trans-unit>
       <trans-unit id="Search" xml:space="preserve">
         <source>Search</source>
-        <target>Recherche</target>
+        <target>Chercher</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Secure queue" xml:space="preserve">
@@ -4097,10 +3986,6 @@
         <target>Envoi de message direct</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Send direct message to connect" xml:space="preserve">
-        <source>Send direct message to connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
         <source>Send disappearing message</source>
         <target>Envoyer un message éphémère</target>
@@ -4171,21 +4056,11 @@
         <target>L'envoi d'accusés de réception est désactivé pour %lld contacts</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
-        <source>Sending receipts is disabled for %lld groups</source>
-        <target>L'envoi de reçus est désactivé pour les groupes %lld</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
         <source>Sending receipts is enabled for %lld contacts</source>
         <target>L'envoi d'accusés de réception est activé pour %lld contacts</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
-        <source>Sending receipts is enabled for %lld groups</source>
-        <target>L'envoi de reçus est activé pour les groupes %lld</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Sending via" xml:space="preserve">
         <source>Sending via</source>
         <target>Envoi via</target>
@@ -4326,11 +4201,6 @@
         <target>Afficher les options pour les développeurs</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Show last messages" xml:space="preserve">
-        <source>Show last messages</source>
-        <target>Voir les derniers messages</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Montrer l'aperçu</target>
@@ -4401,11 +4271,6 @@
         <target>Invitation unique SimpleX</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="Simplified incognito mode" xml:space="preserve">
-        <source>Simplified incognito mode</source>
-        <target>Mode incognito simplifié</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
         <source>Skip</source>
         <target>Passer</target>
@@ -4416,11 +4281,6 @@
         <target>Messages manqués</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Small groups (max 20)" xml:space="preserve">
-        <source>Small groups (max 20)</source>
-        <target>Petits groupes (max 20)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Des erreurs non fatales se sont produites lors de l'importation - vous pouvez consulter la console de chat pour plus de détails.</target>
@@ -4548,7 +4408,7 @@
       </trans-unit>
       <trans-unit id="Tap to activate profile." xml:space="preserve">
         <source>Tap to activate profile.</source>
-        <target>Appuyez pour activer un profil.</target>
+        <target>Appuyez pour activer le profil.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Tap to join" xml:space="preserve">
@@ -4713,9 +4573,9 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>Ces paramètres s'appliquent à votre profil actuel **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
-        <source>They can be overridden in contact and group settings.</source>
-        <target>Ils peuvent être modifiés dans les paramètres des contacts et des groupes.</target>
+      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
+        <source>They can be overridden in contact settings</source>
+        <target>Ils peuvent être remplacés dans les paramètres des contacts</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4733,11 +4593,6 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>Cette action ne peut être annulée - votre profil, vos contacts, vos messages et vos fichiers seront irréversiblement perdus.</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>Ce groupe compte plus de %lld membres, les accusés de réception ne sont pas envoyés.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group no longer exists." xml:space="preserve">
         <source>This group no longer exists.</source>
         <target>Ce groupe n'existe plus.</target>
@@ -4758,6 +4613,11 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
         <target>Pour se connecter, votre contact peut scanner le code QR ou utiliser le lien dans l'application.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
+        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
+        <target>Pour trouver le profil utilisé lors d'une connexion incognito, appuyez sur le nom du contact ou du groupe en haut du chat.</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>Pour établir une nouvelle connexion</target>
@@ -4800,14 +4660,9 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
         <target>Pour vérifier le chiffrement de bout en bout avec votre contact, comparez (ou scannez) le code sur vos appareils.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
-        <source>Toggle incognito when connecting.</source>
-        <target>Basculer en mode incognito lors de la connexion.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Transport isolation" xml:space="preserve">
         <source>Transport isolation</source>
-        <target>Transport isolé</target>
+        <target>Isolement du transport</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Trying to connect to the server used to receive messages from this contact (error: %@)." xml:space="preserve">
@@ -4843,7 +4698,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Erreur inattendue : %@</target>
-        <note>item status description</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
@@ -4944,7 +4799,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       </trans-unit>
       <trans-unit id="Update transport isolation mode?" xml:space="preserve">
         <source>Update transport isolation mode?</source>
-        <target>Mettre à jour le mode d'isolement du transport ?</target>
+        <target>Mettre à jour le mode d'isolation du transport ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Updating settings will re-connect the client to all servers." xml:space="preserve">
@@ -4982,11 +4837,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Utiliser le chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use current profile" xml:space="preserve">
-        <source>Use current profile</source>
-        <target>Utiliser le profil actuel</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve">
         <source>Use for new connections</source>
         <target>Utiliser pour les nouvelles connexions</target>
@@ -4997,11 +4847,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Utiliser l'interface d'appel d'iOS</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use new incognito profile" xml:space="preserve">
-        <source>Use new incognito profile</source>
-        <target>Utiliser un nouveau profil incognito</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Utiliser ce serveur</target>
@@ -5292,8 +5137,8 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Vous devez saisir la phrase secrète à chaque fois que l'application démarre - elle n'est pas stockée sur l'appareil.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You invited a contact" xml:space="preserve">
-        <source>You invited a contact</source>
+      <trans-unit id="You invited your contact" xml:space="preserve">
+        <source>You invited your contact</source>
         <target>Vous avez invité votre contact</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -5422,6 +5267,11 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Votre profil de chat sera envoyé aux membres du groupe</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
+        <source>Your chat profile will be sent to your contact</source>
+        <target>Votre profil de chat sera envoyé à votre contact</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>Vos profils de chat</target>
@@ -5476,11 +5326,6 @@ Vous pouvez modifier ce choix dans les Paramètres.</target>
         <target>Votre vie privée</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
-        <source>Your profile **%@** will be shared.</source>
-        <target>Votre profil **%@** sera partagé.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5488,6 +5333,11 @@ SimpleX servers cannot see your profile.</source>
 Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
+        <source>Your profile will be sent to the contact that you received this link from</source>
+        <target>Votre profil sera envoyé au contact qui vous a envoyé ce lien</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
         <source>Your profile, contacts and delivered messages are stored on your device.</source>
         <target>Votre profil, vos contacts et les messages reçus sont stockés sur votre appareil.</target>
@@ -5555,7 +5405,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </trans-unit>
       <trans-unit id="agreeing encryption for %@…" xml:space="preserve">
         <source>agreeing encryption for %@…</source>
-        <target>accord sur le chiffrement pour %@…</target>
+        <target>acceptant le chiffrement pour %@…</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="agreeing encryption…" xml:space="preserve">
@@ -5653,10 +5503,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>connecté</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="connected directly" xml:space="preserve">
-        <source>connected directly</source>
-        <note>rcv group event chat item</note>
-      </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
         <source>connecting</source>
         <target>connexion</target>
@@ -5767,11 +5613,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>direct</target>
         <note>connection level description</note>
       </trans-unit>
-      <trans-unit id="disabled" xml:space="preserve">
-        <source>disabled</source>
-        <target>désactivé</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="duplicate message" xml:space="preserve">
         <source>duplicate message</source>
         <target>message dupliqué</target>
@@ -5809,7 +5650,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
       </trans-unit>
       <trans-unit id="encryption ok" xml:space="preserve">
         <source>encryption ok</source>
-        <target>chiffrement OK</target>
+        <target>chiffrement ok</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="encryption ok for %@" xml:space="preserve">
@@ -5852,11 +5693,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>erreur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>event happened</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="group deleted" xml:space="preserve">
         <source>group deleted</source>
         <target>groupe supprimé</target>
@@ -6118,10 +5954,6 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
         <target>code de sécurité modifié</target>
         <note>chat item text</note>
       </trans-unit>
-      <trans-unit id="send direct message" xml:space="preserve">
-        <source>send direct message</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
         <source>starting…</source>
         <target>lancement…</target>
@@ -6266,7 +6098,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="fr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6298,7 +6130,7 @@ Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="fr" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">

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

@@ -0,0 +1 @@
+

apps/ios/SimpleX Localizations/fr.xcloc/contents.json

@@ -3,10 +3,10 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "fr",
   "toolInfo" : {
-    "toolBuildNumber" : "15A240d",
+    "toolBuildNumber" : "14E300c",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
-    "toolVersion" : "15.0"
+    "toolVersion" : "14.3.1"
   },
   "version" : "1.0"
 }

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

@@ -8,7 +8,7 @@
       <trans-unit id="&#10;" xml:space="preserve" approved="no">
         <source>
 </source>
-        <target state="translated">
+        <target state="needs-translation">
 </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -19,22 +19,22 @@ Available in v5.1</source>
       </trans-unit>
       <trans-unit id=" " xml:space="preserve" approved="no">
         <source> </source>
-        <target state="translated"> </target>
+        <target state="needs-translation"> </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="  " xml:space="preserve" approved="no">
         <source>  </source>
-        <target state="translated">  </target>
+        <target state="needs-translation">  </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="   " xml:space="preserve" approved="no">
         <source>   </source>
-        <target state="translated">   </target>
+        <target state="needs-translation">   </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id=" (" xml:space="preserve" approved="no">
         <source> (</source>
-        <target state="translated"> (</target>
+        <target state="needs-translation"> (</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id=" (can be copied)" xml:space="preserve" approved="no">
@@ -279,12 +279,12 @@ Available in v5.1</source>
       </trans-unit>
       <trans-unit id=", " xml:space="preserve" approved="no">
         <source>, </source>
-        <target state="translated">, </target>
+        <target state="needs-translation">, </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="." xml:space="preserve" approved="no">
         <source>.</source>
-        <target state="translated">.</target>
+        <target state="needs-translation">.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="1 day" xml:space="preserve" approved="no">
@@ -1971,9 +1971,8 @@ Available in v5.1</source>
         <target state="translated">חברי הקבוצה יכולים לשלוח הודעות קוליות.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Group message:" xml:space="preserve" approved="no">
+      <trans-unit id="Group message:" xml:space="preserve">
         <source>Group message:</source>
-        <target state="translated">הודעה קבוצתית:</target>
         <note>notification</note>
       </trans-unit>
       <trans-unit id="Group moderation" xml:space="preserve" approved="no">
@@ -2378,327 +2377,262 @@ Available in v5.1</source>
         <target state="translated">נתוני פרופיל מקומיים בלבד</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Lock after" xml:space="preserve" approved="no">
+      <trans-unit id="Lock after" xml:space="preserve">
         <source>Lock after</source>
-        <target state="translated">נעל אחרי</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Lock mode" xml:space="preserve" approved="no">
+      <trans-unit id="Lock mode" xml:space="preserve">
         <source>Lock mode</source>
-        <target state="translated">מצב נעילה</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Make a private connection" xml:space="preserve" approved="no">
+      <trans-unit id="Make a private connection" xml:space="preserve">
         <source>Make a private connection</source>
-        <target state="translated">צור חיבור פרטי</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Make profile private!" xml:space="preserve" approved="no">
+      <trans-unit id="Make profile private!" xml:space="preserve">
         <source>Make profile private!</source>
-        <target state="translated">הפוך את הפרופיל לפרטי!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@)." xml:space="preserve" approved="no">
+      <trans-unit id="Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@)." xml:space="preserve">
         <source>Make sure %@ server addresses are in correct format, line separated and are not duplicated (%@).</source>
-        <target state="translated">ודא שכתובות השרת %@ הן בפורמט הנכון, מופרדות בשורה ואינן משוכפלות (%@).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." xml:space="preserve" approved="no">
+      <trans-unit id="Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." xml:space="preserve">
         <source>Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated.</source>
-        <target state="translated">ודאו שכתובות שרתי ה־WebRTC ICE הן בפורמט הנכון, מופרדות בשורה ולא משוכפלות.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*" xml:space="preserve" approved="no">
+      <trans-unit id="Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*" xml:space="preserve">
         <source>Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*</source>
-        <target state="translated">אנשים רבים שאלו: *אם ל-SimpleX אין מזהי משתמש, איך הוא יכול לשלוח הודעות?*</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Mark deleted for everyone" xml:space="preserve" approved="no">
+      <trans-unit id="Mark deleted for everyone" xml:space="preserve">
         <source>Mark deleted for everyone</source>
-        <target state="translated">לסמן נמחק לכולם</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Mark read" xml:space="preserve" approved="no">
+      <trans-unit id="Mark read" xml:space="preserve">
         <source>Mark read</source>
-        <target state="translated">סמן כנקרא</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Mark verified" xml:space="preserve" approved="no">
+      <trans-unit id="Mark verified" xml:space="preserve">
         <source>Mark verified</source>
-        <target state="translated">סמן מאומת</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Markdown in messages" xml:space="preserve" approved="no">
+      <trans-unit id="Markdown in messages" xml:space="preserve">
         <source>Markdown in messages</source>
-        <target state="translated">מרקדאון בהודעות</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Max 30 seconds, received instantly." xml:space="preserve" approved="no">
+      <trans-unit id="Max 30 seconds, received instantly." xml:space="preserve">
         <source>Max 30 seconds, received instantly.</source>
-        <target state="translated">מקסימום 30 שניות, התקבל באופן מיידי.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Member" xml:space="preserve" approved="no">
+      <trans-unit id="Member" xml:space="preserve">
         <source>Member</source>
-        <target state="translated">חבר קבוצה</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve" approved="no">
+      <trans-unit id="Member role will be changed to &quot;%@&quot;. All group members will be notified." xml:space="preserve">
         <source>Member role will be changed to "%@". All group members will be notified.</source>
-        <target state="translated">תפקיד חבר הקבוצה ישתנה ל-"%@". כל חברי הקבוצה יקבלו הודעה.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Member role will be changed to &quot;%@&quot;. The member will receive a new invitation." xml:space="preserve" approved="no">
+      <trans-unit id="Member role will be changed to &quot;%@&quot;. The member will receive a new invitation." xml:space="preserve">
         <source>Member role will be changed to "%@". The member will receive a new invitation.</source>
-        <target state="translated">תפקיד חבר הקבוצה ישתנה ל-"%@". חבר הקבוצה יקבל הזמנה חדשה.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve" approved="no">
+      <trans-unit id="Member will be removed from group - this cannot be undone!" xml:space="preserve">
         <source>Member will be removed from group - this cannot be undone!</source>
-        <target state="translated">חבר הקבוצה יוסר מהקבוצה – לא ניתן לבטל זאת!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message delivery error" xml:space="preserve" approved="no">
+      <trans-unit id="Message delivery error" xml:space="preserve">
         <source>Message delivery error</source>
-        <target state="translated">שגיאת מסירת הודעה</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message draft" xml:space="preserve" approved="no">
+      <trans-unit id="Message draft" xml:space="preserve">
         <source>Message draft</source>
-        <target state="translated">טיוטת הודעה</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Message text" xml:space="preserve" approved="no">
+      <trans-unit id="Message text" xml:space="preserve">
         <source>Message text</source>
-        <target state="translated">טקסט הודעה</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages" xml:space="preserve" approved="no">
+      <trans-unit id="Messages" xml:space="preserve">
         <source>Messages</source>
-        <target state="translated">הודעות</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages &amp; files" xml:space="preserve" approved="no">
+      <trans-unit id="Messages &amp; files" xml:space="preserve">
         <source>Messages &amp; files</source>
-        <target state="translated">הודעות וקבצים</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrating database archive..." xml:space="preserve">
         <source>Migrating database archive...</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Migration error:" xml:space="preserve" approved="no">
+      <trans-unit id="Migration error:" xml:space="preserve">
         <source>Migration error:</source>
-        <target state="translated">שגיאת העברה:</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Migration failed. Tap **Skip** below to continue using the current database. Please report the issue to the app developers via chat or email [chat@simplex.chat](mailto:chat@simplex.chat)." xml:space="preserve" approved="no">
+      <trans-unit id="Migration failed. Tap **Skip** below to continue using the current database. Please report the issue to the app developers via chat or email [chat@simplex.chat](mailto:chat@simplex.chat)." xml:space="preserve">
         <source>Migration failed. Tap **Skip** below to continue using the current database. Please report the issue to the app developers via chat or email [chat@simplex.chat](mailto:chat@simplex.chat).</source>
-        <target state="translated">ההעברה נכשלה. הקש על **דלג** למטה כדי להמשיך להשתמש במסד הנתונים הנוכחי. אנא דווח על הבעיה למפתחי האפליקציה באמצעות צ'אט או דוא"ל [chat@simplex.chat](mailto:chat@simplex.chat).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Migration is completed" xml:space="preserve" approved="no">
+      <trans-unit id="Migration is completed" xml:space="preserve">
         <source>Migration is completed</source>
-        <target state="translated">ההעברה הושלמה</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Migrations: %@" xml:space="preserve" approved="no">
+      <trans-unit id="Migrations: %@" xml:space="preserve">
         <source>Migrations: %@</source>
-        <target state="translated">העברות: %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Moderate" xml:space="preserve" approved="no">
+      <trans-unit id="Moderate" xml:space="preserve">
         <source>Moderate</source>
-        <target state="translated">חסימת הודעה</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="More improvements are coming soon!" xml:space="preserve" approved="no">
+      <trans-unit id="More improvements are coming soon!" xml:space="preserve">
         <source>More improvements are coming soon!</source>
-        <target state="translated">שיפורים נוספים יגיעו בקרוב!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve" approved="no">
+      <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
         <source>Most likely this contact has deleted the connection with you.</source>
-        <target state="translated">ככל הנראה איש קשר זה מחק את החיבור איתך.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Multiple chat profiles" xml:space="preserve" approved="no">
+      <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
-        <target state="translated">פרופילי צ׳אט מרובים</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Mute" xml:space="preserve" approved="no">
+      <trans-unit id="Mute" xml:space="preserve">
         <source>Mute</source>
-        <target state="translated">השתק</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Muted when inactive!" xml:space="preserve" approved="no">
+      <trans-unit id="Muted when inactive!" xml:space="preserve">
         <source>Muted when inactive!</source>
-        <target state="translated">מושתק כאשר אין פעילות!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Name" xml:space="preserve" approved="no">
+      <trans-unit id="Name" xml:space="preserve">
         <source>Name</source>
-        <target state="translated">שם</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Network &amp; servers" xml:space="preserve" approved="no">
+      <trans-unit id="Network &amp; servers" xml:space="preserve">
         <source>Network &amp; servers</source>
-        <target state="translated">רשת ושרתים</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Network settings" xml:space="preserve" approved="no">
+      <trans-unit id="Network settings" xml:space="preserve">
         <source>Network settings</source>
-        <target state="translated">הגדרות רשת</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Network status" xml:space="preserve" approved="no">
+      <trans-unit id="Network status" xml:space="preserve">
         <source>Network status</source>
-        <target state="translated">מצב רשת</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New Passcode" xml:space="preserve" approved="no">
+      <trans-unit id="New Passcode" xml:space="preserve">
         <source>New Passcode</source>
-        <target state="translated">קוד גישה חדש</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New contact request" xml:space="preserve" approved="no">
+      <trans-unit id="New contact request" xml:space="preserve">
         <source>New contact request</source>
-        <target state="translated">בקשה חדשה ליצירת קשר</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New contact:" xml:space="preserve" approved="no">
+      <trans-unit id="New contact:" xml:space="preserve">
         <source>New contact:</source>
-        <target state="translated">איש קשר חדש:</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New database archive" xml:space="preserve" approved="no">
+      <trans-unit id="New database archive" xml:space="preserve">
         <source>New database archive</source>
-        <target state="translated">ארכיון מסד נתונים חדש</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New in %@" xml:space="preserve" approved="no">
+      <trans-unit id="New in %@" xml:space="preserve">
         <source>New in %@</source>
-        <target state="translated">חדש ב %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New member role" xml:space="preserve" approved="no">
+      <trans-unit id="New member role" xml:space="preserve">
         <source>New member role</source>
-        <target state="translated">תפקיד חבר קבוצה חדש</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New message" xml:space="preserve" approved="no">
+      <trans-unit id="New message" xml:space="preserve">
         <source>New message</source>
-        <target state="translated">הודעה חדשה</target>
         <note>notification</note>
       </trans-unit>
-      <trans-unit id="New passphrase…" xml:space="preserve" approved="no">
+      <trans-unit id="New passphrase…" xml:space="preserve">
         <source>New passphrase…</source>
-        <target state="translated">סיסמה חדשה…</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No" xml:space="preserve" approved="no">
+      <trans-unit id="No" xml:space="preserve">
         <source>No</source>
-        <target state="translated">לא</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No app password" xml:space="preserve" approved="no">
+      <trans-unit id="No app password" xml:space="preserve">
         <source>No app password</source>
-        <target state="translated">אין סיסמה לאפליקציה</target>
         <note>Authentication unavailable</note>
       </trans-unit>
-      <trans-unit id="No contacts selected" xml:space="preserve" approved="no">
+      <trans-unit id="No contacts selected" xml:space="preserve">
         <source>No contacts selected</source>
-        <target state="translated">לא נבחרו אנשי קשר</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No contacts to add" xml:space="preserve" approved="no">
+      <trans-unit id="No contacts to add" xml:space="preserve">
         <source>No contacts to add</source>
-        <target state="translated">אין אנשי קשר להוסיף</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No device token!" xml:space="preserve" approved="no">
+      <trans-unit id="No device token!" xml:space="preserve">
         <source>No device token!</source>
-        <target state="translated">אין אסימון מכשיר!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No group!" xml:space="preserve" approved="no">
+      <trans-unit id="No group!" xml:space="preserve">
         <source>Group not found!</source>
-        <target state="translated">קבוצה לא נמצאה!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record voice message" xml:space="preserve" approved="no">
+      <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
-        <target state="translated">אין הרשאה להקליט הודעה קולית</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No received or sent files" xml:space="preserve" approved="no">
+      <trans-unit id="No received or sent files" xml:space="preserve">
         <source>No received or sent files</source>
-        <target state="translated">לא התקבלו או נשלחו קבצים</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Notifications" xml:space="preserve" approved="no">
+      <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
-        <target state="translated">התראות</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Notifications are disabled!" xml:space="preserve" approved="no">
+      <trans-unit id="Notifications are disabled!" xml:space="preserve">
         <source>Notifications are disabled!</source>
-        <target state="translated">ההתראות מושבתות!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve" approved="no">
+      <trans-unit id="Now admins can:&#10;- delete members' messages.&#10;- disable members (&quot;observer&quot; role)" xml:space="preserve">
         <source>Now admins can:
 - delete members' messages.
 - disable members ("observer" role)</source>
-        <target state="translated">כעת מנהלים יכולים:
-- למחוק הודעות של חברי קבוצה.
-- להשבית חברי קבוצה (תפקיד ”צופה”)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Off" xml:space="preserve" approved="no">
+      <trans-unit id="Off" xml:space="preserve">
         <source>Off</source>
-        <target state="translated">כבוי</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Off (Local)" xml:space="preserve" approved="no">
+      <trans-unit id="Off (Local)" xml:space="preserve">
         <source>Off (Local)</source>
-        <target state="translated">כבוי (מקומי)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Ok" xml:space="preserve" approved="no">
+      <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
-        <target state="translated">אישור</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Old database" xml:space="preserve" approved="no">
+      <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
-        <target state="translated">מסד נתונים ישן</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Old database archive" xml:space="preserve" approved="no">
+      <trans-unit id="Old database archive" xml:space="preserve">
         <source>Old database archive</source>
-        <target state="translated">ארכיון מסד נתונים ישן</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="One-time invitation link" xml:space="preserve" approved="no">
+      <trans-unit id="One-time invitation link" xml:space="preserve">
         <source>One-time invitation link</source>
-        <target state="translated">קישור הזמנה חד־פעמי</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be required for connection. Requires enabling VPN." xml:space="preserve" approved="no">
+      <trans-unit id="Onion hosts will be required for connection. Requires enabling VPN." xml:space="preserve">
         <source>Onion hosts will be required for connection. Requires enabling VPN.</source>
-        <target state="translated">לחיבור יידרשו מארחי Onion. דורש הפעלת VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve" approved="no">
+      <trans-unit id="Onion hosts will be used when available. Requires enabling VPN." xml:space="preserve">
         <source>Onion hosts will be used when available. Requires enabling VPN.</source>
-        <target state="translated">מארחי Onion ישומשו כאשר יהיו זמינים. דורש הפעלת VPN.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Onion hosts will not be used." xml:space="preserve" approved="no">
+      <trans-unit id="Onion hosts will not be used." xml:space="preserve">
         <source>Onion hosts will not be used.</source>
-        <target state="translated">לא ייעשה שימוש במארחי Onion.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." xml:space="preserve">
@@ -5042,275 +4976,6 @@ SimpleX servers cannot see your profile.</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="# %@" 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="## 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="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve" approved="no">
-        <source>- more stable message delivery.
-- a bit better groups.
-- and more!</source>
-        <target state="translated">- שליחת הודעות יציבה יותר.
-- קבוצות קצת יותר טובות.
-- ועוד!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A few more things" xml:space="preserve" approved="no">
-        <source>A few more things</source>
-        <target state="translated">עוד כמה דברים</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="A new random profile will be shared." xml:space="preserve" approved="no">
-        <source>A new random profile will be shared.</source>
-        <target state="translated">ישותף פרופיל אקראי חדש.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Accept connection request?" xml:space="preserve" approved="no">
-        <source>Accept connection request?</source>
-        <target state="translated">לאשר בקשת חיבור?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect directly" xml:space="preserve" approved="no">
-        <source>Connect directly</source>
-        <target state="translated">התחבר ישירות</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect incognito" xml:space="preserve" approved="no">
-        <source>Connect incognito</source>
-        <target state="translated">התחבר בזהות נסתרת</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via one-time link" xml:space="preserve" approved="no">
-        <source>Connect via one-time link</source>
-        <target state="translated">התחבר באמצעות קישור חד־פעמי</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Contacts" xml:space="preserve" approved="no">
-        <source>Contacts</source>
-        <target state="translated">אנשי קשר</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Delivery" xml:space="preserve" approved="no">
-        <source>Delivery</source>
-        <target state="translated">מסירה</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Error synchronizing connection" xml:space="preserve" approved="no">
-        <source>Error synchronizing connection</source>
-        <target state="translated">שגיאה בסנכרון החיבור</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Fix encryption after restoring backups." xml:space="preserve" approved="no">
-        <source>Fix encryption after restoring backups.</source>
-        <target state="translated">תקן הצפנה לאחר שחזור גיבויים.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Fix not supported by group member" xml:space="preserve" approved="no">
-        <source>Fix not supported by group member</source>
-        <target state="translated">תיקון אינו נתמך על ידי חבר הקבוצה</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Invalid status" xml:space="preserve" approved="no">
-        <source>Invalid status</source>
-        <target state="translated">סטטוס לא חוקי</target>
-        <note>item status text</note>
-      </trans-unit>
-      <trans-unit id="Migrating database archive…" xml:space="preserve" approved="no">
-        <source>Migrating database archive…</source>
-        <target state="translated">מעביר את ארכיון מסד הנתונים…</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Moderated at: %@" xml:space="preserve" approved="no">
-        <source>Moderated at: %@</source>
-        <target state="translated">נחסם ב: %@</target>
-        <note>copied message info</note>
-      </trans-unit>
-      <trans-unit id="Most likely this connection is deleted." xml:space="preserve" approved="no">
-        <source>Most likely this connection is deleted.</source>
-        <target state="translated">סביר להניח שהחיבור הזה נמחק.</target>
-        <note>item status description</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="Connect via contact link" xml:space="preserve" approved="no">
-        <source>Connect via contact link</source>
-        <target state="translated">התחבר באמצעות קישור איש קשר</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Delivery receipts!" xml:space="preserve" approved="no">
-        <source>Delivery receipts!</source>
-        <target state="translated">קבלות על המשלוח!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Disable for all" xml:space="preserve" approved="no">
-        <source>Disable for all</source>
-        <target state="translated">השבת לכולם</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Error enabling delivery receipts!" xml:space="preserve" approved="no">
-        <source>Error enabling delivery receipts!</source>
-        <target state="translated">שגיאה בהפעלת קבלות משלוח!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Even when disabled in the conversation." xml:space="preserve" approved="no">
-        <source>Even when disabled in the conversation.</source>
-        <target state="translated">גם אם הוא מושבת בשיחה.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Fix" xml:space="preserve" approved="no">
-        <source>Fix</source>
-        <target state="translated">תקן</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Fix connection" xml:space="preserve" approved="no">
-        <source>Fix connection</source>
-        <target state="translated">תקן את החיבור</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Find chats faster" xml:space="preserve" approved="no">
-        <source>Find chats faster</source>
-        <target state="translated">מצא צ'אטים מהר יותר</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Fix connection?" xml:space="preserve" approved="no">
-        <source>Fix connection?</source>
-        <target state="translated">לתקן את החיבור?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Make one message disappear" xml:space="preserve" approved="no">
-        <source>Make one message disappear</source>
-        <target state="translated">העלם הודעה אחת</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Fix not supported by contact" xml:space="preserve" approved="no">
-        <source>Fix not supported by contact</source>
-        <target state="translated">תיקון לא נתמך על ידי איש קשר</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve" approved="no">
-        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
-        <target state="translated">מצב זהות נסתרת מגן על הפרטיות שלך על ידי שימוש בפרופיל אקראי חדש עבור כל איש קשר.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="In reply to" xml:space="preserve" approved="no">
-        <source>In reply to</source>
-        <target state="translated">בתגובה ל</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Keep your connections" xml:space="preserve" approved="no">
-        <source>Keep your connections</source>
-        <target state="translated">שימרו על הקשרים שלכם</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Message delivery receipts!" xml:space="preserve" approved="no">
-        <source>Message delivery receipts!</source>
-        <target state="translated">קבלות על הודעות!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Message reactions are prohibited in this chat." xml:space="preserve" approved="no">
-        <source>Message reactions are prohibited in this chat.</source>
-        <target state="translated">תגובות אמוג׳י להודעות אסורות בצ׳אט זה.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Message reactions are prohibited in this group." xml:space="preserve" approved="no">
-        <source>Message reactions are prohibited in this group.</source>
-        <target state="translated">תגובות אמוג׳י להודעות אסורות בקבוצה זו.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Delivery receipts are disabled!" xml:space="preserve" approved="no">
-        <source>Delivery receipts are disabled!</source>
-        <target state="translated">קבלות על משלוח מושבתות!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Disable (keep overrides)" xml:space="preserve" approved="no">
-        <source>Disable (keep overrides)</source>
-        <target state="translated">השבת (שמור עקיפות)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Don't enable" xml:space="preserve" approved="no">
-        <source>Don't enable</source>
-        <target state="translated">אל תפעיל</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Enable (keep overrides)" xml:space="preserve" approved="no">
-        <source>Enable (keep overrides)</source>
-        <target state="translated">הפעל (שמור עקיפות)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Enable for all" xml:space="preserve" approved="no">
-        <source>Enable for all</source>
-        <target state="translated">הפעל עבור כולם</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Error setting delivery receipts!" xml:space="preserve" approved="no">
-        <source>Error setting delivery receipts!</source>
-        <target state="translated">שגיאה בהגדרת קבלות משלוח!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Filter unread and favorite chats." xml:space="preserve" approved="no">
-        <source>Filter unread and favorite chats.</source>
-        <target state="translated">סנן צ'אטים שלא נקראו וצ'אטים מועדפים.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Moderated at" xml:space="preserve" approved="no">
-        <source>Moderated at</source>
-        <target state="translated">נחסם</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Message reactions" xml:space="preserve" approved="no">
-        <source>Message reactions</source>
-        <target state="translated">תגובות אמוג׳י להודעות</target>
-        <note>chat feature</note>
-      </trans-unit>
-      <trans-unit id="Exporting database archive…" xml:space="preserve" approved="no">
-        <source>Exporting database archive…</source>
-        <target state="translated">מייצא את ארכיון מסד הנתונים…</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>
-      <trans-unit id="New display name" xml:space="preserve" approved="no">
-        <source>New display name</source>
-        <target state="translated">שם תצוגה חדש</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No delivery information" xml:space="preserve" approved="no">
-        <source>No delivery information</source>
-        <target state="translated">אין מידע על מסירה</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No filtered chats" xml:space="preserve" approved="no">
-        <source>No filtered chats</source>
-        <target state="translated">אין צ'אטים מסוננים</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No history" xml:space="preserve" approved="no">
-        <source>No history</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="he" datatype="plaintext">

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

@@ -2,7 +2,7 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
   <file original="en.lproj/Localizable.strings" source-language="en" target-language="it" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="&#10;" xml:space="preserve">
@@ -42,21 +42,6 @@
         <target>!1 colorato!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="# %@" xml:space="preserve">
-        <source># %@</source>
-        <target># %@</target>
-        <note>copied message info title, # &lt;title&gt;</note>
-      </trans-unit>
-      <trans-unit id="## History" xml:space="preserve">
-        <source>## History</source>
-        <target>## Cronologia</target>
-        <note>copied message info</note>
-      </trans-unit>
-      <trans-unit id="## In reply to" xml:space="preserve">
-        <source>## In reply to</source>
-        <target>## In risposta a</target>
-        <note>copied message info</note>
-      </trans-unit>
       <trans-unit id="#secret#" xml:space="preserve">
         <source>#secret#</source>
         <target>#segreto#</target>
@@ -87,11 +72,6 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%@ and %@ connected" xml:space="preserve">
-        <source>%@ and %@ connected</source>
-        <target>%@ e %@ sono connessi/e</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@ at %@:" xml:space="preserve">
         <source>%1$@ at %2$@:</source>
         <target>%1$@ alle %2$@:</target>
@@ -122,11 +102,6 @@
         <target>%@ si vuole connettere!</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve">
-        <source>%@, %@ and %lld other members connected</source>
-        <target>%@, %@ e altri %lld membri sono connessi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%@:" xml:space="preserve">
         <source>%@:</source>
         <target>%@:</target>
@@ -197,11 +172,6 @@
         <target>%lld minuti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="%lld new interface languages" xml:space="preserve">
-        <source>%lld new interface languages</source>
-        <target>%lld nuove lingue dell'interfaccia</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="%lld second(s)" xml:space="preserve">
         <source>%lld second(s)</source>
         <target>%lld secondo/i</target>
@@ -332,15 +302,6 @@
         <target>, </target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve">
-        <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>- connessione al [servizio directory](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)!
-- ricevute di consegna (fino a 20 membri).
-- più veloce e più stabile.</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">
         <source>- more stable message delivery.
 - a bit better groups.
@@ -436,9 +397,14 @@
         <target>Un contatto nuovo</target>
         <note>notification title</note>
       </trans-unit>
-      <trans-unit id="A new random profile will be shared." xml:space="preserve">
-        <source>A new random profile will be shared.</source>
-        <target>Verrà condiviso un nuovo profilo casuale.</target>
+      <trans-unit id="A random profile will be sent to the contact that you received this link from" xml:space="preserve">
+        <source>A random profile will be sent to the contact that you received this link from</source>
+        <target>Verrà inviato un profilo casuale al contatto da cui hai ricevuto questo link</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="A random profile will be sent to your contact" xml:space="preserve">
+        <source>A random profile will be sent to your contact</source>
+        <target>Verrà inviato un profilo casuale al tuo contatto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -494,9 +460,9 @@
         <note>accept contact request via notification
    accept incoming call via notification</note>
       </trans-unit>
-      <trans-unit id="Accept connection request?" xml:space="preserve">
-        <source>Accept connection request?</source>
-        <target>Accettare la richiesta di connessione?</target>
+      <trans-unit id="Accept contact" xml:space="preserve">
+        <source>Accept contact</source>
+        <target>Accetta il contatto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -507,7 +473,7 @@
       <trans-unit id="Accept incognito" xml:space="preserve">
         <source>Accept incognito</source>
         <target>Accetta in incognito</target>
-        <note>accept contact request via notification</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve">
         <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
@@ -714,11 +680,6 @@
         <target>Build dell'app: %@</target>
         <note>No comment provided by engineer.</note>
       </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>L'app cripta i nuovi file locali (eccetto i video).</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Icona app</target>
@@ -854,11 +815,6 @@
         <target>Sia tu che il tuo contatto potete inviare messaggi vocali.</target>
         <note>No comment provided by engineer.</note>
       </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>Bulgaro, finlandese, tailandese e ucraino - grazie agli utenti e a [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">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
         <target>Per profilo di chat (predefinito) o [per connessione](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
@@ -1090,19 +1046,9 @@
         <target>Connetti</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Connect directly" xml:space="preserve">
-        <source>Connect directly</source>
-        <target>Connetti direttamente</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect incognito" xml:space="preserve">
-        <source>Connect incognito</source>
-        <target>Connetti in incognito</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Connect via contact link" xml:space="preserve">
-        <source>Connect via contact link</source>
-        <target>Connetti via link del contatto</target>
+      <trans-unit id="Connect via contact link?" xml:space="preserve">
+        <source>Connect via contact link?</source>
+        <target>Connettere via link del contatto?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1120,9 +1066,9 @@
         <target>Connetti via link / codice 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>Connetti via link una tantum</target>
+      <trans-unit id="Connect via one-time link?" xml:space="preserve">
+        <source>Connect via one-time link?</source>
+        <target>Connettere via link una tantum?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1150,6 +1096,11 @@
         <target>Errore di connessione (AUTH)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Connection request" xml:space="preserve">
+        <source>Connection request</source>
+        <target>Richiesta di connessione</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Connection request sent!" xml:space="preserve">
         <source>Connection request sent!</source>
         <target>Richiesta di connessione inviata!</target>
@@ -1255,11 +1206,6 @@
         <target>Crea link</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Create new profile in [desktop app](https://simplex.chat/downloads/). 💻" xml:space="preserve">
-        <source>Create new profile in [desktop app](https://simplex.chat/downloads/). 💻</source>
-        <target>Crea un nuovo profilo nell'[app desktop](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>Crea link di invito una tantum</target>
@@ -1603,11 +1549,6 @@
         <target>Eliminato il: %@</target>
         <note>copied message info</note>
       </trans-unit>
-      <trans-unit id="Delivery" xml:space="preserve">
-        <source>Delivery</source>
-        <target>Consegna</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>Le ricevute di consegna sono disattivate!</target>
@@ -1713,11 +1654,6 @@
         <target>Disconnetti</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Discover and join groups" xml:space="preserve">
-        <source>Discover and join groups</source>
-        <target>Scopri ed unisciti ai gruppi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Display name" xml:space="preserve">
         <source>Display name</source>
         <target>Nome da mostrare</target>
@@ -1853,16 +1789,6 @@
         <target>Crittografare il database?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Encrypt local files" xml:space="preserve">
-        <source>Encrypt local files</source>
-        <target>Cripta i file locali</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Encrypt stored files &amp; media" xml:space="preserve">
-        <source>Encrypt stored files &amp; media</source>
-        <target>Crittografia di file e media memorizzati</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Encrypted database" xml:space="preserve">
         <source>Encrypted database</source>
         <target>Database crittografato</target>
@@ -1988,20 +1914,11 @@
         <target>Errore nella creazione del link del gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error creating member contact" xml:space="preserve">
-        <source>Error creating member contact</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error creating profile!" xml:space="preserve">
         <source>Error creating profile!</source>
         <target>Errore nella creazione del profilo!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error decrypting file" xml:space="preserve">
-        <source>Error decrypting file</source>
-        <target>Errore decifrando il file</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error deleting chat database" xml:space="preserve">
         <source>Error deleting chat database</source>
         <target>Errore nell'eliminazione del database della chat</target>
@@ -2122,10 +2039,6 @@
         <target>Errore nell'invio dell'email</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Error sending member contact invitation" xml:space="preserve">
-        <source>Error sending member contact invitation</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Error sending message" xml:space="preserve">
         <source>Error sending message</source>
         <target>Errore nell'invio del messaggio</target>
@@ -2524,7 +2437,7 @@
       <trans-unit id="History" xml:space="preserve">
         <source>History</source>
         <target>Cronologia</target>
-        <note>No comment provided by engineer.</note>
+        <note>copied message info</note>
       </trans-unit>
       <trans-unit id="How SimpleX works" xml:space="preserve">
         <source>How SimpleX works</source>
@@ -2634,7 +2547,7 @@
       <trans-unit id="In reply to" xml:space="preserve">
         <source>In reply to</source>
         <target>In risposta a</target>
-        <note>No comment provided by engineer.</note>
+        <note>copied message info</note>
       </trans-unit>
       <trans-unit id="Incognito" xml:space="preserve">
         <source>Incognito</source>
@@ -2646,9 +2559,14 @@
         <target>Modalità incognito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Incognito mode protects your privacy by using a new random profile for each contact." xml:space="preserve">
-        <source>Incognito mode protects your privacy by using a new random profile for each contact.</source>
-        <target>La modalità in incognito protegge la tua privacy usando un nuovo profilo casuale per ogni contatto.</target>
+      <trans-unit id="Incognito mode is not supported here - your main profile will be sent to group members" xml:space="preserve">
+        <source>Incognito mode is not supported here - your main profile will be sent to group members</source>
+        <target>La modalità in incognito non è supportata qui: il tuo profilo principale verrà inviato ai membri del gruppo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created." xml:space="preserve">
+        <source>Incognito mode protects the privacy of your main profile name and image — for each new contact a new random profile is created.</source>
+        <target>La modalità in incognito protegge la privacy del nome e dell'immagine del tuo profilo principale: per ogni nuovo contatto viene creato un nuovo profilo casuale.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2723,11 +2641,6 @@
         <target>Indirizzo del server non valido!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Invalid status" xml:space="preserve">
-        <source>Invalid status</source>
-        <target>Stato non valido</target>
-        <note>item status text</note>
-      </trans-unit>
       <trans-unit id="Invitation expired!" xml:space="preserve">
         <source>Invitation expired!</source>
         <target>Invito scaduto!</target>
@@ -2987,7 +2900,7 @@
       <trans-unit id="Message delivery error" xml:space="preserve">
         <source>Message delivery error</source>
         <target>Errore di recapito del messaggio</target>
-        <note>item status text</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message delivery receipts!" xml:space="preserve">
         <source>Message delivery receipts!</source>
@@ -3074,11 +2987,6 @@
         <target>Altri miglioramenti sono in arrivo!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
-        <source>Most likely this connection is deleted.</source>
-        <target>Probabilmente questa connessione è stata eliminata.</target>
-        <note>item status description</note>
-      </trans-unit>
       <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
         <source>Most likely this contact has deleted the connection with you.</source>
         <target>Probabilmente questo contatto ha eliminato la connessione con te.</target>
@@ -3139,11 +3047,6 @@
         <target>Nuovo archivio database</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New desktop app!" xml:space="preserve">
-        <source>New desktop app!</source>
-        <target>Nuova app desktop!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New display name" xml:space="preserve">
         <source>New display name</source>
         <target>Nuovo nome da mostrare</target>
@@ -3189,11 +3092,6 @@
         <target>Nessun contatto da aggiungere</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No delivery information" xml:space="preserve">
-        <source>No delivery information</source>
-        <target>Nessuna informazione sulla consegna</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No device token!" xml:space="preserve">
         <source>No device token!</source>
         <target>Nessun token del dispositivo!</target>
@@ -3358,10 +3256,6 @@
         <target>Solo il tuo contatto può inviare messaggi vocali.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Open" xml:space="preserve">
-        <source>Open</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Open Settings" xml:space="preserve">
         <source>Open Settings</source>
         <target>Apri le impostazioni</target>
@@ -3452,10 +3346,10 @@
         <target>Incolla il link ricevuto</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>
+      <trans-unit id="Paste the link you received into the box below to connect with your contact." xml:space="preserve">
+        <source>Paste the link you received into the box below to connect with your contact.</source>
         <target>Incolla il link che hai ricevuto nella casella sottostante per connetterti con il tuo contatto.</target>
-        <note>placeholder</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
         <source>People can connect to you only via the links you share.</source>
@@ -3702,11 +3596,6 @@
         <target>Maggiori informazioni nel nostro [repository GitHub](https://github.com/simplex-chat/simplex-chat#readme).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Receipts are disabled" xml:space="preserve">
-        <source>Receipts are disabled</source>
-        <target>Le ricevute sono disattivate</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Received at" xml:space="preserve">
         <source>Received at</source>
         <target>Ricevuto il</target>
@@ -3777,8 +3666,8 @@
         <target>Rifiuta</target>
         <note>reject incoming call via notification</note>
       </trans-unit>
-      <trans-unit id="Reject (sender NOT notified)" xml:space="preserve">
-        <source>Reject (sender NOT notified)</source>
+      <trans-unit id="Reject contact (sender NOT notified)" xml:space="preserve">
+        <source>Reject contact (sender NOT notified)</source>
         <target>Rifiuta contatto (mittente NON avvisato)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -4097,10 +3986,6 @@
         <target>Invia messaggio diretto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Send direct message to connect" xml:space="preserve">
-        <source>Send direct message to connect</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
         <source>Send disappearing message</source>
         <target>Invia messaggio a tempo</target>
@@ -4171,21 +4056,11 @@
         <target>L'invio di ricevute è disattivato per %lld contatti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Sending receipts is disabled for %lld groups" xml:space="preserve">
-        <source>Sending receipts is disabled for %lld groups</source>
-        <target>L'invio di ricevute è disattivato per %lld gruppi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
         <source>Sending receipts is enabled for %lld contacts</source>
         <target>L'invio di ricevute è attivo per %lld contatti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Sending receipts is enabled for %lld groups" xml:space="preserve">
-        <source>Sending receipts is enabled for %lld groups</source>
-        <target>L'invio di ricevute è attivo per %lld gruppi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Sending via" xml:space="preserve">
         <source>Sending via</source>
         <target>Invio tramite</target>
@@ -4326,11 +4201,6 @@
         <target>Mostra opzioni sviluppatore</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Show last messages" xml:space="preserve">
-        <source>Show last messages</source>
-        <target>Mostra ultimi messaggi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Mostra anteprima</target>
@@ -4401,11 +4271,6 @@
         <target>Invito SimpleX una tantum</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="Simplified incognito mode" xml:space="preserve">
-        <source>Simplified incognito mode</source>
-        <target>Modalità incognito semplificata</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Skip" xml:space="preserve">
         <source>Skip</source>
         <target>Salta</target>
@@ -4416,11 +4281,6 @@
         <target>Messaggi saltati</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Small groups (max 20)" xml:space="preserve">
-        <source>Small groups (max 20)</source>
-        <target>Piccoli gruppi (max 20)</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Some non-fatal errors occurred during import - you may see Chat console for more details." xml:space="preserve">
         <source>Some non-fatal errors occurred during import - you may see Chat console for more details.</source>
         <target>Si sono verificati alcuni errori non gravi durante l'importazione: vedi la console della chat per i dettagli.</target>
@@ -4713,9 +4573,9 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>Queste impostazioni sono per il tuo profilo attuale **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
-        <source>They can be overridden in contact and group settings.</source>
-        <target>Possono essere sovrascritte nelle impostazioni dei contatti e dei gruppi.</target>
+      <trans-unit id="They can be overridden in contact settings" xml:space="preserve">
+        <source>They can be overridden in contact settings</source>
+        <target>Possono essere sovrascritte nelle impostazioni dei contatti</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4733,11 +4593,6 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>Questa azione non può essere annullata: il tuo profilo, i contatti, i messaggi e i file andranno persi in modo irreversibile.</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>Questo gruppo ha più di %lld membri, le ricevute di consegna non vengono inviate.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="This group no longer exists." xml:space="preserve">
         <source>This group no longer exists.</source>
         <target>Questo gruppo non esiste più.</target>
@@ -4758,6 +4613,11 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
         <target>Per connettervi, il tuo contatto può scansionare il codice QR o usare il link nell'app.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To find the profile used for an incognito connection, tap the contact or group name on top of the chat." xml:space="preserve">
+        <source>To find the profile used for an incognito connection, tap the contact or group name on top of the chat.</source>
+        <target>Per trovare il profilo usato per una connessione in incognito, tocca il nome del contatto o del gruppo in cima alla chat.</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>Per creare una nuova connessione</target>
@@ -4800,11 +4660,6 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
         <target>Per verificare la crittografia end-to-end con il tuo contatto, confrontate (o scansionate) il codice sui vostri dispositivi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Toggle incognito when connecting." xml:space="preserve">
-        <source>Toggle incognito when connecting.</source>
-        <target>Attiva/disattiva l'incognito quando ti colleghi.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Transport isolation" xml:space="preserve">
         <source>Transport isolation</source>
         <target>Isolamento del trasporto</target>
@@ -4843,7 +4698,7 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
       <trans-unit id="Unexpected error: %@" xml:space="preserve">
         <source>Unexpected error: %@</source>
         <target>Errore imprevisto: % @</target>
-        <note>item status description</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unexpected migration state" xml:space="preserve">
         <source>Unexpected migration state</source>
@@ -4982,11 +4837,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Usa la chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use current profile" xml:space="preserve">
-        <source>Use current profile</source>
-        <target>Usa il profilo attuale</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve">
         <source>Use for new connections</source>
         <target>Usa per connessioni nuove</target>
@@ -4997,11 +4847,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Usa interfaccia di chiamata iOS</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use new incognito profile" xml:space="preserve">
-        <source>Use new incognito profile</source>
-        <target>Usa nuovo profilo in incognito</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
         <source>Use server</source>
         <target>Usa il server</target>
@@ -5292,8 +5137,8 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Devi inserire la password ogni volta che si avvia l'app: non viene memorizzata sul dispositivo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="You invited a contact" xml:space="preserve">
-        <source>You invited a contact</source>
+      <trans-unit id="You invited your contact" xml:space="preserve">
+        <source>You invited your contact</source>
         <target>Hai invitato il contatto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
@@ -5422,6 +5267,11 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Il tuo profilo di chat verrà inviato ai membri del gruppo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your chat profile will be sent to your contact" xml:space="preserve">
+        <source>Your chat profile will be sent to your contact</source>
+        <target>Il tuo profilo di chat verrà inviato al tuo contatto</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
         <source>Your chat profiles</source>
         <target>I tuoi profili di chat</target>
@@ -5476,11 +5326,6 @@ Puoi modificarlo nelle impostazioni.</target>
         <target>La tua privacy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
-        <source>Your profile **%@** will be shared.</source>
-        <target>Il tuo profilo **%@** verrà condiviso.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
         <source>Your profile is stored on your device and shared only with your contacts.
 SimpleX servers cannot see your profile.</source>
@@ -5488,6 +5333,11 @@ SimpleX servers cannot see your profile.</source>
 I server di SimpleX non possono vedere il tuo profilo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Your profile will be sent to the contact that you received this link from" xml:space="preserve">
+        <source>Your profile will be sent to the contact that you received this link from</source>
+        <target>Il tuo profilo verrà inviato al contatto da cui hai ricevuto questo link</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
         <source>Your profile, contacts and delivered messages are stored on your device.</source>
         <target>Il tuo profilo, i contatti e i messaggi recapitati sono memorizzati sul tuo dispositivo.</target>
@@ -5653,10 +5503,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>connesso/a</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="connected directly" xml:space="preserve">
-        <source>connected directly</source>
-        <note>rcv group event chat item</note>
-      </trans-unit>
       <trans-unit id="connecting" xml:space="preserve">
         <source>connecting</source>
         <target>in connessione</target>
@@ -5767,11 +5613,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>diretta</target>
         <note>connection level description</note>
       </trans-unit>
-      <trans-unit id="disabled" xml:space="preserve">
-        <source>disabled</source>
-        <target>disattivato</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="duplicate message" xml:space="preserve">
         <source>duplicate message</source>
         <target>messaggio duplicato</target>
@@ -5852,11 +5693,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>errore</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="event happened" xml:space="preserve">
-        <source>event happened</source>
-        <target>evento accaduto</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="group deleted" xml:space="preserve">
         <source>group deleted</source>
         <target>gruppo eliminato</target>
@@ -5969,7 +5805,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
       </trans-unit>
       <trans-unit id="member connected" xml:space="preserve">
         <source>connected</source>
-        <target>è connesso/a</target>
+        <target>connesso/a</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="message received" xml:space="preserve">
@@ -6118,10 +5954,6 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
         <target>codice di sicurezza modificato</target>
         <note>chat item text</note>
       </trans-unit>
-      <trans-unit id="send direct message" xml:space="preserve">
-        <source>send direct message</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="starting…" xml:space="preserve">
         <source>starting…</source>
         <target>avvio…</target>
@@ -6266,7 +6098,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="it" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6298,7 +6130,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="it" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3.1" build-num="14E300c"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">