update http2

* android, desktop: updated Compose and changed mac notarization tool

* imports

* desktop (mac): fix lib building

* imports

---------

Co-authored-by: Avently <avently@local>
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
       - users
     tags:
       - "v*"
+      - "!*-fdroid"
   pull_request:
 
 jobs:
@@ -78,10 +79,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         with:
-          ghc-version: "8.10.7"
-          cabal-version: "latest"
+          ghc-version: "9.6.2"
+          cabal-version: "3.10.1.0"
 
       - name: Cache dependencies
         uses: actions/cache@v3
@@ -125,7 +126,9 @@ jobs:
         shell: bash
         run: |
           cabal build --enable-tests
-          echo "::set-output name=bin_path::$(cabal list-bin simplex-chat)"
+          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
 
       - name: Unix upload CLI binary to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
@@ -136,6 +139,16 @@ jobs:
           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
@@ -152,7 +165,9 @@ jobs:
           scripts/desktop/build-lib-linux.sh
           cd apps/multiplatform
           ./gradlew packageDeb
-          echo "::set-output name=package_path::$(echo $PWD/release/main/deb/simplex_*_amd64.deb)"
+          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
@@ -160,17 +175,23 @@ jobs:
         shell: bash
         run: |
           scripts/desktop/make-appimage-linux.sh
-          echo "::set-output name=appimage_path::$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage)"
+          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/desktop/build-lib-mac.sh
-          cd apps/multiplatform
-          ./gradlew packageDmg
-          echo "::set-output name=package_path::$(echo $PWD/release/main/dmg/SimpleX-*.dmg)"
+          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')
@@ -181,6 +202,16 @@ jobs:
           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
@@ -190,6 +221,16 @@ jobs:
           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
@@ -199,6 +240,16 @@ jobs:
           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
@@ -208,21 +259,22 @@ jobs:
       # Unix /
 
       # / Windows
-
-      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
-      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
+      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
 
       - name: Windows build
         id: windows_build
         if: matrix.os == 'windows-latest'
-        shell: cmd
+        shell: bash
         run: |
+          rm -rf dist-newstyle/src/direct-sq*
+          sed -i "s/, unix /--, unix /" simplex-chat.cabal
           cabal build --enable-tests
-          cabal list-bin simplex-chat > tmp_bin_path
-          set /p bin_path= < tmp_bin_path
-          echo ::set-output name=bin_path::%bin_path%
+          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
 
-      - name: Windows upload binary to release
+      - name: Windows upload CLI binary to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
         uses: svenstaro/upload-release-action@v2
         with:
@@ -231,4 +283,47 @@ 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 }}
+
+      - name: Windows build desktop
+        id: windows_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        env:
+          SIMPLEX_CI_REPO_URL: ${{ secrets.SIMPLEX_CI_REPO_URL }}
+        shell: bash
+        run: |
+          scripts/desktop/build-lib-windows.sh
+          cd apps/multiplatform
+          ./gradlew packageMsi
+          path=$(echo $PWD/release/main/msi/*imple*.msi | sed 's#/\([a-z]\)#\1:#' | sed 's#/#\\#g')
+          echo "package_path=$path" >> $GITHUB_OUTPUT
+          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+      
+      - name: Windows upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.windows_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_asset_name }}
+          tag: ${{ github.ref }}
+
+      - name: Windows update desktop package 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_desktop_build.outputs.package_hash }}
+
       # Windows /

.github/workflows/web.yml

@@ -9,6 +9,7 @@ on:
       - website/**
       - images/**
       - blog/**
+      - docs/**
       - .github/workflows/web.yml
 
 jobs:

Dockerfile

@@ -8,12 +8,12 @@ RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/
     chmod +x /usr/bin/ghcup
 
 # Install ghc
-RUN ghcup install ghc 8.10.7
+RUN ghcup install ghc 9.6.2
 # Install cabal
-RUN ghcup install cabal
+RUN ghcup install cabal 3.10.1.0
 # Set both as default
-RUN ghcup set ghc 8.10.7 && \
-    ghcup set cabal
+RUN ghcup set ghc 9.6.2 && \
+    ghcup set cabal 3.10.1.0
 
 COPY . /project
 WORKDIR /project

PRIVACY.md

@@ -131,4 +131,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, 2022
+Updated August 17, 2023

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)
-[![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)](https://mastodon.social/@simplex)
+<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>
 
 | 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-via-the-app) and [join user groups](#join-user-groups).
+2. ↔️ [Connect to the team](#connect-to-the-team), [join user groups](#join-user-groups) and [follow our updates](#follow-our-updates).
 3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
 4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
 5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
@@ -40,14 +40,22 @@
 - 🚀 [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 via the app
+## 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:
 
 - 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:
@@ -79,7 +87,14 @@ 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.
 
-You can also join the group created by other users by searching for them via the [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.
+## 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
 
@@ -104,17 +119,22 @@ Join our translators to help SimpleX grow!
 |locale|language |contributor|[Android](https://play.google.com/store/apps/details?id=chat.simplex.app) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084)|[website](https://simplex.chat)|Github docs|
 |:----:|:-------:|:---------:|:---------:|:---------:|:---------:|
 |🇬🇧 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/)||
+|ar|العربية   |[jermanuts](https://github.com/jermanuts)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/ar/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ar/)<br>-|[![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>[![ios app](https://hosted.weblate.org/widget/simplex-chat/ios/bg/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/bg/)|||
 |🇨🇿 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/)||
+|🇫🇮 fi|Suomi     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/fi/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fi/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fi/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fi/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fi/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fi/)||
 |🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi-sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
+|🇮🇱 he|עִברִית     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/he/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/he/)<br>-|||
 |🇮🇹 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/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/)|||
+|🇯🇵 ja|日本語     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/ja/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/ja/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ja/)||
 |🇳🇱 nl|Nederlands|[mika-nl](https://github.com/mika-nl)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/nl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/nl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/nl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/nl/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/nl/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/nl/)||
-|🇵🇱 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/)|||
+|🇵🇱 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/)|||
 |🇧🇷 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/)|||
+|🇺🇦 uk|Українська| |[![android app](https://hosted.weblate.org/widgets/simplex-chat/uk/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/uk/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/uk/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/uk/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/uk/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/uk/)||
 |🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)<br><br>[Float-hu](https://github.com/Float-hu)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)<br>&nbsp;|<br><br>[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||
 
 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!
@@ -142,11 +162,14 @@ 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 address: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
-- Bitcoin address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
-- BCH address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
-- Ethereum address: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
-- Solana address: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
+- Monero: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
+- Bitcoin: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- USDT:
+  - BNB Smart Chain: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+  - Tron: TNnTrKLBmdy2Wn3cAQR98dAVvWhLskQGfW
+- Ethereum: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+- Solana: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
 
 Thank you,
 
@@ -166,7 +189,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: technical details and limitations](#privacy-technical-details-and-limitations)
+- [Privacy and security: technical details and limitations](#privacy-and-security-technical-details-and-limitations)
 - [For developers](#for-developers)
 - [Roadmap](#roadmap)
 - [Disclaimers, Security contact, License](#disclaimers)
@@ -207,24 +230,18 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 ## News and updates
 
-Recent updates:
+Recent and important updates:
 
-[July 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
+[Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).
+
+[Jul 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
 
 [May 23, 2023. SimpleX Chat: v5.1 released with message reactions and self-destruct passcode](./blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.md).
 
 [Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).
 
-[Mar 28, 2023. v4.6 released - with Android 8+ and ARMv7a support, hidden profiles, community moderation, improved audio/video calls and reduced battery usage](./blog/20230328-simplex-chat-v4-6-hidden-profiles.md).
-
 [Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
 
-[Feb 4, 2023. v4.5 released - with multiple user profiles, message draft, transport isolation and Italian interface](./blog/20230204-simplex-chat-v4-5-user-chat-profiles.md).
-
-[Jan 3, 2023. v4.4 released - with disappearing messages, "live" messages, connection security verifications, GIFs and stickers and with French interface language](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md).
-
-[Dec 6, 2022. November reviews and v4.3 released - with instant voice messages, irreversible deletion of sent messages and improved server configuration](./blog/20221206-simplex-chat-v4.3-voice-messages.md).
-
 [Nov 8, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
 [Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md).
@@ -257,7 +274,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: technical details and limitations
+## Privacy and security: 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.
 
@@ -270,18 +287,23 @@ What is already implemented:
 3. [Double ratchet](./docs/GLOSSARY.md#double-ratchet-algorithm) end-to-end encryption in each conversation between two users (or group members). This is the same algorithm that is used in Signal and many other messaging apps; it provides OTR messaging with [forward secrecy](./docs/GLOSSARY.md#forward-secrecy) (each message is encrypted by its own ephemeral key) and [break-in recovery](./docs/GLOSSARY.md#post-compromise-security) (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial [key agreement](./docs/GLOSSARY.md#key-agreement-protocol), initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
 4. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
 5. Several levels of [content padding](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
-6. Starting from v2 of SMP protocol (the current version is v4) all message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
+6. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
 7. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
 8. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
 9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
 10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
 11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
+12. Manual messaging queue rotations to move conversation to another SMP relay.
+13. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
+14. Local files encryption, except videos (to be added later).
 
-We plan to add soon:
+We plan to add:
 
-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.
+1. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
+2. Post-quantum resistant key exchange in double ratchet protocol.
+3. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
+5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
 
 ## For developers
 
@@ -342,22 +364,26 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Message editing history
 - ✅ Reduced battery and traffic usage in large groups.
 - ✅ Message delivery confirmation (with sender opt-out per contact).
-- 🏗 Desktop client.
+- ✅ Desktop client.
+- ✅ Encryption of local files stored in the app.
+- 🏗 Using mobile profiles from the desktop app.
+- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
+- Post-quantum resistant key exchange in double ratchet protocol.
+- Large groups, communities and public channels.
+- Privacy & security slider - a simple way to set all settings at once.
+- Improve sending videos (including encryption of locally stored videos).
+- Improve experience for the new users.
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
-- Local app files encryption.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
-- Large groups, communities and public channels.
 - Feeds/broadcasts.
 - Ephemeral/disappearing/OTR conversations with the existing contacts.
 - Privately share your location.
 - Web widgets for custom interactivity in the chats.
 - Programmable chat automations / rules (automatic replies/forward/deletion/sending, reminders, etc.).
-- Supporting the same profile on multiple devices.
 - Privacy-preserving identity server for optional DNS-based contact/group addresses to simplify connection and discovery, but not used to deliver messages:
   - keep all your contacts and groups even if you lose the domain.
   - the server doesn't have information about your contacts and groups.
-- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - High capacity multi-node SMP relays.
 
 ## Disclaimers

apps/ios/Shared/AppDelegate.swift

@@ -55,7 +55,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                      didReceiveRemoteNotification userInfo: [AnyHashable : Any],
                      fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
         logger.debug("AppDelegate: didReceiveRemoteNotification")
-        print("*** userInfo", userInfo)
         let m = ChatModel.shared
         if let ntfData = userInfo["notificationData"] as? [AnyHashable : Any],
            m.notificationMode != .off {

apps/ios/Shared/ContentView.swift

@@ -31,11 +31,11 @@ struct ContentView: View {
     @State private var chatListActionSheet: ChatListActionSheet? = nil
 
     private enum ChatListActionSheet: Identifiable {
-        case connectViaUrl(action: ConnReqType, link: String)
+        case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
 
         var id: String {
             switch self {
-            case .connectViaUrl: return "connectViaUrl \(link)"
+            case let .planAndConnectSheet(sheet): return sheet.id
             }
         }
     }
@@ -93,7 +93,7 @@ struct ContentView: View {
                 mainView()
                 .actionSheet(item: $chatListActionSheet) { sheet in
                     switch sheet {
-                    case let .connectViaUrl(action, link): return connectViaUrlSheet(action, link)
+                    case let .planAndConnectSheet(sheet): return planAndConnectActionSheet(sheet, dismiss: false)
                     }
                 }
             } else {
@@ -285,36 +285,30 @@ struct ContentView: View {
     }
 
     func connectViaUrl() {
-        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")))
+        dismissAllSheets() {
+            let m = ChatModel.shared
+            if let url = m.appOpenUrl {
+                m.appOpenUrl = nil
+                var path = url.path
+                if (path == "/contact" || path == "/invitation") {
+                    path.removeFirst()
+                    let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
+                    planAndConnect(
+                        link,
+                        showAlert: showPlanAndConnectAlert,
+                        showActionSheet: { chatListActionSheet = .planAndConnectSheet(sheet: $0) },
+                        dismiss: false,
+                        incognito: nil
+                    )
+                } else {
+                    AlertManager.shared.showAlert(Alert(title: Text("Error: URL is invalid")))
+                }
             }
         }
     }
 
-    private func connectViaUrlSheet(_ action: ConnReqType, _ link: String) -> ActionSheet {
-        let title: LocalizedStringKey
-        switch action {
-        case .contact: title = "Connect via contact link"
-        case .invitation: title = "Connect via one-time link"
-        }
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .default(Text("Use current profile")) { connectViaLink(link, incognito: false) },
-                .default(Text("Use new incognito profile")) { connectViaLink(link, incognito: true) },
-                .cancel()
-            ]
-        )
+    private func showPlanAndConnectAlert(_ alert: PlanAndConnectAlert) {
+        AlertManager.shared.showAlert(planAndConnectAlert(alert, dismiss: false))
     }
 }
 

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -103,9 +103,15 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         self.onFinishPlayback = onFinishPlayback
     }
 
-    func start(fileName: String, at: TimeInterval?) {
-        let url = getAppFilePath(fileName)
-        audioPlayer = try? AVAudioPlayer(contentsOf: url)
+    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)
+        }
         audioPlayer?.delegate = self
         audioPlayer?.prepareToPlay()
         if let at = at {

apps/ios/Shared/Model/ChatModel.swift

@@ -31,8 +31,8 @@ actor TerminalItems {
     }
 
     func addCommand(_ start: Date, _ cmd: ChatCommand, _ resp: ChatResponse) async {
-        addTermItem(&terminalItems, .cmd(start, cmd))
-        addTermItem(&terminalItems, .resp(.now, resp))
+        await add(.cmd(start, cmd))
+        await add(.resp(.now, resp))
     }
 }
 
@@ -62,8 +62,9 @@ final class ChatModel: ObservableObject {
     // current chat
     @Published var chatId: String?
     @Published var reversedChatItems: [ChatItem] = []
+    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
     @Published var chatToTop: String?
-    @Published var groupMembers: [GroupMember] = []
+    @Published var groupMembers: [GMember] = []
     // items in the terminal view
     @Published var showingTerminal = false
     @Published var terminalItems: [TerminalItem] = []
@@ -152,6 +153,20 @@ final class ChatModel: ObservableObject {
         }
     }
 
+    func getGroupChat(_ groupId: Int64) -> Chat? {
+        chats.first { chat in
+            if case let .group(groupInfo) = chat.chatInfo {
+                return groupInfo.groupId == groupId
+            } else {
+                return false
+            }
+        }
+    }
+
+    func getGroupMember(_ groupMemberId: Int64) -> GMember? {
+        groupMembers.first { $0.groupMemberId == groupMemberId }
+    }
+
     private func getChatIndex(_ id: String) -> Int? {
         chats.firstIndex(where: { $0.id == id })
     }
@@ -165,6 +180,7 @@ final class ChatModel: ObservableObject {
     func updateChatInfo(_ cInfo: ChatInfo) {
         if let i = getChatIndex(cInfo.id) {
             chats[i].chatInfo = cInfo
+            chats[i].created = Date.now
         }
     }
 
@@ -296,7 +312,11 @@ final class ChatModel: ObservableObject {
             return false
         } else {
             withAnimation(itemAnimation()) {
-                reversedChatItems.insert(cItem, at: hasLiveDummy ? 1 : 0)
+                var ci = cItem
+                if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
+                    ci.meta.itemStatus = status
+                }
+                reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
             }
             return true
         }
@@ -309,26 +329,22 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
         if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
             withAnimation {
                 _updateChatItem(at: i, with: cItem)
             }
+        } else if let status = status {
+            chatItemStatuses.updateValue(status, forKey: cItem.id)
         }
     }
 
     private func _updateChatItem(at i: Int, with cItem: ChatItem) {
-        let ci = reversedChatItems[i]
         reversedChatItems[i] = cItem
         reversedChatItems[i].viewTimestamp = .now
-        // on some occasions the confirmation of message being accepted by the server (tick)
-        // arrives earlier than the response from API, and item remains without tick
-        if case .sndNew = cItem.meta.itemStatus {
-            reversedChatItems[i].meta.itemStatus = ci.meta.itemStatus
-        }
     }
 
-    private func getChatItemIndex(_ cItem: ChatItem) -> Int? {
+    func getChatItemIndex(_ cItem: ChatItem) -> Int? {
         reversedChatItems.firstIndex(where: { $0.id == cItem.id })
     }
 
@@ -464,6 +480,7 @@ final class ChatModel: ObservableObject {
         }
         // clear current chat
         if chatId == cInfo.id {
+            chatItemStatuses = [:]
             reversedChatItems = []
         }
     }
@@ -495,18 +512,18 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func increaseUnreadCounter(user: User) {
+    func increaseUnreadCounter(user: any UserLike) {
         changeUnreadCounter(user: user, by: 1)
         NtfManager.shared.incNtfBadgeCount()
     }
 
-    func decreaseUnreadCounter(user: User, by: Int = 1) {
+    func decreaseUnreadCounter(user: any UserLike, by: Int = 1) {
         changeUnreadCounter(user: user, by: -by)
         NtfManager.shared.decNtfBadgeCount(by: by)
     }
 
-    private func changeUnreadCounter(user: User, by: Int) {
-        if let i = users.firstIndex(where: { $0.user.id == user.id }) {
+    private func changeUnreadCounter(user: any UserLike, by: Int) {
+        if let i = users.firstIndex(where: { $0.user.userId == user.userId }) {
             users[i].unreadCount += by
         }
     }
@@ -516,27 +533,62 @@ 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 [] }
+    // this function analyses "connected" events and assumes that each member will be there only once
+    func getConnectedMemberNames(_ chatItem: ChatItem) -> (Int, [String]) {
+        var count = 0
         var ns: [String] = []
-        while i < reversedChatItems.count, let m = reversedChatItems[i].memberConnected {
-            ns.append(m.displayName)
-            i += 1
+        if let ciCategory = chatItem.mergeCategory,
+           var i = getChatItemIndex(chatItem) {
+            while i < reversedChatItems.count {
+                let ci = reversedChatItems[i]
+                if ci.mergeCategory != ciCategory { break }
+                if let m = ci.memberConnected {
+                    ns.append(m.displayName)
+                }
+                count += 1
+                i += 1
+            }
         }
-        return ns
+        return (count, 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
-            )
+    // returns the index of the passed item and the next item (it has smaller index)
+    func getNextChatItem(_ ci: ChatItem) -> (Int?, ChatItem?) {
+        if let i = getChatItemIndex(ci) {
+            (i, i > 0 ? reversedChatItems[i - 1] : nil)
         } else {
-            return (nil, nil)
+            (nil, nil)
         }
     }
 
+    // returns the index of the first item in the same merged group (the first hidden item)
+    // and the previous visible item with another merge category
+    func getPrevShownChatItem(_ ciIndex: Int?, _ ciCategory: CIMergeCategory?) -> (Int?, ChatItem?) {
+        guard var i = ciIndex else { return (nil, nil) }
+        let fst = reversedChatItems.count - 1
+        while i < fst {
+            i = i + 1
+            let ci = reversedChatItems[i]
+            if ciCategory == nil || ciCategory != ci.mergeCategory {
+                return (i - 1, ci)
+            }
+        }
+        return (i, nil)
+    }
+
+    // returns the previous member in the same merge group and the count of members in this group
+    func getPrevHiddenMember(_ member: GroupMember, _ range: ClosedRange<Int>) -> (GroupMember?, Int) {
+        var prevMember: GroupMember? = nil
+        var memberIds: Set<Int64> = []
+        for i in range {
+            if case let .groupRcv(m) = reversedChatItems[i].chatDir {
+                if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
+                memberIds.insert(m.groupMemberId)
+            }
+        }
+        return (prevMember, memberIds.count)
+    }
+
     func popChat(_ id: String) {
         if let i = getChatIndex(id) {
             popChat_(i)
@@ -571,13 +623,14 @@ final class ChatModel: ObservableObject {
         }
         // update current chat
         if chatId == groupInfo.id {
-            if let i = groupMembers.firstIndex(where: { $0.id == member.id }) {
+            if let i = groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
                 withAnimation(.default) {
-                    self.groupMembers[i] = member
+                    self.groupMembers[i].wrapped = member
+                    self.groupMembers[i].created = Date.now
                 }
                 return false
             } else {
-                withAnimation { groupMembers.append(member) }
+                withAnimation { groupMembers.append(GMember(member)) }
                 return true
             }
         } else {
@@ -586,11 +639,10 @@ final class ChatModel: ObservableObject {
     }
 
     func updateGroupMemberConnectionStats(_ groupInfo: GroupInfo, _ member: GroupMember, _ connectionStats: ConnectionStats) {
-        if let conn = member.activeConn {
-            var updatedConn = conn
-            updatedConn.connectionStats = connectionStats
+        if var conn = member.activeConn {
+            conn.connectionStats = connectionStats
             var updatedMember = member
-            updatedMember.activeConn = updatedConn
+            updatedMember.activeConn = conn
             _ = upsertGroupMember(groupInfo, updatedMember)
         }
     }
@@ -689,40 +741,18 @@ final class Chat: ObservableObject, Identifiable {
     public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
 }
 
-enum NetworkStatus: Decodable, Equatable {
-    case unknown
-    case connected
-    case disconnected
-    case error(String)
+final class GMember: ObservableObject, Identifiable {
+    @Published var wrapped: GroupMember
+    var created = Date.now
 
-    var statusString: LocalizedStringKey {
-        get {
-            switch self {
-            case .connected: return "connected"
-            case .error: return "error"
-            default: return "connecting"
-            }
-        }
+    init(_ member: GroupMember) {
+        self.wrapped = member
     }
 
-    var statusExplanation: LocalizedStringKey {
-        get {
-            switch self {
-            case .connected: return "You are connected to the server used to receive messages from this contact."
-            case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
-            default: return "Trying to connect to the server used to receive messages from this contact."
-            }
-        }
-    }
-
-    var imageName: String {
-        get {
-            switch self {
-            case .unknown: return "circle.dotted"
-            case .connected: return "circle.fill"
-            case .disconnected: return "ellipsis.circle.fill"
-            case .error: return "exclamationmark.circle.fill"
-            }
-        }
-    }
+    var id: String { wrapped.id }
+    var groupId: Int64 { wrapped.groupId }
+    var groupMemberId: Int64 { wrapped.groupMemberId }
+    var displayName: String { wrapped.displayName }
+    var viewId: String { get { "\(wrapped.id) \(created.timeIntervalSince1970)" } }
+    static let sampleData = GMember(GroupMember.sampleData)
 }

apps/ios/Shared/Model/ImageUtils.swift

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

apps/ios/Shared/Model/NtfManager.swift

@@ -211,17 +211,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         center.delegate = self
     }
 
-    func notifyContactRequest(_ user: User, _ contactRequest: UserContactRequest) {
+    func notifyContactRequest(_ user: any UserLike, _ contactRequest: UserContactRequest) {
         logger.debug("NtfManager.notifyContactRequest")
         addNotification(createContactRequestNtf(user, contactRequest))
     }
 
-    func notifyContactConnected(_ user: User, _ contact: Contact) {
+    func notifyContactConnected(_ user: any UserLike, _ contact: Contact) {
         logger.debug("NtfManager.notifyContactConnected")
         addNotification(createContactConnectedNtf(user, contact))
     }
 
-    func notifyMessageReceived(_ user: User, _ cInfo: ChatInfo, _ cItem: ChatItem) {
+    func notifyMessageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) {
         logger.debug("NtfManager.notifyMessageReceived")
         if cInfo.ntfsEnabled {
             addNotification(createMessageReceivedNtf(user, cInfo, cItem))

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -15,6 +15,12 @@ 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)
@@ -251,6 +257,12 @@ func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
     throw r
 }
 
+func apiSetEncryptLocalFiles(_ enable: Bool) throws {
+    let r = chatSendCmdSync(.apiSetEncryptLocalFiles(enable: enable))
+    if case .cmdOk = r { return }
+    throw r
+}
+
 func apiExportArchive(config: ArchiveConfig) async throws {
     try await sendCommandOkResp(.apiExportArchive(config: config))
 }
@@ -300,6 +312,7 @@ func loadChat(chat: Chat, search: String = "") {
     do {
         let cInfo = chat.chatInfo
         let m = ChatModel.shared
+        m.chatItemStatuses = [:]
         m.reversedChatItems = []
         let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
         m.updateChatInfo(chat.chatInfo)
@@ -315,7 +328,7 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
     throw r
 }
 
-func apiSendMessage(type: ChatType, id: Int64, file: String?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
+func apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, 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
@@ -489,6 +502,10 @@ func apiSetChatSettings(type: ChatType, id: Int64, chatSettings: ChatSettings) a
     try await sendCommandOkResp(.apiSetChatSettings(type: type, id: id, chatSettings: chatSettings))
 }
 
+func apiSetMemberSettings(_ groupId: Int64, _ groupMemberId: Int64, _ memberSettings: GroupMemberSettings) async throws {
+    try await sendCommandOkResp(.apiSetMemberSettings(groupId: groupId, groupMemberId: groupMemberId, memberSettings: memberSettings))
+}
+
 func apiContactInfo(_ contactId: Int64) async throws -> (ConnectionStats?, Profile?) {
     let r = await chatSendCmd(.apiContactInfo(contactId: contactId))
     if case let .contactInfo(_, _, connStats, customUserProfile) = r { return (connStats, customUserProfile) }
@@ -580,6 +597,14 @@ func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> P
     throw r
 }
 
+func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
+    let userId = try currentUserId("apiConnectPlan")
+    let r = await chatSendCmd(.apiConnectPlan(userId: userId, connReq: connReq))
+    if case let .connectionPlan(_, connectionPlan) = r { return connectionPlan }
+    logger.error("apiConnectPlan error: \(responseError(r))")
+    throw r
+}
+
 func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
     let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
     if let alert = alert {
@@ -604,10 +629,7 @@ func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert
         if let c = m.getContactChat(contact.contactId) {
             await MainActor.run { m.chatId = c.id }
         }
-        let alert = mkAlert(
-            title: "Contact already exists",
-            message: "You are already connected to \(contact.displayName)."
-        )
+        let alert = contactAlreadyExistsAlert(contact)
         return (nil, alert)
     case .chatCmdError(_, .error(.invalidConnReq)):
         let alert = mkAlert(
@@ -635,6 +657,13 @@ func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert
     return (nil, alert)
 }
 
+func contactAlreadyExistsAlert(_ contact: Contact) -> Alert {
+    mkAlert(
+        title: "Contact already exists",
+        message: "You are already connected to \(contact.displayName)."
+    )
+}
+
 private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
     if let networkErrorAlert = networkErrorAlert(r) {
         return networkErrorAlert
@@ -646,18 +675,18 @@ private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
     }
 }
 
-func apiDeleteChat(type: ChatType, id: Int64) async throws {
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id), bgTask: false)
+func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
+    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
     if case .direct = type, case .contactDeleted = r { return }
     if case .contactConnection = type, case .contactConnectionDeleted = r { return }
     if case .group = type, case .groupDeletedUser = r { return }
     throw r
 }
 
-func deleteChat(_ chat: Chat) async {
+func deleteChat(_ chat: Chat, notify: Bool? = nil) async {
     do {
         let cInfo = chat.chatInfo
-        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId)
+        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, notify: notify)
         DispatchQueue.main.async { ChatModel.shared.removeChat(cInfo.id) }
     } catch let error {
         logger.error("deleteChat apiDeleteChat error: \(responseError(error))")
@@ -691,12 +720,13 @@ func apiListContacts() throws -> [Contact] {
     throw r
 }
 
-func apiUpdateProfile(profile: Profile) async throws -> Profile? {
+func apiUpdateProfile(profile: Profile) async throws -> (Profile, [Contact])? {
     let userId = try currentUserId("apiUpdateProfile")
     let r = await chatSendCmd(.apiUpdateProfile(userId: userId, profile: profile))
     switch r {
-    case .userProfileNoChange: return nil
-    case let .userProfileUpdated(_, _, toProfile): return toProfile
+    case .userProfileNoChange: return (profile, [])
+    case let .userProfileUpdated(_, _, toProfile, updateSummary): return (toProfile, updateSummary.changedContacts)
+    case .chatCmdError(_, .errorStore(.duplicateName)): return nil;
     default: throw r
     }
 }
@@ -706,7 +736,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
     }
 }
@@ -807,14 +837,14 @@ func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
     try await sendCommandOkResp(.apiChatUnread(type: type, id: id, unreadChat: unreadChat))
 }
 
-func receiveFile(user: User, fileId: Int64, auto: Bool = false) async {
-    if let chatItem = await apiReceiveFile(fileId: fileId, auto: auto) {
+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 apiReceiveFile(fileId: Int64, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
-    let r = await chatSendCmd(.receiveFile(fileId: fileId, inline: inline))
+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))
     let am = AlertManager.shared
     if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
     if case .rcvFileAcceptedSndCancelled = r {
@@ -938,6 +968,12 @@ func apiCallStatus(_ contact: Contact, _ status: String) async throws {
     }
 }
 
+func apiGetNetworkStatuses() throws -> [ConnNetworkStatus] {
+    let r = chatSendCmdSync(.apiGetNetworkStatuses)
+    if case let .networkStatuses(_, statuses) = r { return statuses }
+    throw r
+}
+
 func markChatRead(_ chat: Chat, aboveItem: ChatItem? = nil) async {
     do {
         if chat.chatStats.unreadCount > 0 {
@@ -985,9 +1021,9 @@ private func sendCommandOkResp(_ cmd: ChatCommand) async throws {
     throw r
 }
 
-func apiNewGroup(_ p: GroupProfile) throws -> GroupInfo {
+func apiNewGroup(incognito: Bool, groupProfile: GroupProfile) throws -> GroupInfo {
     let userId = try currentUserId("apiNewGroup")
-    let r = chatSendCmdSync(.apiNewGroup(userId: userId, groupProfile: p))
+    let r = chatSendCmdSync(.apiNewGroup(userId: userId, incognito: incognito, groupProfile: groupProfile))
     if case let .groupCreated(_, groupInfo) = r { return groupInfo }
     throw r
 }
@@ -1047,8 +1083,8 @@ func apiListMembers(_ groupId: Int64) async -> [GroupMember] {
     return []
 }
 
-func filterMembersToAdd(_ ms: [GroupMember]) -> [Contact] {
-    let memberContactIds = ms.compactMap{ m in m.memberCurrent ? m.memberContactId : nil }
+func filterMembersToAdd(_ ms: [GMember]) -> [Contact] {
+    let memberContactIds = ms.compactMap{ m in m.wrapped.memberCurrent ? m.wrapped.memberContactId : nil }
     return ChatModel.shared.chats
         .compactMap{ $0.chatInfo.contact }
         .filter{ !memberContactIds.contains($0.apiId) }
@@ -1090,6 +1126,18 @@ 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 }
@@ -1115,6 +1163,7 @@ func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool
     try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
     try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
     try setXFTPConfig(getXFTPCfg())
+    try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
     m.chatInitialized = true
     m.currentUser = try apiGetActiveUser()
     if m.currentUser == nil {
@@ -1267,6 +1316,12 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.removeChat(connection.id)
             }
         }
+    case let .contactDeletedByContact(user, contact):
+        if active(user) && contact.directOrUsed {
+            await MainActor.run {
+                m.updateContact(contact)
+            }
+        }
     case let .contactConnected(user, contact, _):
         if active(user) && contact.directOrUsed {
             await MainActor.run {
@@ -1311,6 +1366,12 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.updateChatInfo(cInfo)
             }
         }
+    case let .groupMemberUpdated(user, groupInfo, _, toMember):
+        if active(user) {
+            await MainActor.run {
+                _ = m.upsertGroupMember(groupInfo, toMember)
+            }
+        }
     case let .contactsMerged(user, intoContact, mergedContact):
         if active(user) && m.hasChat(mergedContact.id) {
             await MainActor.run {
@@ -1324,13 +1385,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
         await updateContactsStatus(contactRefs, status: .connected)
     case let .contactsDisconnected(_, contactRefs):
         await updateContactsStatus(contactRefs, status: .disconnected)
-    case let .contactSubError(user, contact, chatError):
-        await MainActor.run {
-            if active(user) {
-                m.updateContact(contact)
-            }
-            processContactSubError(contact, chatError)
-        }
     case let .contactSubSummary(_, contactSubscriptions):
         await MainActor.run {
             for sub in contactSubscriptions {
@@ -1345,6 +1399,18 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 }
             }
         }
+    case let .networkStatus(status, connections):
+        await MainActor.run {
+            for cId in connections {
+                m.networkStatuses[cId] = status
+            }
+        }
+    case let .networkStatuses(_, statuses): ()
+        await MainActor.run {
+            for s in statuses {
+                m.networkStatuses[s.agentConnId] = s.networkStatus
+            }
+        }
     case let .newChatItem(user, aChatItem):
         let cInfo = aChatItem.chatInfo
         let cItem = aChatItem.chatItem
@@ -1357,7 +1423,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
         }
         if let file = cItem.autoReceiveFile() {
             Task {
-                await receiveFile(user: user, fileId: file.fileId, auto: true)
+                await receiveFile(user: user, fileId: file.fileId, encrypted: cItem.encryptLocalFile, auto: true)
             }
         }
         if cItem.showNotification {
@@ -1366,11 +1432,8 @@ func processReceivedMsg(_ res: ChatResponse) async {
     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 !cItem.isDeletedContent && active(user) {
+            await MainActor.run { m.updateChatItem(cInfo, cItem, status: cItem.meta.itemStatus) }
         }
         if let endTask = m.messageDelivery[cItem.id] {
             switch cItem.meta.itemStatus {
@@ -1422,6 +1485,16 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.removeChat(hostContact.activeConn.id)
             }
         }
+    case let .groupLinkConnecting(user, groupInfo, hostMember):
+        if !active(user) { return }
+        
+        await MainActor.run {
+            m.updateGroup(groupInfo)
+            if let hostConn = hostMember.activeConn {
+                m.dismissConnReqView(hostConn.id)
+                m.removeChat(hostConn.id)
+            }
+        }
     case let .joinedGroupMemberConnecting(user, groupInfo, _, member):
         if active(user) {
             await MainActor.run {
@@ -1481,10 +1554,17 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.updateGroup(toGroup)
             }
         }
-    case let .memberRole(user, groupInfo, _, _, _, _):
+    case let .memberRole(user, groupInfo, byMember: _, member: member, fromRole: _, toRole: _):
         if active(user) {
             await MainActor.run {
                 m.updateGroup(groupInfo)
+                _ = m.upsertGroupMember(groupInfo, member)
+            }
+        }
+    case let .newMemberContactReceivedInv(user, contact, _, _):
+        if active(user) {
+            await MainActor.run {
+                m.updateContact(contact)
             }
         }
     case let .rcvFileAccepted(user, aChatItem): // usually rcvFileAccepted is a response, but it's also an event for XFTP files auto-accepted from NSE
@@ -1518,7 +1598,9 @@ func processReceivedMsg(_ res: ChatResponse) async {
         await chatItemSimpleUpdate(user, aChatItem)
         Task { cleanupFile(aChatItem) }
     case let .callInvitation(invitation):
-        m.callInvitations[invitation.contact.id] = invitation
+        await MainActor.run {
+            m.callInvitations[invitation.contact.id] = invitation
+        }
         activateCall(invitation)
     case let .callOffer(_, contact, callType, offer, sharedKey, _):
         await withCall(contact) { call in
@@ -1585,11 +1667,11 @@ func processReceivedMsg(_ res: ChatResponse) async {
     }
 }
 
-func active(_ user: User) -> Bool {
-    user.id == ChatModel.shared.currentUser?.id
+func active(_ user: any UserLike) -> Bool {
+    user.userId == ChatModel.shared.currentUser?.id
 }
 
-func chatItemSimpleUpdate(_ user: User, _ aChatItem: AChatItem) async {
+func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
     let m = ChatModel.shared
     let cInfo = aChatItem.chatInfo
     let cItem = aChatItem.chatItem
@@ -1617,7 +1699,7 @@ func processContactSubError(_ contact: Contact, _ chatError: ChatError) {
     case .errorAgent(agentError: .SMP(smpErr: .AUTH)): err = "contact deleted"
     default: err = String(describing: chatError)
     }
-    m.setContactNetworkStatus(contact, .error(err))
+    m.setContactNetworkStatus(contact, .error(connectionError: err))
 }
 
 func refreshCallInvitations() throws {
@@ -1658,15 +1740,3 @@ 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/Model/SuspendChat.swift

@@ -19,7 +19,11 @@ let bgSuspendTimeout: Int = 5 // seconds
 let terminationTimeout: Int = 3 // seconds
 
 private func _suspendChat(timeout: Int) {
-    if ChatModel.ok {
+    // this is a redundant check to prevent logical errors, like the one fixed in this PR
+    let state = appStateGroupDefault.get()
+    if !state.canSuspend {
+        logger.error("_suspendChat called, current state: \(state.rawValue, privacy: .public)")
+    } else if ChatModel.ok {
         appStateGroupDefault.set(.suspending)
         apiSuspendChat(timeoutMicroseconds: timeout * 1000000)
         let endTask = beginBGTask(chatSuspended)
@@ -31,9 +35,7 @@ private func _suspendChat(timeout: Int) {
 
 func suspendChat() {
     suspendLockQueue.sync {
-        if appStateGroupDefault.get() != .stopped {
-            _suspendChat(timeout: appSuspendTimeout)
-        }
+        _suspendChat(timeout: appSuspendTimeout)
     }
 }
 
@@ -45,15 +47,25 @@ func suspendBgRefresh() {
     }
 }
 
+private var terminating = false
+
 func terminateChat() {
+    logger.debug("terminateChat")
     suspendLockQueue.sync {
         switch appStateGroupDefault.get() {
         case .suspending:
             // suspend instantly if already suspending
             _chatSuspended()
+            // when apiSuspendChat is called with timeout 0, it won't send any events on suspension
             if ChatModel.ok { apiSuspendChat(timeoutMicroseconds: 0) }
-        case .stopped: ()
+            chatCloseStore()
+        case .suspended:
+            chatCloseStore()
+        case .stopped:
+            chatCloseStore()
         default:
+            terminating = true
+            // the store will be closed in _chatSuspended when event is received
             _suspendChat(timeout: terminationTimeout)
         }
     }
@@ -73,10 +85,14 @@ private func _chatSuspended() {
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.stop()
     }
+    if terminating {
+         chatCloseStore()
+    }
 }
 
 func activateChat(appState: AppState = .active) {
     logger.debug("DEBUGGING: activateChat")
+    terminating = false
     suspendLockQueue.sync {
         appStateGroupDefault.set(appState)
         if ChatModel.ok { apiActivateChat() }
@@ -85,6 +101,7 @@ func activateChat(appState: AppState = .active) {
 }
 
 func initChatAndMigrate(refreshInvitations: Bool = true) {
+    terminating = false
     let m = ChatModel.shared
     if (!m.chatInitialized) {
         do {
@@ -97,6 +114,7 @@ func initChatAndMigrate(refreshInvitations: Bool = true) {
 }
 
 func startChatAndActivate() {
+    terminating = false
     logger.debug("DEBUGGING: startChatAndActivate")
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.start()

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

@@ -108,7 +108,6 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             try audioSession.setActive(true)
             logger.debug("audioSession activated")
         } catch {
-            print(error)
             logger.error("failed activating audio session")
         }
     }
@@ -121,7 +120,6 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             try audioSession.setActive(false)
             logger.debug("audioSession deactivated")
         } catch {
-            print(error)
             logger.error("failed deactivating audio session")
         }
         suspendOnEndCall()

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

@@ -99,12 +99,12 @@ struct ChatInfoView: View {
     @Binding var connectionCode: String?
     @FocusState private var aliasTextFieldFocused: Bool
     @State private var alert: ChatInfoViewAlert? = nil
+    @State private var showDeleteContactActionSheet = false
     @State private var sendReceipts = SendReceipts.userDefault(true)
     @State private var sendReceiptsUserDefault = true
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
     enum ChatInfoViewAlert: Identifiable {
-        case deleteContactAlert
         case clearChatAlert
         case networkStatusAlert
         case switchAddressAlert
@@ -114,7 +114,6 @@ struct ChatInfoView: View {
 
         var id: String {
             switch self {
-            case .deleteContactAlert: return "deleteContactAlert"
             case .clearChatAlert: return "clearChatAlert"
             case .networkStatusAlert: return "networkStatusAlert"
             case .switchAddressAlert: return "switchAddressAlert"
@@ -164,12 +163,13 @@ struct ChatInfoView: View {
 //                        synchronizeConnectionButtonForce()
 //                    }
                 }
+                .disabled(!contact.ready || !contact.active)
 
                 if let contactLink = contact.contactLink {
                     Section {
-                        QRCode(uri: contactLink)
+                        SimpleXLinkQRCode(uri: contactLink)
                         Button {
-                            showShareSheet(items: [contactLink])
+                            showShareSheet(items: [simplexChatLink(contactLink)])
                         } label: {
                             Label("Share address", systemImage: "square.and.arrow.up")
                         }
@@ -180,30 +180,32 @@ struct ChatInfoView: View {
                     }
                 }
 
-                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
+                if contact.ready && contact.active {
+                    Section("Servers") {
+                        networkStatusRow()
+                            .onTapGesture {
+                                alert = .networkStatusAlert
+                            }
+                        if let connStats = connectionStats {
+                            Button("Change receiving address") {
+                                alert = .switchAddressAlert
                             }
                             .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
+                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                                 || 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 })
                     }
                 }
 
@@ -230,7 +232,6 @@ struct ChatInfoView: View {
         }
         .alert(item: $alert) { alertItem in
             switch(alertItem) {
-            case .deleteContactAlert: return deleteContactAlert()
             case .clearChatAlert: return clearChatAlert()
             case .networkStatusAlert: return networkStatusAlert()
             case .switchAddressAlert: return switchAddressAlert(switchContactAddress)
@@ -239,6 +240,26 @@ struct ChatInfoView: View {
             case let .error(title, error): return mkAlert(title: title, message: error)
             }
         }
+        .actionSheet(isPresented: $showDeleteContactActionSheet) {
+            if contact.ready && contact.active {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete and notify contact")) { deleteContact(notify: true) },
+                        .destructive(Text("Delete")) { deleteContact(notify: false) },
+                        .cancel()
+                    ]
+                )
+            } else {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete")) { deleteContact() },
+                        .cancel()
+                    ]
+                )
+            }
+        }
     }
 
     private func contactInfoHeader() -> some View {
@@ -411,7 +432,7 @@ struct ChatInfoView: View {
 
     private func deleteContactButton() -> some View {
         Button(role: .destructive) {
-            alert = .deleteContactAlert
+            showDeleteContactActionSheet = true
         } label: {
             Label("Delete contact", systemImage: "trash")
                 .foregroundColor(Color.red)
@@ -427,30 +448,23 @@ struct ChatInfoView: View {
         }
     }
 
-    private func deleteContactAlert() -> Alert {
-        Alert(
-            title: Text("Delete contact?"),
-            message: Text("Contact and all messages will be deleted - this cannot be undone!"),
-            primaryButton: .destructive(Text("Delete")) {
-                Task {
-                    do {
-                        try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
-                        await MainActor.run {
-                            chatModel.removeChat(chat.chatInfo.id)
-                            chatModel.chatId = nil
-                            dismiss()
-                        }
-                    } catch let error {
-                        logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
-                        let a = getErrorAlert(error, "Error deleting contact")
-                        await MainActor.run {
-                            alert = .error(title: a.title, error: a.message)
-                        }
-                    }
+    private func deleteContact(notify: Bool? = nil) {
+        Task {
+            do {
+                try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, notify: notify)
+                await MainActor.run {
+                    dismiss()
+                    chatModel.chatId = nil
+                    chatModel.removeChat(chat.chatInfo.id)
                 }
-            },
-            secondaryButton: .cancel()
-        )
+            } catch let error {
+                logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
+                let a = getErrorAlert(error, "Error deleting contact")
+                await MainActor.run {
+                    alert = .error(title: a.title, error: a.message)
+                }
+            }
+        }
     }
 
     private func clearChatAlert() -> Alert {

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

@@ -11,7 +11,7 @@ import SimpleXChat
 
 struct CICallItemView: View {
     @EnvironmentObject var m: ChatModel
-    var chatInfo: ChatInfo
+    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var status: CICallStatus
     var duration: Int
@@ -60,7 +60,7 @@ struct CICallItemView: View {
 
 
     @ViewBuilder private func acceptCallButton() -> some View {
-        if case let .direct(contact) = chatInfo {
+        if case let .direct(contact) = chat.chatInfo {
             Button {
                 if let invitation = m.callInvitations[contact.id] {
                     CallController.shared.answerCall(invitation: invitation)

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

@@ -10,20 +10,92 @@ import SwiftUI
 import SimpleXChat
 
 struct CIChatFeatureView: View {
+    @EnvironmentObject var m: ChatModel
     var chatItem: ChatItem
+    @Binding var revealed: Bool
     var feature: Feature
     var icon: String? = nil
     var iconColor: Color
 
     var body: some View {
+        if !revealed, let fs = mergedFeautures() {
+            HStack {
+                ForEach(fs, content: featureIconView)
+            }
+            .padding(.horizontal, 6)
+            .padding(.vertical, 6)
+        } else {
+            fullFeatureView
+        }
+    }
+
+    private struct FeatureInfo: Identifiable {
+        var icon: String
+        var scale: CGFloat
+        var color: Color
+        var param: String?
+
+        init(_ f: Feature, _ color: Color, _ param: Int?) {
+            self.icon = f.iconFilled
+            self.scale = f.iconScale
+            self.color = color
+            self.param = f.hasParam && param != nil ? timeText(param) : nil
+        }
+
+        var id: String {
+            "\(icon) \(color) \(param ?? "")"
+        }
+    }
+
+    private func mergedFeautures() -> [FeatureInfo]? {
+        var fs: [FeatureInfo] = []
+        var icons: Set<String> = []
+        if var i = m.getChatItemIndex(chatItem) {
+            while i < m.reversedChatItems.count,
+                  let f = featureInfo(m.reversedChatItems[i]) {
+                if !icons.contains(f.icon) {
+                    fs.insert(f, at: 0)
+                    icons.insert(f.icon)
+                }
+                i += 1
+            }
+        }
+        return fs.count > 1 ? fs : nil
+    }
+
+    private func featureInfo(_ ci: ChatItem) -> FeatureInfo? {
+        switch ci.content {
+        case let .rcvChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
+        case let .sndChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
+        case let .rcvGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
+        case let .sndGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
+        default: nil
+        }
+    }
+
+    @ViewBuilder private func featureIconView(_ f: FeatureInfo) -> some View {
+        let i = Image(systemName: f.icon)
+            .foregroundColor(f.color)
+            .scaleEffect(f.scale)
+        if let param = f.param {
+            HStack {
+                i
+                chatEventText(Text(param)).lineLimit(1)
+            }
+        } else {
+            i
+        }
+    }
+
+    private var fullFeatureView: some View {
         HStack(alignment: .bottom, spacing: 4) {
             Image(systemName: icon ?? feature.iconFilled)
                 .foregroundColor(iconColor)
                 .scaleEffect(feature.iconScale)
             chatEventText(chatItem)
         }
-        .padding(.leading, 6)
-        .padding(.bottom, 6)
+        .padding(.horizontal, 6)
+        .padding(.vertical, 4)
         .textSelection(.disabled)
     }
 }
@@ -31,6 +103,6 @@ struct CIChatFeatureView: View {
 struct CIChatFeatureView_Previews: PreviewProvider {
     static var previews: some View {
         let enabled = FeatureEnabled(forUser: false, forContact: false)
-        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
+        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
     }
 }

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

@@ -13,11 +13,9 @@ struct CIEventView: View {
     var eventText: Text
 
     var body: some View {
-        HStack(alignment: .bottom, spacing: 0) {
-            eventText
-        }
-        .padding(.leading, 6)
-        .padding(.bottom, 6)
+        eventText
+        .padding(.horizontal, 6)
+        .padding(.vertical, 4)
         .textSelection(.disabled)
     }
 }

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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct CIFeaturePreferenceView: View {
-    @EnvironmentObject var chat: Chat
+    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var feature: ChatFeature
     var allowed: FeatureAllowed
@@ -80,7 +80,6 @@ struct CIFeaturePreferenceView_Previews: PreviewProvider {
             quotedItem: nil,
             file: nil
         )
-        CIFeaturePreferenceView(chatItem: chatItem, feature: ChatFeature.timedMessages, allowed: .yes, param: 30)
-            .environmentObject(Chat.sampleData)
+        CIFeaturePreferenceView(chat: Chat.sampleData, chatItem: chatItem, feature: ChatFeature.timedMessages, allowed: .yes, param: 30)
     }
 }

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

@@ -10,14 +10,15 @@ import SwiftUI
 import SimpleXChat
 
 struct CIFileView: View {
+    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     let file: CIFile?
     let edited: Bool
 
     var body: some View {
         let metaReserve = edited
-        ? "                         "
-        : "                     "
+        ? "                           "
+        : "                       "
         Button(action: fileAction) {
             HStack(alignment: .bottom, spacing: 6) {
                 fileIndicator()
@@ -83,8 +84,9 @@ struct CIFileView: View {
                 if fileSizeValid() {
                     Task {
                         logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
-                        if let user = ChatModel.shared.currentUser {
-                            await receiveFile(user: user, fileId: file.fileId)
+                        if let user = m.currentUser {
+                            let encrypted = privacyEncryptLocalFilesGroupDefault.get()
+                            await receiveFile(user: user, fileId: file.fileId, encrypted: encrypted)
                         }
                     }
                 } else {
@@ -109,9 +111,8 @@ struct CIFileView: View {
                 }
             case .rcvComplete:
                 logger.debug("CIFileView fileAction - in .rcvComplete")
-                if let filePath = getLoadedFilePath(file) {
-                    let url = URL(fileURLWithPath: filePath)
-                    showShareSheet(items: [url])
+                if let fileSource = getLoadedFileSource(file) {
+                    saveCryptoFile(fileSource)
                 }
             default: break
             }
@@ -193,6 +194,30 @@ 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(
@@ -210,18 +235,17 @@ struct CIFileView_Previews: PreviewProvider {
             file: nil
         )
         Group {
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentFile, revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: sentFile, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
         }
         .previewLayout(.fixed(width: 360, height: 360))
-        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -17,34 +17,45 @@ struct CIGroupInvitationView: View {
     var memberRole: GroupMemberRole
     var chatIncognito: Bool = false
     @State private var frameWidth: CGFloat = 0
+    @State private var inProgress = false
+    @State private var progressByTimeout = false
 
     var body: some View {
         let action = !chatItem.chatDir.sent && groupInvitation.status == .pending
         let v = ZStack(alignment: .bottomTrailing) {
-            VStack(alignment: .leading) {
-                groupInfoView(action)
-                .padding(.horizontal, 2)
-                .padding(.top, 8)
-                .padding(.bottom, 6)
-                .overlay(DetermineWidth())
+            ZStack {
+                VStack(alignment: .leading) {
+                    groupInfoView(action)
+                        .padding(.horizontal, 2)
+                        .padding(.top, 8)
+                        .padding(.bottom, 6)
+                        .overlay(DetermineWidth())
 
-                Divider().frame(width: frameWidth)
+                    Divider().frame(width: frameWidth)
 
-                if action {
-                    groupInvitationText()
-                        .overlay(DetermineWidth())
-                    Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
-                        .foregroundColor(chatIncognito ? .indigo : .accentColor)
-                        .font(.callout)
-                        .padding(.trailing, 60)
-                        .overlay(DetermineWidth())
-                } else {
-                    groupInvitationText()
-                        .padding(.trailing, 60)
-                        .overlay(DetermineWidth())
+                    if action {
+                        VStack(alignment: .leading, spacing: 2) {
+                            groupInvitationText()
+                                .overlay(DetermineWidth())
+                            Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
+                                .foregroundColor(inProgress ? .secondary : chatIncognito ? .indigo : .accentColor)
+                                .font(.callout)
+                                .padding(.trailing, 60)
+                                .overlay(DetermineWidth())
+                        }
+                    } else {
+                        groupInvitationText()
+                            .padding(.trailing, 60)
+                            .overlay(DetermineWidth())
+                    }
+                }
+                .padding(.bottom, 2)
+
+                if progressByTimeout {
+                    ProgressView().scaleEffect(2)
                 }
             }
-            .padding(.bottom, 2)
+
             chatItem.timestampText
                 .font(.caption)
                 .foregroundColor(.secondary)
@@ -55,11 +66,24 @@ struct CIGroupInvitationView: View {
         .cornerRadius(18)
         .textSelection(.disabled)
         .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
+        .onChange(of: inProgress) { inProgress in
+            if inProgress {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                    progressByTimeout = inProgress
+                }
+            } else {
+                progressByTimeout = false
+            }
+        }
 
         if action {
             v.onTapGesture {
-                joinGroup(groupInvitation.groupId)
+                inProgress = true
+                joinGroup(groupInvitation.groupId) {
+                    await MainActor.run { inProgress = false }
+                }
             }
+            .disabled(inProgress)
         } else {
             v
         }
@@ -67,7 +91,7 @@ struct CIGroupInvitationView: View {
 
     private func groupInfoView(_ action: Bool) -> some View {
         var color: Color
-        if action {
+        if action && !inProgress {
             color = chatIncognito ? .indigo : .accentColor
         } else {
             color = Color(uiColor: .tertiaryLabel)

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

@@ -10,12 +10,14 @@ import SwiftUI
 import SimpleXChat
 
 struct CIImageView: View {
+    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     let chatItem: ChatItem
     let image: String
     let maxWidth: CGFloat
     @Binding var imgWidth: CGFloat?
     @State var scrollProxy: ScrollViewProxy?
+    @State var metaColor: Color
     @State private var showFullScreenImage = false
 
     var body: some View {
@@ -35,10 +37,9 @@ struct CIImageView: View {
                             switch file.fileStatus {
                             case .rcvInvitation:
                                 Task {
-                                    if let user = ChatModel.shared.currentUser {
-                                        await receiveFile(user: user, fileId: file.fileId)
+                                    if let user = m.currentUser {
+                                        await receiveFile(user: user, fileId: file.fileId, encrypted: chatItem.encryptLocalFile)
                                     }
-                                    // TODO image accepted alert?
                                 }
                             case .rcvAccepted:
                                 switch file.fileProtocol {
@@ -110,7 +111,7 @@ struct CIImageView: View {
             .resizable()
             .aspectRatio(contentMode: .fit)
             .frame(width: size, height: size)
-            .foregroundColor(.white)
+            .foregroundColor(metaColor)
             .padding(padding)
     }
 

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

@@ -0,0 +1,80 @@
+//
+//  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 {
+    @EnvironmentObject var m: ChatModel
+    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 {
+                                m.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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct CIMetaView: View {
-    @EnvironmentObject var chat: Chat
+    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var metaColor = Color.secondary
     var paleMetaColor = Color(UIColor.tertiaryLabel)
@@ -21,27 +21,28 @@ 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, color: metaColor, sent: .sent)
-                case .partial: ciMetaText(meta, chatTTL: ttl, color: paleMetaColor, sent: .sent)
+                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, color: metaColor, sent: .rcvd1)
-                        ciMetaText(meta, chatTTL: ttl, color: metaColor, sent: .rcvd2)
+                        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, color: paleMetaColor, sent: .rcvd1)
-                        ciMetaText(meta, chatTTL: ttl, color: paleMetaColor, sent: .rcvd2)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2)
                     }
                 }
             default:
-                ciMetaText(meta, chatTTL: ttl, color: metaColor)
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor)
             }
         }
     }
@@ -53,7 +54,7 @@ enum SentCheckmark {
     case rcvd2
 }
 
-func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
+func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
     var r = Text("")
     if meta.itemEdited {
         r = r + statusIconText("pencil", color)
@@ -80,7 +81,11 @@ func ciMetaText(_ meta: CIMeta, chatTTL: Int?, color: Color = .clear, transparen
     } else if !meta.disappearing {
         r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
     }
-    return (r + meta.timestampText.foregroundColor(color)).font(.caption)
+    if let enc = encrypted {
+        r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
+    }
+    r = r + meta.timestampText.foregroundColor(color)
+    return r.font(.caption)
 }
 
 private func statusIconText(_ icon: String, _ color: Color) -> Text {
@@ -90,15 +95,14 @@ 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.getDeletedContentSample())
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
         }
         .previewLayout(.fixed(width: 360, height: 100))
-        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -12,7 +12,8 @@ import SimpleXChat
 let decryptErrorReason: LocalizedStringKey = "It can happen when you or your connection used the old database backup."
 
 struct CIRcvDecryptionError: View {
-    @EnvironmentObject var chat: Chat
+    @EnvironmentObject var m: ChatModel
+    @ObservedObject var chat: Chat
     var msgDecryptError: MsgDecryptError
     var msgCount: UInt32
     var chatItem: ChatItem
@@ -45,7 +46,7 @@ struct CIRcvDecryptionError: View {
                     do {
                         let (member, stats) = try apiGroupMemberInfo(groupInfo.apiId, groupMember.groupMemberId)
                         if let s = stats {
-                            ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, member, s)
+                            m.updateGroupMemberConnectionStats(groupInfo, member, s)
                         }
                     } catch let error {
                         logger.error("apiGroupMemberInfo error: \(responseError(error))")
@@ -79,8 +80,8 @@ struct CIRcvDecryptionError: View {
             }
         } else if case let .group(groupInfo) = chat.chatInfo,
                   case let .groupRcv(groupMember) = chatItem.chatDir,
-                  let modelMember = ChatModel.shared.groupMembers.first(where: { $0.id == groupMember.id }),
-                  let memberStats = modelMember.activeConn?.connectionStats {
+                  let mem = m.getGroupMember(groupMember.groupMemberId),
+                  let memberStats = mem.wrapped.activeConn?.connectionStats {
             if memberStats.ratchetSyncAllowed {
                 decryptionErrorItemFixButton(syncSupported: true) {
                     alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
@@ -118,11 +119,11 @@ struct CIRcvDecryptionError: View {
                         .foregroundColor(syncSupported ? .accentColor : .secondary)
                         .font(.callout)
                     + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
                 )
             }
             .padding(.horizontal, 12)
-            CIMetaView(chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
@@ -139,10 +140,10 @@ struct CIRcvDecryptionError: View {
                     .foregroundColor(.red)
                     .italic()
                 + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, transparent: true)
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
             }
             .padding(.horizontal, 12)
-            CIMetaView(chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
@@ -173,7 +174,7 @@ struct CIRcvDecryptionError: View {
             do {
                 let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, false)
                 await MainActor.run {
-                    ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, mem, stats)
+                    m.updateGroupMemberConnectionStats(groupInfo, mem, stats)
                 }
             } catch let error {
                 logger.error("syncMemberConnection apiSyncGroupMemberRatchet error: \(responseError(error))")
@@ -190,7 +191,7 @@ struct CIRcvDecryptionError: View {
             do {
                 let stats = try apiSyncContactRatchet(contact.apiId, false)
                 await MainActor.run {
-                    ChatModel.shared.updateContactConnectionStats(contact, stats)
+                    m.updateContactConnectionStats(contact, stats)
                 }
             } catch let error {
                 logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")

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

@@ -11,6 +11,7 @@ import AVKit
 import SimpleXChat
 
 struct CIVideoView: View {
+    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     private let chatItem: ChatItem
     private let image: String
@@ -22,6 +23,7 @@ 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
@@ -36,6 +38,7 @@ 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)),
@@ -57,7 +60,7 @@ struct CIVideoView: View {
                         if let file = file {
                             switch file.fileStatus {
                             case .rcvInvitation:
-                                receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                                receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
                             case .rcvAccepted:
                                 switch file.fileProtocol {
                                 case .xftp:
@@ -83,7 +86,7 @@ struct CIVideoView: View {
             }
             if let file = file, case .rcvInvitation = file.fileStatus {
                 Button {
-                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                    receiveFileIfValidSize(file: file, encrypted: false, receiveFile: receiveFile)
                 } label: {
                     playPauseIcon("play.fill")
                 }
@@ -96,9 +99,10 @@ 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
+                .onChange(of: m.stopPreviousRecPlay) { playingUrl in
                     if playingUrl != url {
                         player.pause()
                         videoPlaying = false
@@ -113,17 +117,20 @@ struct CIVideoView: View {
                         player.pause()
                         videoPlaying = false
                     case .paused:
-                        showFullScreenPlayer = true
+                        if canBePlayed {
+                            showFullScreenPlayer = true
+                        }
                     default: ()
                     }
                 }
                 if !videoPlaying {
                     Button {
-                        ChatModel.shared.stopPreviousRecPlay = url
+                        m.stopPreviousRecPlay = url
                         player.play()
                     } label: {
-                        playPauseIcon("play.fill")
+                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
                     }
+                    .disabled(!canBePlayed)
                 }
             }
             loadingIndicator()
@@ -247,10 +254,11 @@ struct CIVideoView: View {
         .padding([.trailing, .top], 11)
     }
 
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) async -> Void) {
+    // TODO encrypt: where file size is checked?
+    private func receiveFileIfValidSize(file: CIFile, encrypted: Bool, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
         Task {
-            if let user = ChatModel.shared.currentUser {
-                await receiveFile(user, file.fileId, false)
+            if let user = m.currentUser {
+                await receiveFile(user, file.fileId, encrypted, false)
             }
         }
     }
@@ -258,8 +266,7 @@ struct CIVideoView: View {
     private func fullScreenPlayer(_ url: URL) -> some View {
         ZStack {
             Color.black.edgesIgnoringSafeArea(.all)
-            VideoPlayer(player: createFullScreenPlayerAndPlay(url)) {
-            }
+            VideoPlayer(player: fullPlayer)
             .overlay(alignment: .topLeading, content: {
                 Button(action: { showFullScreenPlayer = false },
                     label: {
@@ -282,28 +289,29 @@ struct CIVideoView: View {
                     }
                 }
             )
+            .onAppear {
+                DispatchQueue.main.asyncAfter(deadline: .now()) {
+                    m.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

@@ -10,6 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct CIVoiceView: View {
+    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     let recordingFile: CIFile?
     let duration: Int
@@ -91,7 +92,7 @@ struct CIVoiceView: View {
     }
 
     private func metaView() -> some View {
-        CIMetaView(chatItem: chatItem)
+        CIMetaView(chat: chat, chatItem: chatItem)
     }
 }
 
@@ -159,7 +160,8 @@ struct VoiceMessagePlayer: View {
             }
         }
         .onChange(of: chatModel.stopPreviousRecPlay) { it in
-            if let recordingFileName = getLoadedFileName(recordingFile), chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
+            if let recordingFileName = getLoadedFileSource(recordingFile)?.filePath,
+               chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
                 audioPlayer?.stop()
                 playbackState = .noPlayback
                 playbackTime = TimeInterval(0)
@@ -174,8 +176,8 @@ struct VoiceMessagePlayer: View {
         switch playbackState {
         case .noPlayback:
             Button {
-                if let recordingFileName = getLoadedFileName(recordingFile) {
-                    startPlayback(recordingFileName)
+                if let recordingSource = getLoadedFileSource(recordingFile) {
+                    startPlayback(recordingSource)
                 }
             } label: {
                 playPauseIcon("play.fill")
@@ -218,8 +220,8 @@ struct VoiceMessagePlayer: View {
     private func downloadButton(_ recordingFile: CIFile) -> some View {
         Button {
             Task {
-                if let user = ChatModel.shared.currentUser {
-                    await receiveFile(user: user, fileId: recordingFile.fileId)
+                if let user = chatModel.currentUser {
+                    await receiveFile(user: user, fileId: recordingFile.fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get())
                 }
             }
         } label: {
@@ -251,8 +253,8 @@ struct VoiceMessagePlayer: View {
             .clipShape(Circle())
     }
 
-    private func startPlayback(_ recordingFileName: String) {
-        chatModel.stopPreviousRecPlay = getAppFilePath(recordingFileName)
+    private func startPlayback(_ recordingSource: CryptoFile) {
+        chatModel.stopPreviousRecPlay = getAppFilePath(recordingSource.filePath)
         audioPlayer = AudioPlayer(
             onTimer: { playbackTime = $0 },
             onFinishPlayback: {
@@ -260,7 +262,7 @@ struct VoiceMessagePlayer: View {
                 playbackTime = TimeInterval(0)
             }
         )
-        audioPlayer?.start(fileName: recordingFileName, at: playbackTime)
+        audioPlayer?.start(fileSource: recordingSource, at: playbackTime)
         playbackState = .playing
     }
 }
@@ -283,6 +285,7 @@ struct CIVoiceView_Previews: PreviewProvider {
         )
         Group {
             CIVoiceView(
+                chat: Chat.sampleData,
                 chatItem: ChatItem.getVoiceMsgContentSample(),
                 recordingFile: CIFile.getSample(fileName: "voice.m4a", fileSize: 65536, fileStatus: .rcvComplete),
                 duration: 30,
@@ -291,12 +294,11 @@ struct CIVoiceView_Previews: PreviewProvider {
                 playbackTime: .constant(TimeInterval(20)),
                 allowMenu: Binding.constant(true)
             )
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
         }
         .previewLayout(.fixed(width: 360, height: 360))
-        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct DeletedItemView: View {
     @Environment(\.colorScheme) var colorScheme
+    @ObservedObject var chat: Chat
     var chatItem: ChatItem
 
     var body: some View {
@@ -18,7 +19,7 @@ struct DeletedItemView: View {
             Text(chatItem.content.text)
                 .foregroundColor(.secondary)
                 .italic()
-            CIMetaView(chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .padding(.leading, 12)
@@ -32,8 +33,8 @@ struct DeletedItemView: View {
 struct DeletedItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            DeletedItemView(chatItem: ChatItem.getDeletedContentSample())
-            DeletedItemView(chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
+            DeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
+            DeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(dir: .groupRcv(groupMember: GroupMember.sampleData)))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -10,6 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct EmojiItemView: View {
+    @ObservedObject var chat: Chat
     var chatItem: ChatItem
 
     var body: some View {
@@ -17,7 +18,7 @@ struct EmojiItemView: View {
             emojiText(chatItem.content.text)
                 .padding(.top, 8)
                 .padding(.horizontal, 6)
-            CIMetaView(chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem)
                 .padding(.bottom, 8)
                 .padding(.horizontal, 12)
         }
@@ -32,8 +33,8 @@ 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(2, .directRcv, .now, "👍"))
+            EmojiItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete)))
+            EmojiItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "👍"))
         }
         .previewLayout(.fixed(width: 360, height: 70))
     }

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

@@ -88,13 +88,12 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
             file: CIFile.getSample(fileStatus: .sndComplete)
         )
         Group {
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
         }
         .previewLayout(.fixed(width: 360, height: 360))
-        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -150,7 +150,7 @@ struct FullScreenMediaView: View {
 
     private func startPlayerAndNotify() {
         if let player = player {
-            ChatModel.shared.stopPreviousRecPlay = url
+            m.stopPreviousRecPlay = url
             player.play()
         }
     }

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

@@ -10,11 +10,12 @@ import SwiftUI
 import SimpleXChat
 
 struct IntegrityErrorItemView: View {
+    @ObservedObject var chat: Chat
     var msgError: MsgErrorType
     var chatItem: ChatItem
 
     var body: some View {
-        CIMsgError(chatItem: chatItem) {
+        CIMsgError(chat: chat, chatItem: chatItem) {
             switch msgError {
             case .msgSkipped:
                 AlertManager.shared.showAlertMsg(
@@ -52,6 +53,7 @@ struct IntegrityErrorItemView: View {
 }
 
 struct CIMsgError: View {
+    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var onTap: () -> Void
 
@@ -60,7 +62,7 @@ struct CIMsgError: View {
             Text(chatItem.content.text)
                 .foregroundColor(.red)
                 .italic()
-            CIMetaView(chatItem: chatItem)
+            CIMetaView(chat: chat, chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .padding(.leading, 12)
@@ -74,6 +76,6 @@ struct CIMsgError: View {
 
 struct IntegrityErrorItemView_Previews: PreviewProvider {
     static var previews: some View {
-        IntegrityErrorItemView(msgError: .msgBadHash, chatItem: ChatItem.getIntegrityErrorSample())
+        IntegrityErrorItemView(chat: Chat.sampleData, msgError: .msgBadHash, chatItem: ChatItem.getIntegrityErrorSample())
     }
 }

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

@@ -10,39 +10,70 @@ import SwiftUI
 import SimpleXChat
 
 struct MarkedDeletedItemView: View {
+    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
+    @ObservedObject var chat: Chat
     var chatItem: ChatItem
+    @Binding var revealed: Bool
 
     var body: some View {
-        HStack(alignment: .bottom, spacing: 0) {
-            if case let .moderated(_, byGroupMember) = chatItem.meta.itemDeleted {
-                markedDeletedText("moderated by \(byGroupMember.chatViewName)")
-            } else {
-                markedDeletedText("marked deleted")
-            }
-            CIMetaView(chatItem: chatItem)
-                .padding(.horizontal, 12)
-        }
-        .padding(.leading, 12)
+        (Text(mergedMarkedDeletedText).italic() + Text(" ") + chatItem.timestampText)
+        .font(.caption)
+        .foregroundColor(.secondary)
+        .padding(.horizontal, 12)
         .padding(.vertical, 6)
         .background(chatItemFrameColor(chatItem, colorScheme))
         .cornerRadius(18)
         .textSelection(.disabled)
     }
 
-    func markedDeletedText(_ s: LocalizedStringKey) -> some View {
-        Text(s)
-            .font(.caption)
-            .foregroundColor(.secondary)
-            .italic()
-            .lineLimit(1)
+    var mergedMarkedDeletedText: LocalizedStringKey {
+        if !revealed,
+           let ciCategory = chatItem.mergeCategory,
+           var i = m.getChatItemIndex(chatItem) {
+            var moderated = 0
+            var blocked = 0
+            var deleted = 0
+            var moderatedBy: Set<String> = []
+            while i < m.reversedChatItems.count,
+                  let ci = .some(m.reversedChatItems[i]),
+                  ci.mergeCategory == ciCategory,
+                  let itemDeleted = ci.meta.itemDeleted {
+                switch itemDeleted {
+                case let .moderated(_, byGroupMember):
+                    moderated += 1
+                    moderatedBy.insert(byGroupMember.displayName)
+                case .blocked: blocked += 1
+                case .deleted: deleted += 1
+                }
+                i += 1
+            }
+            let total = moderated + blocked + deleted
+            return total <= 1
+            ? markedDeletedText
+            : total == moderated
+            ? "\(total) messages moderated by \(moderatedBy.joined(separator: ", "))"
+            : total == blocked
+            ? "\(total) messages blocked"
+            : "\(total) messages marked deleted"
+        } else {
+            return markedDeletedText
+        }
+    }
+
+    var markedDeletedText: LocalizedStringKey {
+        switch chatItem.meta.itemDeleted {
+        case let .moderated(_, byGroupMember): "moderated by \(byGroupMember.displayName)"
+        case .blocked: "blocked"
+        default: "marked deleted"
+        }
     }
 }
 
 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(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -25,7 +25,7 @@ private func typing(_ w: Font.Weight = .light) -> Text {
 }
 
 struct MsgContentView: View {
-    @EnvironmentObject var chat: Chat
+    @ObservedObject var chat: Chat
     var text: String
     var formattedText: [FormattedText]? = nil
     var sender: String? = nil
@@ -80,7 +80,7 @@ struct MsgContentView: View {
     }
 
     private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, transparent: true)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true)
     }
 }
 
@@ -121,13 +121,11 @@ private func formatText(_ ft: FormattedText, _ preview: Bool) -> Text {
         case .secret: return Text(t).foregroundColor(.clear).underline(color: .primary)
         case let .colored(color): return Text(t).foregroundColor(color.uiColor)
         case .uri: return linkText(t, t, preview, prefix: "")
-        case let .simplexLink(linkType, simplexUri, trustedUri, smpHosts):
+        case let .simplexLink(linkType, simplexUri, smpHosts):
             switch privacySimplexLinkModeDefault.get() {
             case .description: return linkText(simplexLinkText(linkType, smpHosts), simplexUri, preview, prefix: "")
             case .full: return linkText(t, simplexUri, preview, prefix: "")
-            case .browser: return trustedUri
-                                    ? linkText(t, t, preview, prefix: "")
-                                    : linkText(t, t, preview, prefix: "", color: .red, uiColor: .red)
+            case .browser: return linkText(t, simplexUri, preview, prefix: "")
             }
         case .email: return linkText(t, t, preview, prefix: "mailto:")
         case .phone: return linkText(t, t.replacingOccurrences(of: " ", with: ""), preview, prefix: "tel:")
@@ -154,6 +152,7 @@ struct MsgContentView_Previews: PreviewProvider {
     static var previews: some View {
         let chatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
         return MsgContentView(
+            chat: Chat.sampleData,
             text: chatItem.text,
             formattedText: chatItem.formattedText,
             sender: chatItem.memberDisplayName,

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

@@ -10,6 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatItemInfoView: View {
+    @EnvironmentObject var chatModel: ChatModel
     @Environment(\.colorScheme) var colorScheme
     var ci: ChatItem
     @Binding var chatItemInfo: ChatItemInfo?
@@ -290,8 +291,8 @@ struct ChatItemInfoView: View {
 
     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)
+            if let mem = chatModel.getGroupMember(mds.groupMemberId) {
+                return (mem.wrapped, mds.memberDeliveryStatus)
             } else {
                 return nil
             }

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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatItemView: View {
-    var chatInfo: ChatInfo
+    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var maxWidth: CGFloat = .infinity
     @State var scrollProxy: ScrollViewProxy? = nil
@@ -19,8 +19,19 @@ struct ChatItemView: View {
     @Binding var audioPlayer: AudioPlayer?
     @Binding var playbackState: VoiceMessagePlaybackState
     @Binding var playbackTime: TimeInterval?
-    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
+    init(
+        chat: Chat,
+        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.chat = chat
         self.chatItem = chatItem
         self.maxWidth = maxWidth
         _scrollProxy = .init(initialValue: scrollProxy)
@@ -33,15 +44,15 @@ struct ChatItemView: View {
 
     var body: some View {
         let ci = chatItem
-        if chatItem.meta.itemDeleted != nil && !revealed {
-            MarkedDeletedItemView(chatItem: chatItem)
+        if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
+            MarkedDeletedItemView(chat: chat, chatItem: chatItem, revealed: $revealed)
         } 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)
+                EmojiItemView(chat: chat, 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)
+                CIVoiceView(chat: chat, 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(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
             } else {
                 framedItemView()
             }
@@ -51,15 +62,17 @@ 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(chat: chat, chatItem: chatItem, revealed: $revealed, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
     }
 }
 
 struct ChatItemContentView<Content: View>: View {
     @EnvironmentObject var chatModel: ChatModel
-    var chatInfo: ChatInfo
+    @ObservedObject var chat: Chat
     var chatItem: ChatItem
+    @Binding var revealed: Bool
     var msgContentView: () -> Content
+    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
     var body: some View {
         switch chatItem.content {
@@ -69,11 +82,17 @@ 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):
+            if developerTools {
+                IntegrityErrorItemView(chat: chat, msgError: msgError, chatItem: chatItem)
+            } else {
+                ZStack {}
+            }
+        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(chat: chat, msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
         case let .rcvGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
         case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
-        case .rcvGroupEvent(.memberConnected): CIEventView(eventText: membersConnectedItemText)
+        case .rcvDirectEvent: eventItemView()
+        case .rcvGroupEvent(.memberCreatedContact): CIMemberCreatedContactView(chatItem: chatItem)
         case .rcvGroupEvent: eventItemView()
         case .sndGroupEvent: eventItemView()
         case .rcvConnEvent: eventItemView()
@@ -81,9 +100,9 @@ struct ChatItemContentView<Content: View>: View {
         case let .rcvChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
         case let .sndChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
         case let .rcvChatPreference(feature, allowed, param):
-            CIFeaturePreferenceView(chatItem: chatItem, feature: feature, allowed: allowed, param: param)
+            CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
         case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chatItem: chatItem, feature: feature, icon: feature.icon, iconColor: .secondary)
+            CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: .secondary)
         case let .rcvGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
         case let .sndGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
         case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
@@ -95,15 +114,15 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func deletedItemView() -> some View {
-        DeletedItemView(chatItem: chatItem)
+        DeletedItemView(chat: chat, chatItem: chatItem)
     }
 
     private func callItemView(_ status: CICallStatus, _ duration: Int) -> some View {
-        CICallItemView(chatInfo: chatInfo, chatItem: chatItem, status: status, duration: duration)
+        CICallItemView(chat: chat, chatItem: chatItem, status: status, duration: duration)
     }
 
     private func groupInvitationItemView(_ groupInvitation: CIGroupInvitation, _ memberRole: GroupMemberRole) -> some View {
-        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chatInfo.incognito)
+        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chat.chatInfo.incognito)
     }
 
     private func eventItemView() -> some View {
@@ -111,7 +130,9 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func eventItemViewText() -> Text {
-        if let member = chatItem.memberDisplayName {
+        if !revealed, let t = mergedGroupEventText {
+            return chatEventText(t + Text(" ") + chatItem.timestampText)
+        } else if let member = chatItem.memberDisplayName {
             return Text(member + " ")
                     .font(.caption)
                     .foregroundColor(.secondary)
@@ -123,36 +144,44 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
-        CIChatFeatureView(chatItem: chatItem, feature: feature, iconColor: iconColor)
+        CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, iconColor: iconColor)
     }
 
-    private var membersConnectedItemText: Text {
-        if let t = membersConnectedText {
-            return chatEventText(t, chatItem.timestampText)
+    private var mergedGroupEventText: Text? {
+        let (count, ns) = chatModel.getConnectedMemberNames(chatItem)
+        let members: LocalizedStringKey =
+            switch ns.count {
+            case 1: "\(ns[0]) connected"
+            case 2: "\(ns[0]) and \(ns[1]) connected"
+            case 3: "\(ns[0] + ", " + ns[1]) and \(ns[2]) connected"
+            default:
+                ns.count > 3
+                ? "\(ns[0]), \(ns[1]) and \(ns.count - 2) other members connected"
+                : ""
+            }
+        return if count <= 1 {
+            nil
+        } else if ns.count == 0 {
+            Text("\(count) group events")
+        } else if count > ns.count {
+            Text(members) + Text(" ") + Text("and \(count - ns.count) other events")
         } else {
-            return eventItemViewText()
+            Text(members)
         }
     }
-
-    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)
+func chatEventText(_ text: Text) -> Text {
+    text
         .font(.caption)
         .foregroundColor(.secondary)
         .fontWeight(.light)
 }
 
+func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text) -> Text {
+    chatEventText(Text(eventText) + Text(" ") + ts)
+}
+
 func chatEventText(_ ci: ChatItem) -> Text {
     chatEventText("\(ci.content.text)", ci.timestampText)
 }
@@ -160,15 +189,15 @@ func chatEventText(_ ci: ChatItem) -> Text {
 struct ChatItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), revealed: Binding.constant(false))
-            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .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.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(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 70))
         .environmentObject(Chat.sampleData)
@@ -180,7 +209,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
         let ciFeatureContent = CIContent.rcvChatFeature(feature: .fullDelete, enabled: FeatureEnabled(forUser: false, forContact: false), param: nil)
         Group{
             ChatItemView(
-                chatInfo: ChatInfo.sampleData.direct,
+                chat: Chat.sampleData,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -191,7 +220,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chatInfo: ChatInfo.sampleData.direct,
+                chat: Chat.sampleData,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead),
@@ -202,7 +231,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chatInfo: ChatInfo.sampleData.direct,
+                chat: Chat.sampleData,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "received invitation to join group team as admin", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -213,7 +242,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chatInfo: ChatInfo.sampleData.direct,
+                chat: Chat.sampleData,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "group event text", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -224,7 +253,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chatInfo: ChatInfo.sampleData.direct,
+                chat: Chat.sampleData,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, ciFeatureContent.text, .rcvRead, itemDeleted: .deleted(deletedTs: .now)),

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

@@ -21,9 +21,7 @@ struct ChatView: View {
     @State private var showChatInfoSheet: Bool = false
     @State private var showAddMembersSheet: Bool = false
     @State private var composeState = ComposeState()
-    @State private var deletingItem: ChatItem? = nil
     @State private var keyboardVisible = false
-    @State private var showDeleteMessage = false
     @State private var connectionStats: ConnectionStats?
     @State private var customUserProfile: Profile?
     @State private var connectionCode: String?
@@ -36,7 +34,12 @@ struct ChatView: View {
     @State private var searchText: String = ""
     @FocusState private var searchFocussed
     // opening GroupMemberInfoView on member icon
-    @State private var selectedMember: GroupMember? = nil
+    @State private var membersLoaded = false
+    @State private var selectedMember: GMember? = nil
+    // opening GroupLinkView on link button (incognito)
+    @State private var showGroupLinkSheet: Bool = false
+    @State private var groupLink: String?
+    @State private var groupLinkMemberRole: GroupMemberRole = .member
 
     var body: some View {
         if #available(iOS 16.0, *) {
@@ -64,6 +67,7 @@ struct ChatView: View {
             
             Spacer(minLength: 0)
 
+            connectingText()
             ComposeView(
                 chat: chat,
                 composeState: $composeState,
@@ -90,7 +94,10 @@ struct ChatView: View {
                 chatModel.chatId = nil
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
                     if chatModel.chatId == nil {
+                        chatModel.chatItemStatuses = [:]
                         chatModel.reversedChatItems = []
+                        chatModel.groupMembers = []
+                        membersLoaded = false
                     }
                 }
             }
@@ -128,18 +135,21 @@ struct ChatView: View {
                     }
                 } else if case let .group(groupInfo) = cInfo {
                     Button {
-                        Task {
-                            let groupMembers = await apiListMembers(groupInfo.groupId)
-                            await MainActor.run {
-                                ChatModel.shared.groupMembers = groupMembers
-                                showChatInfoSheet = true
-                            }
-                        }
+                        Task { await loadGroupMembers(groupInfo) { showChatInfoSheet = true } }
                     } label: {
                         ChatInfoToolbar(chat: chat)
                     }
                     .appSheet(isPresented: $showChatInfoSheet) {
-                        GroupChatInfoView(chat: chat, groupInfo: groupInfo)
+                        GroupChatInfoView(
+                            chat: chat,
+                            groupInfo: Binding(
+                                get: { groupInfo },
+                                set: { gInfo in
+                                    chat.chatInfo = .group(groupInfo: gInfo)
+                                    chat.created = Date.now
+                                }
+                            )
+                        )
                     }
                 }
             }
@@ -149,6 +159,7 @@ struct ChatView: View {
                     HStack {
                         if contact.allowsFeature(.calls) {
                             callButton(contact, .audio, imageName: "phone")
+                                .disabled(!contact.ready || !contact.active)
                         }
                         Menu {
                             if contact.allowsFeature(.calls) {
@@ -157,9 +168,11 @@ struct ChatView: View {
                                 } label: {
                                     Label("Video call", systemImage: "video")
                                 }
+                                .disabled(!contact.ready || !contact.active)
                             }
                             searchButton()
                             toggleNtfsButton(chat)
+                                .disabled(!contact.ready || !contact.active)
                         } label: {
                             Image(systemName: "ellipsis")
                         }
@@ -168,9 +181,16 @@ struct ChatView: View {
                     HStack {
                         if groupInfo.canAddMembers {
                             if (chat.chatInfo.incognito) {
-                                Image(systemName: "person.crop.circle.badge.plus")
-                                    .foregroundColor(Color(uiColor: .tertiaryLabel))
-                                    .onTapGesture { AlertManager.shared.showAlert(cantInviteIncognitoAlert()) }
+                                groupLinkButton()
+                                    .appSheet(isPresented: $showGroupLinkSheet) {
+                                        GroupLinkView(
+                                            groupId: groupInfo.groupId,
+                                            groupLink: $groupLink,
+                                            groupLinkMemberRole: $groupLinkMemberRole,
+                                            showTitle: true,
+                                            creatingGroup: false
+                                        )
+                                    }
                             } else {
                                 addMembersButton()
                                     .appSheet(isPresented: $showAddMembersSheet) {
@@ -192,6 +212,17 @@ struct ChatView: View {
         }
     }
 
+    private func loadGroupMembers(_ groupInfo: GroupInfo, updateView: @escaping () -> Void = {}) async {
+        let groupMembers = await apiListMembers(groupInfo.groupId)
+        await MainActor.run {
+            if chatModel.chatId == groupInfo.id {
+                chatModel.groupMembers = groupMembers.map { GMember.init($0) }
+                membersLoaded = true
+                updateView()
+            }
+        }
+    }
+
     private func initChatView() {
         let cInfo = chat.chatInfo
         if case let .direct(contact) = cInfo {
@@ -313,6 +344,20 @@ 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.active,
+           !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)
@@ -386,19 +431,32 @@ struct ChatView: View {
     private func addMembersButton() -> some View {
         Button {
             if case let .group(gInfo) = chat.chatInfo {
-                Task {
-                    let groupMembers = await apiListMembers(gInfo.groupId)
-                    await MainActor.run {
-                        ChatModel.shared.groupMembers = groupMembers
-                        showAddMembersSheet = true
-                    }
-                }
+                Task { await loadGroupMembers(gInfo) { showAddMembersSheet = true } }
             }
         } label: {
             Image(systemName: "person.crop.circle.badge.plus")
         }
     }
-    
+
+    private func groupLinkButton() -> some View {
+        Button {
+            if case let .group(gInfo) = chat.chatInfo {
+                Task {
+                    do {
+                        if let link = try apiGetGroupLink(gInfo.groupId) {
+                            (groupLink, groupLinkMemberRole) = link
+                        }
+                    } catch let error {
+                        logger.error("ChatView apiGetGroupLink: \(responseError(error))")
+                    }
+                    showGroupLinkSheet = true
+                }
+            }
+        } label: {
+            Image(systemName: "link.badge.plus")
+        }
+    }
+
     private func loadChatItems(_ cInfo: ChatInfo, _ ci: ChatItem, _ proxy: ScrollViewProxy) {
         if let firstItem = chatModel.reversedChatItems.last, firstItem.id == ci.id {
             if loadingItems || firstPage { return }
@@ -428,73 +486,30 @@ 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)
-                        }
-                        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)
-                }
-            }
-        } else {
-            chatItemWithMenu(ci, maxWidth)
-                .padding(.horizontal)
-                .padding(.top, 5)
-        }
-    }
-
-    private func chatItemWithMenu(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
         ChatItemWithMenu(
-            ci: ci,
+            chat: chat,
+            chatItem: ci,
             maxWidth: maxWidth,
-            scrollProxy: scrollProxy,
-            deleteMessage: deleteMessage,
-            deletingItem: $deletingItem,
             composeState: $composeState,
-            showDeleteMessage: $showDeleteMessage
+            selectedMember: $selectedMember,
+            chatView: self
         )
-        .environmentObject(chat)
     }
 
     private struct ChatItemWithMenu: View {
-        @EnvironmentObject var chat: Chat
+        @EnvironmentObject var m: ChatModel
         @Environment(\.colorScheme) var colorScheme
-        var ci: ChatItem
+        @ObservedObject var chat: Chat
+        var chatItem: ChatItem
         var maxWidth: CGFloat
-        var scrollProxy: ScrollViewProxy?
-        var deleteMessage: (CIDeleteMode) -> Void
-        @Binding var deletingItem: ChatItem?
         @Binding var composeState: ComposeState
-        @Binding var showDeleteMessage: Bool
+        @Binding var selectedMember: GMember?
+        var chatView: ChatView
 
+        @State private var deletingItem: ChatItem? = nil
+        @State private var showDeleteMessage = false
+        @State private var deletingItems: [Int64] = []
+        @State private var showDeleteMessages = false
         @State private var revealed = false
         @State private var showChatItemInfoSheet: Bool = false
         @State private var chatItemInfo: ChatItemInfo?
@@ -506,18 +521,114 @@ struct ChatView: View {
         @State private var playbackTime: TimeInterval?
 
         var body: some View {
+            let (currIndex, nextItem) = m.getNextChatItem(chatItem)
+            let ciCategory = chatItem.mergeCategory
+            if (ciCategory != nil && ciCategory == nextItem?.mergeCategory) {
+                // memberConnected events and deleted items are aggregated at the last chat item in a row, see ChatItemView
+                ZStack {} // scroll doesn't work if it's EmptyView()
+            } else {
+                let (prevHidden, prevItem) = m.getPrevShownChatItem(currIndex, ciCategory)
+                let range = itemsRange(currIndex, prevHidden)
+                if revealed, let range = range {
+                    let items = Array(zip(Array(range), m.reversedChatItems[range]))
+                    ForEach(items, id: \.1.viewId) { (i, ci) in
+                        let prev = i == prevHidden ? prevItem : m.reversedChatItems[i + 1]
+                        chatItemView(ci, nil, prev)
+                    }
+                } else {
+                    chatItemView(chatItem, range, prevItem)
+                }
+            }
+        }
+
+        @ViewBuilder func chatItemView(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ prevItem: ChatItem?) -> some View {
+            if case let .groupRcv(member) = ci.chatDir,
+               case let .group(groupInfo) = chat.chatInfo {
+                let (prevMember, memCount): (GroupMember?, Int) =
+                    if let range = range {
+                        m.getPrevHiddenMember(member, range)
+                    } else {
+                        (nil, 1)
+                    }
+                if prevItem == nil || showMemberImage(member, prevItem) || prevMember != nil {
+                    VStack(alignment: .leading, spacing: 4) {
+                        if ci.content.showMemberName {
+                            Text(memberNames(member, prevMember, memCount))
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
+                                .padding(.leading, memberImageSize + 14)
+                                .padding(.top, 7)
+                        }
+                        HStack(alignment: .top, spacing: 8) {
+                            ProfileImage(imageStr: member.memberProfile.image)
+                                .frame(width: memberImageSize, height: memberImageSize)
+                                .onTapGesture {
+                                    if chatView.membersLoaded {
+                                        selectedMember = m.getGroupMember(member.groupMemberId)
+                                    } else {
+                                        Task {
+                                            await chatView.loadGroupMembers(groupInfo) {
+                                                selectedMember = m.getGroupMember(member.groupMemberId)
+                                            }
+                                        }
+                                    }
+                                }
+                                .appSheet(item: $selectedMember) { member in
+                                    GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
+                                }
+                            chatItemWithMenu(ci, range, maxWidth)
+                        }
+                    }
+                    .padding(.top, 5)
+                    .padding(.trailing)
+                    .padding(.leading, 12)
+                } else {
+                    chatItemWithMenu(ci, range, maxWidth)
+                        .padding(.top, 5)
+                        .padding(.trailing)
+                        .padding(.leading, memberImageSize + 8 + 12)
+                }
+            } else {
+                chatItemWithMenu(ci, range, maxWidth)
+                    .padding(.horizontal)
+                    .padding(.top, 5)
+            }
+        }
+
+        private func memberNames(_ member: GroupMember, _ prevMember: GroupMember?, _ memCount: Int) -> LocalizedStringKey {
+            let name = member.displayName
+            return if let prevName = prevMember?.displayName {
+                memCount > 2
+                ? "\(name), \(prevName) and \(memCount - 2) members"
+                : "\(name) and \(prevName)"
+            } else {
+                "\(name)"
+            }
+        }
+
+        @ViewBuilder func chatItemWithMenu(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ maxWidth: CGFloat) -> some View {
             let alignment: Alignment = ci.chatDir.sent ? .trailing : .leading
             let uiMenu: Binding<UIMenu> = Binding(
-                get: { UIMenu(title: "", children: menu(live: composeState.liveMessage != nil)) },
+                get: { UIMenu(title: "", children: menu(ci, range, live: composeState.liveMessage != nil)) },
                 set: { _ in }
             )
             
             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)
-                    .uiKitContextMenu(menu: uiMenu, allowMenu: $allowMenu)
-                    .accessibilityLabel("")
+                ChatItemView(
+                    chat: chat,
+                    chatItem: ci,
+                    maxWidth: maxWidth,
+                    scrollProxy: chatView.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()
+                    chatItemReactions(ci)
                         .padding(.bottom, 4)
                 }
             }
@@ -531,6 +642,11 @@ struct ChatView: View {
                         }
                     }
                 }
+                .confirmationDialog(deleteMessagesTitle, isPresented: $showDeleteMessages, titleVisibility: .visible) {
+                    Button("Delete for me", role: .destructive) {
+                        deleteMessages()
+                    }
+                }
                 .frame(maxWidth: maxWidth, maxHeight: .infinity, alignment: alignment)
                 .frame(minWidth: 0, maxWidth: .infinity, alignment: alignment)
                 .onDisappear {
@@ -548,7 +664,15 @@ struct ChatView: View {
                 }
         }
 
-        private func chatItemReactions() -> some View {
+        private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
+            switch (prevItem?.chatDir) {
+            case .groupSnd: return true
+            case let .groupRcv(prevMember): return prevMember.groupMemberId != member.groupMemberId
+            default: return false
+            }
+        }
+
+        private func chatItemReactions(_ ci: ChatItem) -> some View {
             HStack(spacing: 4) {
                 ForEach(ci.reactions, id: \.reaction) { r in
                     let v = HStack(spacing: 4) {
@@ -568,7 +692,7 @@ struct ChatView: View {
 
                     if chat.chatInfo.featureEnabled(.reactions) && (ci.allowAddReaction || r.userReacted) {
                         v.onTapGesture {
-                            setReaction(add: !r.userReacted, reaction: r.reaction)
+                            setReaction(ci, add: !r.userReacted, reaction: r.reaction)
                         }
                     } else {
                         v
@@ -577,10 +701,10 @@ struct ChatView: View {
             }
         }
 
-        private func menu(live: Bool) -> [UIMenuElement] {
+        private func menu(_ ci: ChatItem, _ range: ClosedRange<Int>?, live: Bool) -> [UIMenuElement] {
             var menu: [UIMenuElement] = []
             if let mc = ci.content.msgContent, ci.meta.itemDeleted == nil || revealed {
-                let rs = allReactions()
+                let rs = allReactions(ci)
                 if chat.chatInfo.featureEnabled(.reactions) && ci.allowAddReaction,
                    rs.count > 0 {
                     var rm: UIMenu
@@ -597,25 +721,25 @@ struct ChatView: View {
                     menu.append(rm)
                 }
                 if ci.meta.itemDeleted == nil && !ci.isLiveDummy && !live {
-                    menu.append(replyUIAction())
+                    menu.append(replyUIAction(ci))
                 }
-                menu.append(shareUIAction())
-                menu.append(copyUIAction())
-                if let filePath = getLoadedFilePath(ci.file) {
+                menu.append(shareUIAction(ci))
+                menu.append(copyUIAction(ci))
+                if let fileSource = getLoadedFileSource(ci.file) {
                     if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                         if image.imageData != nil {
-                            menu.append(saveFileAction(filePath))
+                            menu.append(saveFileAction(fileSource))
                         } else {
                             menu.append(saveImageAction(image))
                         }
                     } else {
-                        menu.append(saveFileAction(filePath))
+                        menu.append(saveFileAction(fileSource))
                     }
                 }
                 if ci.meta.editable && !mc.isVoice && !live {
-                    menu.append(editAction())
+                    menu.append(editAction(ci))
                 }
-                menu.append(viewInfoUIAction())
+                menu.append(viewInfoUIAction(ci))
                 if revealed {
                     menu.append(hideUIAction())
                 }
@@ -625,25 +749,31 @@ struct ChatView: View {
                     menu.append(cancelFileUIAction(file.fileId, cancelAction))
                 }
                 if !live || !ci.meta.isLive {
-                    menu.append(deleteUIAction())
+                    menu.append(deleteUIAction(ci))
                 }
                 if let (groupInfo, _) = ci.memberToModerate(chat.chatInfo) {
-                    menu.append(moderateUIAction(groupInfo))
+                    menu.append(moderateUIAction(ci, groupInfo))
                 }
             } else if ci.meta.itemDeleted != nil {
-                if !ci.isDeletedContent {
+                if revealed {
+                    menu.append(hideUIAction())
+                } else if !ci.isDeletedContent {
                     menu.append(revealUIAction())
+                } else if range != nil {
+                    menu.append(expandUIAction())
                 }
-                menu.append(viewInfoUIAction())
-                menu.append(deleteUIAction())
+                menu.append(viewInfoUIAction(ci))
+                menu.append(deleteUIAction(ci))
             } else if ci.isDeletedContent {
-                menu.append(viewInfoUIAction())
-                menu.append(deleteUIAction())
+                menu.append(viewInfoUIAction(ci))
+                menu.append(deleteUIAction(ci))
+            } else if ci.mergeCategory != nil {
+                menu.append(revealed ? shrinkUIAction() : expandUIAction())
             }
             return menu
         }
         
-        private func replyUIAction() -> UIAction {
+        private func replyUIAction(_ ci: ChatItem) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Reply", comment: "chat item action"),
                 image: UIImage(systemName: "arrowshape.turn.up.left")
@@ -678,11 +808,11 @@ struct ChatView: View {
             )
         }
 
-        private func allReactions() -> [UIAction] {
+        private func allReactions(_ ci: ChatItem) -> [UIAction] {
             MsgReaction.values.compactMap { r in
                 ci.reactions.contains(where: { $0.userReacted && $0.reaction == r })
                 ? nil
-                : UIAction(title: r.text) { _ in setReaction(add: true, reaction: r) }
+                : UIAction(title: r.text) { _ in setReaction(ci, add: true, reaction: r) }
             }
         }
 
@@ -690,7 +820,7 @@ struct ChatView: View {
             rs.count > 4 ? 3 : 4
         }
 
-        private func setReaction(add: Bool, reaction: MsgReaction) {
+        private func setReaction(_ ci: ChatItem, add: Bool, reaction: MsgReaction) {
             Task {
                 do {
                     let cInfo = chat.chatInfo
@@ -702,7 +832,7 @@ struct ChatView: View {
                         reaction: reaction
                     )
                     await MainActor.run {
-                        ChatModel.shared.updateChatItem(chat.chatInfo, chatItem)
+                        m.updateChatItem(chat.chatInfo, chatItem)
                     }
                 } catch let error {
                     logger.error("apiChatItemReaction error: \(responseError(error))")
@@ -710,7 +840,7 @@ struct ChatView: View {
             }
         }
 
-        private func shareUIAction() -> UIAction {
+        private func shareUIAction(_ ci: ChatItem) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Share", comment: "chat item action"),
                 image: UIImage(systemName: "square.and.arrow.up")
@@ -723,7 +853,7 @@ struct ChatView: View {
             }
         }
         
-        private func copyUIAction() -> UIAction {
+        private func copyUIAction(_ ci: ChatItem) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Copy", comment: "chat item action"),
                 image: UIImage(systemName: "doc.on.doc")
@@ -747,17 +877,16 @@ struct ChatView: View {
             }
         }
         
-        private func saveFileAction(_ filePath: String) -> UIAction {
+        private func saveFileAction(_ fileSource: CryptoFile) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Save", comment: "chat item action"),
-                image: UIImage(systemName: "square.and.arrow.down")
+                image: UIImage(systemName: fileSource.cryptoArgs == nil ? "square.and.arrow.down" : "lock.open")
             ) { _ in
-                let fileURL = URL(fileURLWithPath: filePath)
-                showShareSheet(items: [fileURL])
+                saveCryptoFile(fileSource)
             }
         }
         
-        private func editAction() -> UIAction {
+        private func editAction(_ ci: ChatItem) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Edit", comment: "chat item action"),
                 image: UIImage(systemName: "square.and.pencil")
@@ -768,7 +897,7 @@ struct ChatView: View {
             }
         }
 
-        private func viewInfoUIAction() -> UIAction {
+        private func viewInfoUIAction(_ ci: ChatItem) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Info", comment: "chat item action"),
                 image: UIImage(systemName: "info.circle")
@@ -781,10 +910,7 @@ struct ChatView: View {
                             chatItemInfo = ciInfo
                         }
                         if case let .group(gInfo) = chat.chatInfo {
-                            let groupMembers = await apiListMembers(gInfo.groupId)
-                            await MainActor.run {
-                                ChatModel.shared.groupMembers = groupMembers
-                            }
+                            await chatView.loadGroupMembers(gInfo)
                         }
                     } catch let error {
                         logger.error("apiGetChatItemInfo error: \(responseError(error))")
@@ -805,7 +931,7 @@ struct ChatView: View {
                     message: Text(cancelAction.alert.message),
                     primaryButton: .destructive(Text(cancelAction.alert.confirm)) {
                         Task {
-                            if let user = ChatModel.shared.currentUser {
+                            if let user = m.currentUser {
                                 await cancelFile(user: user, fileId: fileId)
                             }
                         }
@@ -826,18 +952,45 @@ struct ChatView: View {
             }
         }
         
-        private func deleteUIAction() -> UIAction {
+        private func deleteUIAction(_ ci: ChatItem) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Delete", comment: "chat item action"),
                 image: UIImage(systemName: "trash"),
                 attributes: [.destructive]
             ) { _ in
-                showDeleteMessage = true
-                deletingItem = ci
+                if !revealed && ci.meta.itemDeleted != nil,
+                   let currIndex = m.getChatItemIndex(ci),
+                   let ciCategory = ci.mergeCategory {
+                    let (prevHidden, _) = m.getPrevShownChatItem(currIndex, ciCategory)
+                    if let range = itemsRange(currIndex, prevHidden) {
+                        var itemIds: [Int64] = []
+                        for i in range {
+                            itemIds.append(m.reversedChatItems[i].id)
+                        }
+                        showDeleteMessages = true
+                        deletingItems = itemIds
+                    } else {
+                        showDeleteMessage = true
+                        deletingItem = ci
+                    }
+                } else {
+                    showDeleteMessage = true
+                    deletingItem = ci
+                }
             }
         }
 
-        private func moderateUIAction(_ groupInfo: GroupInfo) -> UIAction {
+        private func itemsRange(_ currIndex: Int?, _ prevHidden: Int?) -> ClosedRange<Int>? {
+            if let currIndex = currIndex,
+               let prevHidden = prevHidden,
+               prevHidden > currIndex {
+                currIndex...prevHidden
+            } else {
+                nil
+            }
+        }
+
+        private func moderateUIAction(_ ci: ChatItem, _ groupInfo: GroupInfo) -> UIAction {
             UIAction(
                 title: NSLocalizedString("Moderate", comment: "chat item action"),
                 image: UIImage(systemName: "flag"),
@@ -869,20 +1022,105 @@ struct ChatView: View {
                 }
             }
         }
-        
+
+        private func expandUIAction() -> UIAction {
+            UIAction(
+                title: NSLocalizedString("Expand", comment: "chat item action"),
+                image: UIImage(systemName: "arrow.up.and.line.horizontal.and.arrow.down")
+            ) { _ in
+                withAnimation {
+                    revealed = true
+                }
+            }
+        }
+
+        private func shrinkUIAction() -> UIAction {
+            UIAction(
+                title: NSLocalizedString("Hide", comment: "chat item action"),
+                image: UIImage(systemName: "arrow.down.and.line.horizontal.and.arrow.up")
+            ) { _ in
+                withAnimation {
+                    revealed = false
+                }
+            }
+        }
+
         private var broadcastDeleteButtonText: LocalizedStringKey {
             chat.chatInfo.featureEnabled(.fullDelete) ? "Delete for everyone" : "Mark deleted for everyone"
         }
-    }
 
-    private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
-        switch (prevItem?.chatDir) {
-        case .groupSnd: return true
-        case let .groupRcv(prevMember): return prevMember.groupMemberId != member.groupMemberId
-        default: return false
+        var deleteMessagesTitle: LocalizedStringKey {
+            let n = deletingItems.count
+            return n == 1 ? "Delete message?" : "Delete \(n) messages?"
+        }
+
+        private func deleteMessages() {
+            let itemIds = deletingItems
+            if itemIds.count > 0 {
+                let chatInfo = chat.chatInfo
+                Task {
+                    var deletedItems: [ChatItem] = []
+                    for itemId in itemIds {
+                        do {
+                            let (di, _) = try await apiDeleteChatItem(
+                                type: chatInfo.chatType,
+                                id: chatInfo.apiId,
+                                itemId: itemId,
+                                mode: .cidmInternal
+                            )
+                            deletedItems.append(di)
+                        } catch {
+                            logger.error("ChatView.deleteMessage error: \(error.localizedDescription)")
+                        }
+                    }
+                    await MainActor.run {
+                        for di in deletedItems {
+                            m.removeChatItem(chatInfo, di)
+                        }
+                    }
+                }
+            }
+        }
+
+        private func deleteMessage(_ mode: CIDeleteMode) {
+            logger.debug("ChatView deleteMessage")
+            Task {
+                logger.debug("ChatView deleteMessage: in Task")
+                do {
+                    if let di = deletingItem {
+                        var deletedItem: ChatItem
+                        var toItem: ChatItem?
+                        if case .cidmBroadcast = mode,
+                           let (groupInfo, groupMember) = di.memberToModerate(chat.chatInfo) {
+                            (deletedItem, toItem) = try await apiDeleteMemberChatItem(
+                                groupId: groupInfo.apiId,
+                                groupMemberId: groupMember.groupMemberId,
+                                itemId: di.id
+                            )
+                        } else {
+                            (deletedItem, toItem) = try await apiDeleteChatItem(
+                                type: chat.chatInfo.chatType,
+                                id: chat.chatInfo.apiId,
+                                itemId: di.id,
+                                mode: mode
+                            )
+                        }
+                        DispatchQueue.main.async {
+                            deletingItem = nil
+                            if let toItem = toItem {
+                                _ = m.upsertChatItem(chat.chatInfo, toItem)
+                            } else {
+                                m.removeChatItem(chat.chatInfo, deletedItem)
+                            }
+                        }
+                    }
+                } catch {
+                    logger.error("ChatView.deleteMessage error: \(error.localizedDescription)")
+                }
+            }
         }
     }
-    
+
     private func scrollToBottom(_ proxy: ScrollViewProxy) {
         if let ci = chatModel.reversedChatItems.first {
             withAnimation { proxy.scrollTo(ci.viewId, anchor: .top) }
@@ -894,44 +1132,6 @@ struct ChatView: View {
             withAnimation { proxy.scrollTo(ci.viewId, anchor: .top) }
         }
     }
-    
-    private func deleteMessage(_ mode: CIDeleteMode) {
-        logger.debug("ChatView deleteMessage")
-        Task {
-            logger.debug("ChatView deleteMessage: in Task")
-            do {
-                if let di = deletingItem {
-                    var deletedItem: ChatItem
-                    var toItem: ChatItem?
-                    if case .cidmBroadcast = mode,
-                       let (groupInfo, groupMember) = di.memberToModerate(chat.chatInfo) {
-                        (deletedItem, toItem) = try await apiDeleteMemberChatItem(
-                            groupId: groupInfo.apiId,
-                            groupMemberId: groupMember.groupMemberId,
-                            itemId: di.id
-                        )
-                    } else {
-                        (deletedItem, toItem) = try await apiDeleteChatItem(
-                            type: chat.chatInfo.chatType,
-                            id: chat.chatInfo.apiId,
-                            itemId: di.id,
-                            mode: mode
-                        )
-                    }
-                    DispatchQueue.main.async {
-                        deletingItem = nil
-                        if let toItem = toItem {
-                            _ = chatModel.upsertChatItem(chat.chatInfo, toItem)
-                        } else {
-                            chatModel.removeChatItem(chat.chatInfo, deletedItem)
-                        }
-                    }
-                }
-            } catch {
-                logger.error("ChatView.deleteMessage error: \(error.localizedDescription)")
-            }
-        }
-    }
 }
 
 @ViewBuilder func toggleNtfsButton(_ chat: Chat) -> some View {
@@ -948,7 +1148,7 @@ struct ChatView: View {
 
 func toggleNotifications(_ chat: Chat, enableNtfs: Bool) {
     var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
-    chatSettings.enableNtfs = enableNtfs
+    chatSettings.enableNtfs = enableNtfs ? .all : .none
     updateChatSettings(chat, chatSettings: chatSettings)
 }
 

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

@@ -167,25 +167,23 @@ struct ComposeState {
 }
 
 func chatItemPreview(chatItem: ChatItem) -> ComposePreview {
-    let chatItemPreview: ComposePreview
     switch chatItem.content.msgContent {
     case .text:
-        chatItemPreview = .noPreview
+        return .noPreview
     case let .link(_, preview: preview):
-        chatItemPreview = .linkPreview(linkPreview: preview)
+        return .linkPreview(linkPreview: preview)
     case let .image(_, image):
-        chatItemPreview = .mediaPreviews(mediaPreviews: [(image, nil)])
+        return .mediaPreviews(mediaPreviews: [(image, nil)])
     case let .video(_, image, _):
-        chatItemPreview = .mediaPreviews(mediaPreviews: [(image, nil)])
+        return .mediaPreviews(mediaPreviews: [(image, nil)])
     case let .voice(_, duration):
-        chatItemPreview = .voicePreview(recordingFileName: chatItem.file?.fileName ?? "", duration: duration)
+        return .voicePreview(recordingFileName: chatItem.file?.fileName ?? "", duration: duration)
     case .file:
         let fileName = chatItem.file?.fileName ?? ""
-        chatItemPreview = .filePreview(fileName: fileName, file: getAppFilePath(fileName))
+        return .filePreview(fileName: fileName, file: getAppFilePath(fileName))
     default:
-        chatItemPreview = .noPreview
+        return .noPreview
     }
-    return chatItemPreview
 }
 
 enum UploadContent: Equatable {
@@ -259,6 +257,9 @@ struct ComposeView: View {
 
     var body: some View {
         VStack(spacing: 0) {
+            if chat.chatInfo.contact?.nextSendGrpInv ?? false {
+                ContextInvitingContactMemberView()
+            }
             contextItemView()
             switch (composeState.editing, composeState.preview) {
             case (true, .filePreview): EmptyView()
@@ -272,7 +273,7 @@ struct ComposeView: View {
                     Image(systemName: "paperclip")
                         .resizable()
                 }
-                .disabled(composeState.attachmentDisabled || !chat.userCanSend)
+                .disabled(composeState.attachmentDisabled || !chat.userCanSend || (chat.chatInfo.contact?.nextSendGrpInv ?? false))
                 .frame(width: 25, height: 25)
                 .padding(.bottom, 12)
                 .padding(.leading, 12)
@@ -300,6 +301,7 @@ struct ComposeView: View {
                             composeState.liveMessage = nil
                             chatModel.removeLiveDummy()
                         },
+                        nextSendGrpInv: chat.chatInfo.contact?.nextSendGrpInv ?? false,
                         voiceMessageAllowed: chat.chatInfo.featureEnabled(.voice),
                         showEnableVoiceMessagesAlert: chat.chatInfo.showEnableVoiceMessagesAlert,
                         startVoiceMessageRecording: {
@@ -590,12 +592,14 @@ struct ComposeView: View {
             EmptyView()
         case let .quotedItem(chatItem: quotedItem):
             ContextItemView(
+                chat: chat,
                 contextItem: quotedItem,
                 contextIcon: "arrowshape.turn.up.left",
                 cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) }
             )
         case let .editingItem(chatItem: editingItem):
             ContextItemView(
+                chat: chat,
                 contextItem: editingItem,
                 contextIcon: "pencil",
                 cancelContextItem: { clearState() }
@@ -619,7 +623,9 @@ struct ComposeView: View {
             if liveMessage != nil { composeState = composeState.copy(liveMessage: nil) }
             await sending()
         }
-        if case let .editingItem(ci) = composeState.contextItem {
+        if chat.chatInfo.contact?.nextSendGrpInv ?? false {
+            await sendMemberContactInvitation()
+        } else 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)
@@ -656,10 +662,10 @@ struct ComposeView: View {
                 }
             case let .voicePreview(recordingFileName, duration):
                 stopPlayback.toggle()
-                chatModel.filesToDelete.remove(getAppFilePath(recordingFileName))
-                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: recordingFileName, ttl: ttl)
+                let file = voiceCryptoFile(recordingFileName)
+                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: file, ttl: ttl)
             case let .filePreview(_, file):
-                if let savedFile = saveFileFromURL(file) {
+                if let savedFile = saveFileFromURL(file, encrypted: privacyEncryptLocalFilesGroupDefault.get()) {
                     sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl)
                 }
             }
@@ -671,6 +677,19 @@ struct ComposeView: View {
             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))")
+            }
+        }
+
         func updateMessage(_ ei: ChatItem, live: Bool) async -> ChatItem? {
             if let oldMsgContent = ei.content.msgContent {
                 do {
@@ -727,13 +746,28 @@ 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 = saveFileFromURLWithoutLoad(url) {
+            if case let .video(_, url, duration) = data, let savedFile = moveTempFileFromURL(url) {
                 return await send(.video(text: text, image: image, duration: duration), quoted: quoted, file: savedFile, live: live, ttl: ttl)
             }
             return nil
         }
 
-        func send(_ mc: MsgContent, quoted: Int64?, file: String? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
+        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? {
             if let chatItem = await apiSendMessage(
                 type: chat.chatInfo.chatType,
                 id: chat.chatInfo.apiId,
@@ -750,7 +784,7 @@ struct ComposeView: View {
                 return chatItem
             }
             if let file = file {
-                removeFile(file)
+                removeFile(file.filePath)
             }
             return nil
         }
@@ -770,7 +804,7 @@ struct ComposeView: View {
             }
         }
 
-        func saveAnyImage(_ img: UploadContent) -> String? {
+        func saveAnyImage(_ img: UploadContent) -> CryptoFile? {
             switch img {
             case let .simpleImage(image): return saveImage(image)
             case let .animatedImage(image): return saveAnimImage(image)

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(fileName: recordingFileName, at: playbackTime)
+        audioPlayer?.start(fileSource: CryptoFile.plain(recordingFileName), at: playbackTime)
         playbackState = .playing
     }
 }

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

@@ -0,0 +1,32 @@
+//
+//  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

@@ -11,6 +11,7 @@ import SimpleXChat
 
 struct ContextItemView: View {
     @Environment(\.colorScheme) var colorScheme
+    @ObservedObject var chat: Chat
     let contextItem: ChatItem
     let contextIcon: String
     let cancelContextItem: () -> Void
@@ -48,6 +49,7 @@ struct ContextItemView: View {
 
     private func msgContentView(lines: Int) -> some View {
         MsgContentView(
+            chat: chat,
             text: contextItem.text,
             formattedText: contextItem.formattedText
         )
@@ -59,6 +61,6 @@ struct ContextItemView: View {
 struct ContextItemView_Previews: PreviewProvider {
     static var previews: some View {
         let contextItem: ChatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
-        return ContextItemView(contextItem: contextItem, contextIcon: "pencil.circle", cancelContextItem: {})
+        return ContextItemView(chat: Chat.sampleData, contextItem: contextItem, contextIcon: "pencil.circle", cancelContextItem: {})
     }
 }

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

@@ -14,20 +14,28 @@ import PhotosUI
 struct NativeTextEditor: UIViewRepresentable {
     @Binding var text: String
     @Binding var disableEditing: Bool
-    let height: CGFloat
-    let font: UIFont
+    @Binding var height: CGFloat
     @Binding var focused: Bool
     let alignment: TextAlignment
     let onImagesAdded: ([UploadContent]) -> Void
     
+    private let minHeight: CGFloat = 37
+
+    private let defaultHeight: CGFloat = {
+        let field = CustomUITextField(height: Binding.constant(0))
+        field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
+        return min(max(field.sizeThatFits(CGSizeMake(field.frame.size.width, CGFloat.greatestFiniteMagnitude)).height, 37), 360).rounded(.down)
+    }()
+    
     func makeUIView(context: Context) -> UITextView {
-        let field = CustomUITextField()
+        let field = CustomUITextField(height: _height)
         field.text = text
-        field.font = font
         field.textAlignment = alignment == .leading ? .left : .right
         field.autocapitalizationType = .sentences
         field.setOnTextChangedListener { newText, images in
             if !disableEditing {
+                // Speed up the process of updating layout, reduce jumping content on screen
+                if !isShortEmoji(newText) { updateHeight(field) }
                 text = newText
             } else {
                 field.text = text
@@ -39,24 +47,72 @@ struct NativeTextEditor: UIViewRepresentable {
         field.setOnFocusChangedListener { focused = $0 }
         field.delegate = field
         field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
+        updateFont(field)
+        updateHeight(field)
         return field
     }
     
     func updateUIView(_ field: UITextView, context: Context) {
         field.text = text
-        field.font = font
         field.textAlignment = alignment == .leading ? .left : .right
+        updateFont(field)
+        updateHeight(field)
+    }
+
+    private func updateHeight(_ field: UITextView) {
+        let maxHeight = min(360, field.font!.lineHeight * 12)
+        // When having emoji in text view and then removing it, sizeThatFits shows previous size (too big for empty text view), so using work around with default size
+        let newHeight = field.text == ""
+        ? defaultHeight
+        : min(max(field.sizeThatFits(CGSizeMake(field.frame.size.width, CGFloat.greatestFiniteMagnitude)).height, minHeight), maxHeight).rounded(.down)
+
+        if field.frame.size.height != newHeight {
+            field.frame.size = CGSizeMake(field.frame.size.width, newHeight)
+            (field as! CustomUITextField).invalidateIntrinsicContentHeight(newHeight)
+        }
+    }
+
+    private func updateFont(_ field: UITextView) {
+        field.font = isShortEmoji(field.text)
+        ? (field.text.count < 4 ? largeEmojiUIFont : mediumEmojiUIFont)
+        : UIFont.preferredFont(forTextStyle: .body)
     }
 }
 
 private class CustomUITextField: UITextView, UITextViewDelegate {
+    var height: Binding<CGFloat>
+    var newHeight: CGFloat = 0
     var onTextChanged: (String, [UploadContent]) -> Void = { newText, image in }
     var onFocusChanged: (Bool) -> Void = { focused in }
     
+    init(height: Binding<CGFloat>) {
+        self.height = height
+        super.init(frame: .zero, textContainer: nil)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("Not implemented")
+    }
+
+    // This func here needed because using frame.size.height in intrinsicContentSize while loading a screen with text (for example. when you have a draft),
+    // produces incorrect height because at that point intrinsicContentSize has old value of frame.size.height even if it was set to new value right before the call
+    // (who knows why...)
+    func invalidateIntrinsicContentHeight(_ newHeight: CGFloat) {
+        self.newHeight = newHeight
+        invalidateIntrinsicContentSize()
+    }
+
+    override var intrinsicContentSize: CGSize {
+        if height.wrappedValue != newHeight {
+            DispatchQueue.main.asyncAfter(deadline: .now(), execute: { self.height.wrappedValue = self.newHeight })
+        }
+        return CGSizeMake(0, newHeight)
+    }
+
     func setOnTextChangedListener(onTextChanged: @escaping (String, [UploadContent]) -> Void) {
         self.onTextChanged = onTextChanged
     }
-    
+
     func setOnFocusChangedListener(onFocusChanged: @escaping (Bool) -> Void) {
         self.onFocusChanged = onFocusChanged
     }
@@ -144,14 +200,14 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
 
 struct NativeTextEditor_Previews: PreviewProvider{
     static var previews: some View {
-        return NativeTextEditor(
+        NativeTextEditor(
             text: Binding.constant("Hello, world!"),
             disableEditing: Binding.constant(false),
-            height: 100,
-            font: UIFont.preferredFont(forTextStyle: .body),
+            height: Binding.constant(100),
             focused: Binding.constant(false),
             alignment: TextAlignment.leading,
             onImagesAdded: { _ in }
         )
+        .fixedSize(horizontal: false, vertical: true)
     }
 }

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

@@ -17,6 +17,7 @@ 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
@@ -31,15 +32,12 @@ struct SendMessageView: View {
     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)
     @State private var sendButtonSize: CGFloat = 29
     @State private var sendButtonOpacity: CGFloat = 1
     @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
 
     var body: some View {
@@ -56,30 +54,16 @@ struct SendMessageView: View {
                             .frame(maxWidth: .infinity)
                     } else {
                         let alignment: TextAlignment = isRightToLeft(composeState.message) ? .trailing : .leading
-                        Text(composeState.message)
-                            .lineLimit(10)
-                            .font(teFont)
-                            .multilineTextAlignment(alignment)
-// put text on top (after NativeTextEditor) and set color to precisely align it on changes
-//                            .foregroundColor(.red)
-                            .foregroundColor(.clear)
-                            .padding(.horizontal, 10)
-                            .padding(.top, 8)
-                            .padding(.bottom, 6)
-                            .matchedGeometryEffect(id: "te", in: namespace)
-                            .background(GeometryReader(content: updateHeight))
-
                         NativeTextEditor(
                             text: $composeState.message,
                             disableEditing: $composeState.inProgress,
-                            height: teHeight,
-                            font: teUiFont,
+                            height: $teHeight,
                             focused: $keyboardVisible,
                             alignment: alignment,
                             onImagesAdded: onMediaAdded
                         )
                         .allowsTightening(false)
-                        .frame(height: teHeight)
+                        .fixedSize(horizontal: false, vertical: true)
                     }
                 }
 
@@ -99,11 +83,13 @@ struct SendMessageView: View {
                     .frame(height: teHeight, alignment: .bottom)
                 }
             }
-
+            .padding(.vertical, 1)
+            .overlay(
             RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
                 .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
-                .frame(height: teHeight)
+            )
         }
+        .onChange(of: composeState.message, perform: { text in updateFont(text) })
         .onChange(of: composeState.inProgress) { inProgress in
             if inProgress {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
@@ -118,7 +104,9 @@ struct SendMessageView: View {
 
     @ViewBuilder private func composeActionButtons() -> some View {
         let vmrs = composeState.voiceMessageRecordingState
-        if showVoiceMessageButton
+        if nextSendGrpInv {
+            inviteMemberContactButton()
+        } else if showVoiceMessageButton
             && composeState.message.isEmpty
             && !composeState.editing
             && composeState.liveMessage == nil
@@ -162,6 +150,24 @@ 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)
@@ -394,16 +400,12 @@ struct SendMessageView: View {
         .padding([.bottom, .trailing], 4)
     }
 
-    private func updateHeight(_ g: GeometryProxy) -> Color {
+    private func updateFont(_ text: String) {
         DispatchQueue.main.async {
-            teHeight = min(max(g.frame(in: .local).size.height, minHeight), maxHeight)
-            (teFont, teUiFont) = isShortEmoji(composeState.message)
-                                    ? composeState.message.count < 4
-                                        ? (largeEmojiFont, largeEmojiUIFont)
-                                        : (mediumEmojiFont, mediumEmojiUIFont)
-                                    : (.body, UIFont.preferredFont(forTextStyle: .body))
+            teFont = isShortEmoji(text)
+            ? (text.count < 4 ? largeEmojiFont : mediumEmojiFont)
+            : .body
         }
-        return Color.clear
     }
 }
 

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

@@ -144,7 +144,7 @@ struct AddGroupMembersViewCommon: View {
             do {
                 for contactId in selectedContacts {
                     let member = try await apiAddMember(groupInfo.groupId, contactId, selectedRole)
-                    await MainActor.run { _ = ChatModel.shared.upsertGroupMember(groupInfo, member) }
+                    await MainActor.run { _ = chatModel.upsertGroupMember(groupInfo, member) }
                 }
                 addedMembersCb(selectedContacts)
             } catch {

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

@@ -15,7 +15,7 @@ struct GroupChatInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
     @ObservedObject var chat: Chat
-    @State var groupInfo: GroupInfo
+    @Binding var groupInfo: GroupInfo
     @ObservedObject private var alertManager = AlertManager.shared
     @State private var alert: GroupChatInfoViewAlert? = nil
     @State private var groupLink: String?
@@ -35,14 +35,30 @@ struct GroupChatInfoView: View {
         case leaveGroupAlert
         case cantInviteIncognitoAlert
         case largeGroupReceiptsDisabled
+        case blockMemberAlert(mem: GroupMember)
+        case unblockMemberAlert(mem: GroupMember)
+        case removeMemberAlert(mem: GroupMember)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey)
 
-        var id: GroupChatInfoViewAlert { get { self } }
+        var id: String {
+            switch self {
+            case .deleteGroupAlert: return "deleteGroupAlert"
+            case .clearChatAlert: return "clearChatAlert"
+            case .leaveGroupAlert: return "leaveGroupAlert"
+            case .cantInviteIncognitoAlert: return "cantInviteIncognitoAlert"
+            case .largeGroupReceiptsDisabled: return "largeGroupReceiptsDisabled"
+            case let .blockMemberAlert(mem): return "blockMemberAlert \(mem.groupMemberId)"
+            case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)"
+            case let .removeMemberAlert(mem): return "removeMemberAlert \(mem.groupMemberId)"
+            case let .error(title, _): return "error \(title)"
+            }
+        }
     }
 
     var body: some View {
         NavigationView {
             let members = chatModel.groupMembers
-                .filter { $0.memberStatus != .memLeft && $0.memberStatus != .memRemoved }
+                .filter { m in let status = m.wrapped.memberStatus; return status != .memLeft && status != .memRemoved }
                 .sorted { $0.displayName.lowercased() < $1.displayName.lowercased() }
 
             List {
@@ -57,7 +73,7 @@ struct GroupChatInfoView: View {
                         addOrEditWelcomeMessage()
                     }
                     groupPreferencesButton($groupInfo)
-                    if members.filter({ $0.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
+                    if members.filter({ $0.wrapped.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
                         sendReceiptsOption()
                     } else {
                         sendReceiptsOptionDisabled()
@@ -84,17 +100,17 @@ struct GroupChatInfoView: View {
                             .padding(.leading, 8)
                     }
                     let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                    let filteredMembers = s == "" ? members : members.filter { $0.chatViewName.localizedLowercase.contains(s) }
-                    memberView(groupInfo.membership, user: true)
+                    let filteredMembers = s == "" ? members : members.filter { $0.wrapped.chatViewName.localizedLowercase.contains(s) }
+                    MemberRowView(groupInfo: groupInfo, groupMember: GMember(groupInfo.membership), user: true, alert: $alert)
                     ForEach(filteredMembers) { member in
                         ZStack {
                             NavigationLink {
-                                memberInfoView(member.groupMemberId)
+                                memberInfoView(member)
                             } label: {
                                 EmptyView()
                             }
                             .opacity(0)
-                            memberView(member)
+                            MemberRowView(groupInfo: groupInfo, groupMember: member, alert: $alert)
                         }
                     }
                 }
@@ -126,6 +142,10 @@ struct GroupChatInfoView: View {
             case .leaveGroupAlert: return leaveGroupAlert()
             case .cantInviteIncognitoAlert: return cantInviteIncognitoAlert()
             case .largeGroupReceiptsDisabled: return largeGroupReceiptsDisabledAlert()
+            case let .blockMemberAlert(mem): return blockMemberAlert(groupInfo, mem)
+            case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem)
+            case let .removeMemberAlert(mem): return removeMemberAlert(mem)
+            case let .error(title, error): return Alert(title: Text(title), message: Text(error))
             }
         }
         .onAppear {
@@ -174,7 +194,7 @@ struct GroupChatInfoView: View {
                     Task {
                         let groupMembers = await apiListMembers(groupInfo.groupId)
                         await MainActor.run {
-                            ChatModel.shared.groupMembers = groupMembers
+                            chatModel.groupMembers = groupMembers.map { GMember.init($0) }
                         }
                     }
                 }
@@ -183,51 +203,92 @@ struct GroupChatInfoView: View {
         }
     }
 
-    private func memberView(_ member: GroupMember, user: Bool = false) -> some View {
-        HStack{
-            ProfileImage(imageStr: member.image)
-                .frame(width: 38, height: 38)
-                .padding(.trailing, 2)
-            // TODO server connection status
-            VStack(alignment: .leading) {
-                let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
-                (member.verified ? memberVerifiedShield + t : t)
-                    .lineLimit(1)
-                let s = Text(member.memberStatus.shortText)
-                (user ? Text ("you: ") + s : s)
-                    .lineLimit(1)
-                    .font(.caption)
-                    .foregroundColor(.secondary)
+    private struct MemberRowView: View {
+        var groupInfo: GroupInfo
+        @ObservedObject var groupMember: GMember
+        var user: Bool = false
+        @Binding var alert: GroupChatInfoViewAlert?
+
+        var body: some View {
+            let member = groupMember.wrapped
+            let v = HStack{
+                ProfileImage(imageStr: member.image)
+                    .frame(width: 38, height: 38)
+                    .padding(.trailing, 2)
+                // TODO server connection status
+                VStack(alignment: .leading) {
+                    let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
+                    (member.verified ? memberVerifiedShield + t : t)
+                        .lineLimit(1)
+                    let s = Text(member.memberStatus.shortText)
+                    (user ? Text ("you: ") + s : s)
+                        .lineLimit(1)
+                        .font(.caption)
+                        .foregroundColor(.secondary)
+                }
+                Spacer()
+                let role = member.memberRole
+                if role == .owner || role == .admin {
+                    Text(member.memberRole.text)
+                        .foregroundColor(.secondary)
+                }
             }
-            Spacer()
-            let role = member.memberRole
-            if role == .owner || role == .admin {
-                Text(member.memberRole.text)
-                    .foregroundColor(.secondary)
+
+            if user {
+                v
+            } else if member.canBeRemoved(groupInfo: groupInfo) {
+                removeSwipe(member, blockSwipe(member, v))
+            } else {
+                blockSwipe(member, v)
+            }
+        }
+
+        private func blockSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
+            v.swipeActions(edge: .leading) {
+                if member.memberSettings.showMessages {
+                    Button {
+                        alert = .blockMemberAlert(mem: member)
+                    } label: {
+                        Label("Block member", systemImage: "hand.raised").foregroundColor(.secondary)
+                    }
+                } else {
+                    Button {
+                        alert = .unblockMemberAlert(mem: member)
+                    } label: {
+                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
+                    }
+                }
+            }
+        }
+
+        private func removeSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
+            v.swipeActions(edge: .trailing) {
+                Button(role: .destructive) {
+                    alert = .removeMemberAlert(mem: member)
+                } label: {
+                    Label("Remove member", systemImage: "trash")
+                        .foregroundColor(Color.red)
+                }
             }
         }
     }
 
-    private var memberVerifiedShield: Text {
-        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
-            .font(.caption)
-            .baselineOffset(2)
-            .kerning(-2)
-            .foregroundColor(.secondary)
-    }
-
-    @ViewBuilder private func memberInfoView(_ groupMemberId: Int64?) -> some View {
-        if let mId = groupMemberId, let member = chatModel.groupMembers.first(where: { $0.groupMemberId == mId }) {
-            GroupMemberInfoView(groupInfo: groupInfo, member: member)
-                .navigationBarHidden(false)
-        }
+    private func memberInfoView(_ groupMember: GMember) -> some View {
+        GroupMemberInfoView(groupInfo: groupInfo, groupMember: groupMember)
+            .navigationBarHidden(false)
     }
 
     private func groupLinkButton() -> some View {
         NavigationLink {
-            GroupLinkView(groupId: groupInfo.groupId, groupLink: $groupLink, groupLinkMemberRole: $groupLinkMemberRole)
-                .navigationBarTitle("Group link")
-                .navigationBarTitleDisplayMode(.large)
+            GroupLinkView(
+                groupId: groupInfo.groupId,
+                groupLink: $groupLink,
+                groupLinkMemberRole: $groupLinkMemberRole,
+                showTitle: false,
+                creatingGroup: false
+            )
+            .navigationBarTitle("Group link")
+            .navigationBarTitleDisplayMode(.large)
         } label: {
             if groupLink == nil {
                 Label("Create group link", systemImage: "link.badge.plus")
@@ -299,9 +360,9 @@ struct GroupChatInfoView: View {
                     do {
                         try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
                         await MainActor.run {
-                            chatModel.removeChat(chat.chatInfo.id)
-                            chatModel.chatId = nil
                             dismiss()
+                            chatModel.chatId = nil
+                            chatModel.removeChat(chat.chatInfo.id)
                         }
                     } catch let error {
                         logger.error("deleteGroupAlert apiDeleteChat error: \(error.localizedDescription)")
@@ -375,6 +436,28 @@ struct GroupChatInfoView: View {
             alert = .largeGroupReceiptsDisabled
         }
     }
+
+    private func removeMemberAlert(_ mem: GroupMember) -> Alert {
+        Alert(
+            title: Text("Remove member?"),
+            message: Text("Member will be removed from group - this cannot be undone!"),
+            primaryButton: .destructive(Text("Remove")) {
+                Task {
+                    do {
+                        let updatedMember = try await apiRemoveMember(groupInfo.groupId, mem.groupMemberId)
+                        await MainActor.run {
+                            _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
+                        }
+                    } catch let error {
+                        logger.error("apiRemoveMember error: \(responseError(error))")
+                        let a = getErrorAlert(error, "Error removing member")
+                        alert = .error(title: a.title, error: a.message)
+                    }
+                }
+            },
+            secondaryButton: .cancel()
+        )
+    }
 }
 
 func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bool = false) -> some View {
@@ -396,6 +479,14 @@ func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bo
     }
 }
 
+private var memberVerifiedShield: Text {
+    (Text(Image(systemName: "checkmark.shield")) + Text(" "))
+        .font(.caption)
+        .baselineOffset(2)
+        .kerning(-2)
+        .foregroundColor(.secondary)
+}
+
 func cantInviteIncognitoAlert() -> Alert {
     Alert(
         title: Text("Can't invite contacts!"),
@@ -412,6 +503,9 @@ func largeGroupReceiptsDisabledAlert() -> Alert {
 
 struct GroupChatInfoView_Previews: PreviewProvider {
     static var previews: some View {
-        GroupChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []), groupInfo: GroupInfo.sampleData)
+        GroupChatInfoView(
+            chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
+            groupInfo: Binding.constant(GroupInfo.sampleData)
+        )
     }
 }

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

@@ -13,6 +13,9 @@ struct GroupLinkView: View {
     var groupId: Int64
     @Binding var groupLink: String?
     @Binding var groupLinkMemberRole: GroupMemberRole
+    var showTitle: Bool = false
+    var creatingGroup: Bool = false
+    var linkCreatedCb: (() -> Void)? = nil
     @State private var creatingLink = false
     @State private var alert: GroupLinkAlert?
 
@@ -29,10 +32,35 @@ struct GroupLinkView: View {
     }
 
     var body: some View {
+        if creatingGroup {
+            NavigationView {
+                groupLinkView()
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarTrailing) {
+                            Button ("Continue") { linkCreatedCb?() }
+                        }
+                    }
+            }
+        } else {
+            groupLinkView()
+        }
+    }
+
+    private func groupLinkView() -> some View {
         List {
-            Text("You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it.")
-                .listRowBackground(Color.clear)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+            Group {
+                if showTitle {
+                    Text("Group link")
+                        .font(.largeTitle)
+                        .bold()
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+                Text("You can share a link or a QR code - anybody will be able to join the group. You won't lose members of the group if you later delete it.")
+            }
+            .listRowBackground(Color.clear)
+            .listRowSeparator(.hidden)
+            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+
             Section {
                 if let groupLink = groupLink {
                     Picker("Initial role", selection: $groupLinkMemberRole) {
@@ -41,15 +69,17 @@ struct GroupLinkView: View {
                         }
                     }
                     .frame(height: 36)
-                    QRCode(uri: groupLink)
+                    SimpleXLinkQRCode(uri: groupLink)
                     Button {
-                        showShareSheet(items: [groupLink])
+                        showShareSheet(items: [simplexChatLink(groupLink)])
                     } label: {
                         Label("Share link", systemImage: "square.and.arrow.up")
                     }
 
-                    Button(role: .destructive) { alert = .deleteLink } label: {
-                        Label("Delete link", systemImage: "trash")
+                    if !creatingGroup {
+                        Button(role: .destructive) { alert = .deleteLink } label: {
+                            Label("Delete link", systemImage: "trash")
+                        }
                     }
                 } else {
                     Button(action: createGroupLink) {

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

@@ -12,37 +12,40 @@ import SimpleXChat
 struct GroupMemberInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
-    var groupInfo: GroupInfo
-    @State var member: GroupMember
+    @State var groupInfo: GroupInfo
+    @ObservedObject var groupMember: GMember
     var navigation: Bool = false
     @State private var connectionStats: ConnectionStats? = nil
     @State private var connectionCode: String? = nil
     @State private var newRole: GroupMemberRole = .member
     @State private var alert: GroupMemberInfoViewAlert?
-    @State private var connectToMemberDialog: Bool = false
+    @State private var sheet: PlanAndConnectActionSheet?
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @State private var justOpened = true
+    @State private var progressIndicator = false
 
     enum GroupMemberInfoViewAlert: Identifiable {
+        case blockMemberAlert(mem: GroupMember)
+        case unblockMemberAlert(mem: GroupMember)
         case removeMemberAlert(mem: GroupMember)
         case changeMemberRoleAlert(mem: GroupMember, role: GroupMemberRole)
         case switchAddressAlert
         case abortSwitchAddressAlert
         case syncConnectionForceAlert
-        case connRequestSentAlert(type: ConnReqType)
+        case planAndConnectAlert(alert: PlanAndConnectAlert)
         case error(title: LocalizedStringKey, error: LocalizedStringKey)
-        case other(alert: Alert)
 
         var id: String {
             switch self {
-            case .removeMemberAlert: return "removeMemberAlert"
-            case let .changeMemberRoleAlert(_, role): return "changeMemberRoleAlert \(role.rawValue)"
+            case let .blockMemberAlert(mem): return "blockMemberAlert \(mem.groupMemberId)"
+            case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)"
+            case let .removeMemberAlert(mem): return "removeMemberAlert \(mem.groupMemberId)"
+            case let .changeMemberRoleAlert(mem, role): return "changeMemberRoleAlert \(mem.groupMemberId) \(role.rawValue)"
             case .switchAddressAlert: return "switchAddressAlert"
             case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
             case .syncConnectionForceAlert: return "syncConnectionForceAlert"
-            case .connRequestSentAlert: return "connRequestSentAlert"
+            case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
             case let .error(title, _): return "error \(title)"
-            case let .other(alert): return "other \(alert)"
             }
         }
     }
@@ -65,171 +68,181 @@ struct GroupMemberInfoView: View {
     }
 
     private func groupMemberInfoView() -> some View {
-        VStack {
-            List {
-                groupMemberInfoHeader(member)
-                    .listRowBackground(Color.clear)
+        ZStack {
+            VStack {
+                let member = groupMember.wrapped
+                List {
+                    groupMemberInfoHeader(member)
+                        .listRowBackground(Color.clear)
 
-                if member.memberActive {
-                    Section {
-                        if let contactId = member.memberContactId {
-                            if let chat = knownDirectChat(contactId) {
+                    if member.memberActive {
+                        Section {
+                            if let contactId = member.memberContactId, let chat = knownDirectChat(contactId) {
                                 knownDirectChatButton(chat)
                             } else if groupInfo.fullGroupPreferences.directMessages.on {
-                                newDirectChatButton(contactId)
+                                if let contactId = member.memberContactId {
+                                    newDirectChatButton(contactId)
+                                } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
+                                    createMemberContactButton()
+                                }
                             }
+                            if let code = connectionCode { verifyCodeButton(code) }
+                            if let connStats = connectionStats,
+                               connStats.ratchetSyncAllowed {
+                                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 {
+                    if let contactLink = member.contactLink {
+                        Section {
+                            SimpleXLinkQRCode(uri: contactLink)
+                            Button {
+                                showShareSheet(items: [simplexChatLink(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 {
                                 connectViaAddressButton(contactLink)
                             }
-                        } else {
-                            connectViaAddressButton(contactLink)
+                        } header: {
+                            Text("Address")
+                        } footer: {
+                            Text("You can share this address with your contacts to let them connect with **\(member.displayName)**.")
                         }
-                    } 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)
+                    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)
+                        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)
+                        }
+
+                        // 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)
                         }
-                        .frame(height: 36)
-                    } else {
-                        infoRow("Role", member.memberRole.text)
                     }
 
-                    // 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(where: { $0.rcvSwitchStatus != nil }) {
-                            Button("Abort changing address") {
-                                alert = .abortSwitchAddressAlert
+                    if let connStats = connectionStats {
+                        Section("Servers") {
+                            // TODO network connection status
+                            Button("Change receiving address") {
+                                alert = .switchAddressAlert
                             }
                             .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
+                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                                 || 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 })
                     }
-                }
 
-                if member.canBeRemoved(groupInfo: groupInfo) {
                     Section {
-                        removeMemberButton(member)
+                        if member.memberSettings.showMessages {
+                            blockMemberButton(member)
+                        } else {
+                            unblockMemberButton(member)
+                        }
+                        if member.canBeRemoved(groupInfo: groupInfo) {
+                                removeMemberButton(member)
+                        }
                     }
-                }
 
-                if developerTools {
-                    Section("For console") {
-                        infoRow("Local name", member.localDisplayName)
-                        infoRow("Database ID", "\(member.groupMemberId)")
+                    if developerTools {
+                        Section("For console") {
+                            infoRow("Local name", member.localDisplayName)
+                            infoRow("Database ID", "\(member.groupMemberId)")
+                        }
                     }
                 }
-            }
-            .navigationBarHidden(true)
-            .onAppear {
-                if #unavailable(iOS 16) {
-                    // this condition prevents re-setting picker
-                    if !justOpened { return }
+                .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)
+                        _ = chatModel.upsertGroupMember(groupInfo, mem)
+                        connectionStats = stats
+                        connectionCode = code
+                    } catch let error {
+                        logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
+                    }
+                    justOpened = false
                 }
-                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))")
+                .onChange(of: newRole) { newRole in
+                    if newRole != member.memberRole {
+                        alert = .changeMemberRoleAlert(mem: member, role: newRole)
+                    }
                 }
-                justOpened = false
-            }
-            .onChange(of: newRole) { _ in
-                if newRole != member.memberRole {
-                    alert = .changeMemberRoleAlert(mem: member, role: newRole)
+                .onChange(of: member.memberRole) { role in
+                    newRole = role
                 }
             }
-        }
-        .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
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+            .alert(item: $alert) { alertItem in
+                switch(alertItem) {
+                case let .blockMemberAlert(mem): return blockMemberAlert(groupInfo, mem)
+                case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem)
+                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 .planAndConnectAlert(alert): return planAndConnectAlert(alert, dismiss: true)
+                case let .error(title, error): return Alert(title: Text(title), message: Text(error))
+                }
+            }
+            .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
+
+            if progressIndicator {
+                ProgressView().scaleEffect(2)
             }
         }
     }
 
     func connectViaAddressButton(_ contactLink: String) -> some View {
         Button {
-            connectToMemberDialog = true
+            planAndConnect(
+                contactLink,
+                showAlert: { alert = .planAndConnectAlert(alert: $0) },
+                showActionSheet: { sheet = $0 },
+                dismiss: true,
+                incognito: nil
+            )
         } 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) {
-        Task {
-            let (connReqType, connectAlert) = await apiConnect_(incognito: incognito, connReq: contactLink)
-            if let connReqType = connReqType {
-                alert = .connRequestSentAlert(type: connReqType)
-            } else if let connectAlert = connectAlert {
-                alert = .other(alert: connectAlert)
-            }
-        }
     }
 
     func knownDirectChatButton(_ chat: Chat) -> some View {
@@ -260,6 +273,33 @@ struct GroupMemberInfoView: View {
         }
     }
 
+    func createMemberContactButton() -> some View {
+        Button {
+            progressIndicator = true
+            Task {
+                do {
+                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.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))
@@ -296,20 +336,20 @@ struct GroupMemberInfoView: View {
     }
 
     private func verifyCodeButton(_ code: String) -> some View {
-        NavigationLink {
+        let member = groupMember.wrapped
+        return NavigationLink {
             VerifyCodeView(
                 displayName: member.displayName,
                 connectionCode: code,
                 connectionVerified: member.verified,
                 verify: { code in
+                    var member = groupMember.wrapped
                     if let r = apiVerifyGroupMember(member.groupId, member.groupMemberId, connectionCode: code) {
                         let (verified, existingCode) = r
                         let connCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
                         connectionCode = existingCode
                         member.activeConn?.connectionCode = connCode
-                        if let i = chatModel.groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
-                            chatModel.groupMembers[i].activeConn?.connectionCode = connCode
-                        }
+                        _ = chatModel.upsertGroupMember(groupInfo, member)
                         return r
                     }
                     return nil
@@ -343,12 +383,29 @@ struct GroupMemberInfoView: View {
         }
     }
 
+    private func blockMemberButton(_ mem: GroupMember) -> some View {
+        Button(role: .destructive) {
+            alert = .blockMemberAlert(mem: mem)
+        } label: {
+            Label("Block member", systemImage: "hand.raised")
+                .foregroundColor(.red)
+        }
+    }
+
+    private func unblockMemberButton(_ mem: GroupMember) -> some View {
+        Button {
+            alert = .unblockMemberAlert(mem: mem)
+        } label: {
+            Label("Unblock member", systemImage: "hand.raised.slash")
+        }
+    }
+
     private func removeMemberButton(_ mem: GroupMember) -> some View {
         Button(role: .destructive) {
             alert = .removeMemberAlert(mem: mem)
         } label: {
             Label("Remove member", systemImage: "trash")
-                .foregroundColor(Color.red)
+                .foregroundColor(.red)
         }
     }
 
@@ -384,7 +441,6 @@ struct GroupMemberInfoView: View {
                     do {
                         let updatedMember = try await apiMemberRole(groupInfo.groupId, mem.groupMemberId, newRole)
                         await MainActor.run {
-                            member = updatedMember
                             _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
                         }
                         
@@ -405,10 +461,10 @@ struct GroupMemberInfoView: View {
     private func switchMemberAddress() {
         Task {
             do {
-                let stats = try apiSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
+                let stats = try apiSwitchGroupMember(groupInfo.apiId, groupMember.groupMemberId)
                 connectionStats = stats
                 await MainActor.run {
-                    chatModel.updateGroupMemberConnectionStats(groupInfo, member, stats)
+                    chatModel.updateGroupMemberConnectionStats(groupInfo, groupMember.wrapped, stats)
                     dismiss()
                 }
             } catch let error {
@@ -424,10 +480,10 @@ struct GroupMemberInfoView: View {
     private func abortSwitchMemberAddress() {
         Task {
             do {
-                let stats = try apiAbortSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
+                let stats = try apiAbortSwitchGroupMember(groupInfo.apiId, groupMember.groupMemberId)
                 connectionStats = stats
                 await MainActor.run {
-                    chatModel.updateGroupMemberConnectionStats(groupInfo, member, stats)
+                    chatModel.updateGroupMemberConnectionStats(groupInfo, groupMember.wrapped, stats)
                 }
             } catch let error {
                 logger.error("abortSwitchMemberAddress apiAbortSwitchGroupMember error: \(responseError(error))")
@@ -442,7 +498,7 @@ struct GroupMemberInfoView: View {
     private func syncMemberConnection(force: Bool) {
         Task {
             do {
-                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, force)
+                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, groupMember.groupMemberId, force)
                 connectionStats = stats
                 await MainActor.run {
                     chatModel.updateGroupMemberConnectionStats(groupInfo, mem, stats)
@@ -459,11 +515,54 @@ struct GroupMemberInfoView: View {
     }
 }
 
+func blockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
+    Alert(
+        title: Text("Block member?"),
+        message: Text("All new messages from \(mem.chatViewName) will be hidden!"),
+        primaryButton: .destructive(Text("Block")) {
+            toggleShowMemberMessages(gInfo, mem, false)
+        },
+        secondaryButton: .cancel()
+    )
+}
+
+func unblockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
+    Alert(
+        title: Text("Unblock member?"),
+        message: Text("Messages from \(mem.chatViewName) will be shown!"),
+        primaryButton: .default(Text("Unblock")) {
+            toggleShowMemberMessages(gInfo, mem, true)
+        },
+        secondaryButton: .cancel()
+    )
+}
+
+func toggleShowMemberMessages(_ gInfo: GroupInfo, _ member: GroupMember, _ showMessages: Bool) {
+    var memberSettings = member.memberSettings
+    memberSettings.showMessages = showMessages
+    updateMemberSettings(gInfo, member, memberSettings)
+}
+
+func updateMemberSettings(_ gInfo: GroupInfo, _ member: GroupMember, _ memberSettings: GroupMemberSettings) {
+    Task {
+        do {
+            try await apiSetMemberSettings(gInfo.groupId, member.groupMemberId, memberSettings)
+            await MainActor.run {
+                var mem = member
+                mem.memberSettings = memberSettings
+                _ = ChatModel.shared.upsertGroupMember(gInfo, mem)
+            }
+        } catch let error {
+            logger.error("apiSetMemberSettings error \(responseError(error))")
+        }
+    }
+}
+
 struct GroupMemberInfoView_Previews: PreviewProvider {
     static var previews: some View {
         GroupMemberInfoView(
             groupInfo: GroupInfo.sampleData,
-            member: GroupMember.sampleData
+            groupMember: GMember.sampleData
         )
     }
 }

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

@@ -27,8 +27,7 @@ struct GroupPreferencesView: View {
                 featureSection(.directMessages, $preferences.directMessages.enable)
                 featureSection(.reactions, $preferences.reactions.enable)
                 featureSection(.voice, $preferences.voice.enable)
-//                TODO uncomment in 5.3
-//                featureSection(.files, $preferences.files.enable)
+                featureSection(.files, $preferences.files.enable)
 
                 if groupInfo.canEdit {
                     Section {

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

@@ -9,6 +9,18 @@
 import SwiftUI
 import SimpleXChat
 
+enum GroupProfileAlert: Identifiable {
+    case saveError(err: String)
+    case invalidName(validName: String)
+
+    var id: String {
+        switch self {
+        case let .saveError(err): return "saveError \(err)"
+        case let .invalidName(validName): return "invalidName \(validName)"
+        }
+    }
+}
+
 struct GroupProfileView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
@@ -18,8 +30,7 @@ struct GroupProfileView: View {
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
-    @State private var showSaveErrorAlert = false
-    @State private var saveGroupError: String? = nil
+    @State private var alert: GroupProfileAlert?
     @FocusState private var focusDisplayName
 
     var body: some View {
@@ -47,20 +58,29 @@ struct GroupProfileView: View {
             .frame(maxWidth: .infinity, alignment: .center)
 
             VStack(alignment: .leading) {
-                ZStack(alignment: .leading) {
-                    if !validDisplayName(groupProfile.displayName) {
-                        Image(systemName: "exclamationmark.circle")
-                            .foregroundColor(.red)
-                            .padding(.bottom, 10)
+                ZStack(alignment: .topLeading) {
+                    if !validNewProfileName() {
+                        Button {
+                            alert = .invalidName(validName: mkValidName(groupProfile.displayName))
+                        } label: {
+                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
+                        }
+                    } else {
+                        Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                     }
                     profileNameTextEdit("Group display name", $groupProfile.displayName)
                         .focused($focusDisplayName)
                 }
-                profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
+                .padding(.bottom)
+                let fullName = groupInfo.groupProfile.fullName
+                if fullName != "" && fullName != groupProfile.displayName {
+                    profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
+                        .padding(.bottom)
+                }
                 HStack(spacing: 20) {
                     Button("Cancel") { dismiss() }
                     Button("Save group profile") { saveProfile() }
-                        .disabled(groupProfile.displayName == "" || !validDisplayName(groupProfile.displayName))
+                        .disabled(!canUpdateProfile())
                 }
             }
             .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -99,27 +119,39 @@ struct GroupProfileView: View {
                 focusDisplayName = true
             }
         }
-        .alert(isPresented: $showSaveErrorAlert) {
-            Alert(
-                title: Text("Error saving group profile"),
-                message: Text("\(saveGroupError ?? "Unexpected error")")
-            )
+        .alert(item: $alert) { a in
+            switch a {
+            case let .saveError(err):
+                return Alert(
+                    title: Text("Error saving group profile"),
+                    message: Text(err)
+                )
+            case let .invalidName(name):
+                return createInvalidNameAlert(name, $groupProfile.displayName)
+            }
         }
         .contentShape(Rectangle())
         .onTapGesture { hideKeyboard() }
     }
 
+    private func canUpdateProfile() -> Bool {
+        groupProfile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName()
+    }
+
+    private func validNewProfileName() -> Bool {
+        groupProfile.displayName == groupInfo.groupProfile.displayName
+            || validDisplayName(groupProfile.displayName.trimmingCharacters(in: .whitespaces))
+    }
+
     func profileNameTextEdit(_ label: LocalizedStringKey, _ name: Binding<String>) -> some View {
         TextField(label, text: name)
-            .textInputAutocapitalization(.never)
-            .disableAutocorrection(true)
-            .padding(.bottom)
-            .padding(.leading, 28)
+            .padding(.leading, 32)
     }
 
     func saveProfile() {
         Task {
             do {
+                groupProfile.displayName = groupProfile.displayName.trimmingCharacters(in: .whitespaces)
                 let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
                 await MainActor.run {
                     groupInfo = gInfo
@@ -128,9 +160,8 @@ struct GroupProfileView: View {
                 }
             } catch let error {
                 let err = responseError(error)
-                saveGroupError = err
-                showSaveErrorAlert = true
-                logger.error("UserProfile apiUpdateProfile error: \(err)")
+                alert = .saveError(err: err)
+                logger.error("GroupProfile apiUpdateGroup error: \(err)")
             }
         }
     }

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

@@ -32,28 +32,41 @@ struct ChatListNavLink: View {
     @State private var showJoinGroupDialog = false
     @State private var showContactConnectionInfo = false
     @State private var showInvalidJSON = false
+    @State private var showDeleteContactActionSheet = false
+    @State private var inProgress = false
+    @State private var progressByTimeout = false
 
     var body: some View {
-        switch chat.chatInfo {
-        case let .direct(contact):
-            contactNavLink(contact)
-        case let .group(groupInfo):
-            groupNavLink(groupInfo)
-        case let .contactRequest(cReq):
-            contactRequestNavLink(cReq)
-        case let .contactConnection(cConn):
-            contactConnectionNavLink(cConn)
-        case let .invalidJSON(json):
-            invalidJSONPreview(json)
+        Group {
+            switch chat.chatInfo {
+            case let .direct(contact):
+                contactNavLink(contact)
+            case let .group(groupInfo):
+                groupNavLink(groupInfo)
+            case let .contactRequest(cReq):
+                contactRequestNavLink(cReq)
+            case let .contactConnection(cConn):
+                contactConnectionNavLink(cConn)
+            case let .invalidJSON(json):
+                invalidJSONPreview(json)
+            }
+        }
+        .onChange(of: inProgress) { inProgress in
+            if inProgress {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                    progressByTimeout = inProgress
+                }
+            } else {
+                progressByTimeout = false
+            }
         }
     }
 
     @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
-        let v = NavLinkPlain(
+        NavLinkPlain(
             tag: chat.chatInfo.id,
             selection: $chatModel.chatId,
-            label: { ChatPreviewView(chat: chat) },
-            disabled: !contact.ready
+            label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
         )
         .swipeActions(edge: .leading, allowsFullSwipe: true) {
             markReadButton()
@@ -65,23 +78,35 @@ struct ChatListNavLink: View {
                 clearChatButton()
             }
             Button {
-                AlertManager.shared.showAlert(
-                    contact.ready
-                    ? deleteContactAlert(chat.chatInfo)
-                    : deletePendingContactAlert(chat, contact)
-                )
+                if contact.ready || !contact.active {
+                    showDeleteContactActionSheet = true
+                } else {
+                    AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
+                }
             } label: {
                 Label("Delete", systemImage: "trash")
             }
             .tint(.red)
         }
         .frame(height: rowHeights[dynamicTypeSize])
-
-        if contact.ready {
-            v
-        } else {
-            v.onTapGesture {
-                AlertManager.shared.showAlert(pendingContactAlert(chat, contact))
+        .actionSheet(isPresented: $showDeleteContactActionSheet) {
+            if contact.ready && contact.active {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete and notify contact")) { Task { await deleteChat(chat, notify: true) } },
+                        .destructive(Text("Delete")) { Task { await deleteChat(chat, notify: false) } },
+                        .cancel()
+                    ]
+                )
+            } else {
+                return ActionSheet(
+                    title: Text("Delete contact?\nThis cannot be undone!"),
+                    buttons: [
+                        .destructive(Text("Delete")) { Task { await deleteChat(chat) } },
+                        .cancel()
+                    ]
+                )
             }
         }
     }
@@ -89,7 +114,7 @@ struct ChatListNavLink: View {
     @ViewBuilder private func groupNavLink(_ groupInfo: GroupInfo) -> some View {
         switch (groupInfo.membership.memberStatus) {
         case .memInvited:
-            ChatPreviewView(chat: chat)
+            ChatPreviewView(chat: chat, progressByTimeout: $progressByTimeout)
                 .frame(height: rowHeights[dynamicTypeSize])
                 .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                     joinGroupButton()
@@ -100,12 +125,16 @@ struct ChatListNavLink: View {
                 .onTapGesture { showJoinGroupDialog = true }
                 .confirmationDialog("Group invitation", isPresented: $showJoinGroupDialog, titleVisibility: .visible) {
                     Button(chat.chatInfo.incognito ? "Join incognito" : "Join group") {
-                        joinGroup(groupInfo.groupId)
+                        inProgress = true
+                        joinGroup(groupInfo.groupId) {
+                            await MainActor.run { inProgress = false }
+                        }
                     }
                     Button("Delete invitation", role: .destructive) { Task { await deleteChat(chat) } }
                 }
+                .disabled(inProgress)
         case .memAccepted:
-            ChatPreviewView(chat: chat)
+            ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
                 .frame(height: rowHeights[dynamicTypeSize])
                 .onTapGesture {
                     AlertManager.shared.showAlert(groupInvitationAcceptedAlert())
@@ -122,7 +151,7 @@ struct ChatListNavLink: View {
             NavLinkPlain(
                 tag: chat.chatInfo.id,
                 selection: $chatModel.chatId,
-                label: { ChatPreviewView(chat: chat) },
+                label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
                 disabled: !groupInfo.ready
             )
             .frame(height: rowHeights[dynamicTypeSize])
@@ -147,7 +176,10 @@ struct ChatListNavLink: View {
 
     private func joinGroupButton() -> some View {
         Button {
-            joinGroup(chat.chatInfo.apiId)
+            inProgress = true
+            joinGroup(chat.chatInfo.apiId) {
+                await MainActor.run { inProgress = false }
+            }
         } label: {
             Label("Join", systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward")
         }
@@ -278,17 +310,6 @@ struct ChatListNavLink: View {
         }
     }
 
-    private func deleteContactAlert(_ chatInfo: ChatInfo) -> Alert {
-        Alert(
-            title: Text("Delete contact?"),
-            message: Text("Contact and all messages will be deleted - this cannot be undone!"),
-            primaryButton: .destructive(Text("Delete")) {
-                Task { await deleteChat(chat) }
-            },
-            secondaryButton: .cancel()
-        )
-    }
-
     private func deleteGroupAlert(_ groupInfo: GroupInfo) -> Alert {
         Alert(
             title: Text("Delete group?"),
@@ -418,7 +439,7 @@ func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection,
     )
 }
 
-func joinGroup(_ groupId: Int64) {
+func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
     Task {
         logger.debug("joinGroup")
         do {
@@ -433,7 +454,9 @@ func joinGroup(_ groupId: Int64) {
                 AlertManager.shared.showAlertMsg(title: "No group!", message: "This group no longer exists.")
                 await deleteGroup()
             }
+            await onComplete()
         } catch let error {
+            await onComplete()
             let a = getErrorAlert(error, "Error joining group")
             AlertManager.shared.showAlertMsg(title: a.title, message: a.message)
         }

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

@@ -29,7 +29,7 @@ struct ChatListView: View {
         ZStack(alignment: .topLeading) {
             NavStackCompat(
                 isActive: Binding(
-                    get: { ChatModel.shared.chatId != nil },
+                    get: { chatModel.chatId != nil },
                     set: { _ in }
                 ),
                 destination: chatView

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

@@ -12,6 +12,7 @@ import SimpleXChat
 struct ChatPreviewView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var chat: Chat
+    @Binding var progressByTimeout: Bool
     @Environment(\.colorScheme) var colorScheme
     var darkGreen = Color(red: 0, green: 0.5, blue: 0)
 
@@ -57,19 +58,26 @@ struct ChatPreviewView: View {
     }
 
     @ViewBuilder private func chatPreviewImageOverlayIcon() -> some View {
-        if case let .group(groupInfo) = chat.chatInfo {
+        switch chat.chatInfo {
+        case let .direct(contact):
+            if !contact.active {
+                inactiveIcon()
+            } else {
+                EmptyView()
+            }
+        case let .group(groupInfo):
             switch (groupInfo.membership.memberStatus) {
-            case .memLeft: groupInactiveIcon()
-            case .memRemoved: groupInactiveIcon()
-            case .memGroupDeleted: groupInactiveIcon()
+            case .memLeft: inactiveIcon()
+            case .memRemoved: inactiveIcon()
+            case .memGroupDeleted: inactiveIcon()
             default: EmptyView()
             }
-        } else {
+        default:
             EmptyView()
         }
     }
 
-    @ViewBuilder private func groupInactiveIcon() -> some View {
+    @ViewBuilder private func inactiveIcon() -> some View {
         Image(systemName: "multiply.circle.fill")
             .foregroundColor(.secondary.opacity(0.65))
             .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
@@ -80,7 +88,6 @@ struct ChatPreviewView: View {
         switch chat.chatInfo {
         case let .direct(contact):
             previewTitle(contact.verified == true ? verifiedIcon + t : t)
-                .foregroundColor(chat.chatInfo.ready ? .primary : .secondary)
         case let .group(groupInfo):
             let v = previewTitle(t)
             switch (groupInfo.membership.memberStatus) {
@@ -105,14 +112,17 @@ struct ChatPreviewView: View {
 
     private func chatPreviewLayout(_ text: Text, draft: Bool = false) -> some View {
         ZStack(alignment: .topTrailing) {
-            text
+            let t = text
                 .lineLimit(2)
                 .multilineTextAlignment(.leading)
                 .frame(maxWidth: .infinity, alignment: .topLeading)
                 .padding(.leading, 8)
                 .padding(.trailing, 36)
-                .privacySensitive(!showChatPreviews && !draft)
-                .redacted(reason: .privacy)
+            if !showChatPreviews && !draft {
+                t.privacySensitive(true).redacted(reason: .privacy)
+            } else {
+                t
+            }
             let s = chat.chatStats
             if s.unreadCount > 0 || s.unreadChat {
                 unreadCountText(s.unreadCount)
@@ -181,7 +191,11 @@ struct ChatPreviewView: View {
             switch (chat.chatInfo) {
             case let .direct(contact):
                 if !contact.ready {
-                    chatPreviewInfoText("connecting…")
+                    if contact.nextSendGrpInv {
+                        chatPreviewInfoText("send direct message")
+                    } else if contact.active {
+                        chatPreviewInfoText("connecting…")
+                    }
                 }
             case let .group(groupInfo):
                 switch (groupInfo.membership.memberStatus) {
@@ -224,16 +238,26 @@ struct ChatPreviewView: View {
     @ViewBuilder private func chatStatusImage() -> some View {
         switch chat.chatInfo {
         case let .direct(contact):
-            switch (chatModel.contactNetworkStatus(contact)) {
-            case .connected: incognitoIcon(chat.chatInfo.incognito)
-            case .error:
-                Image(systemName: "exclamationmark.circle")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 17, height: 17)
-                    .foregroundColor(.secondary)
-            default:
+            if contact.active {
+                switch (chatModel.contactNetworkStatus(contact)) {
+                case .connected: incognitoIcon(chat.chatInfo.incognito)
+                case .error:
+                    Image(systemName: "exclamationmark.circle")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 17, height: 17)
+                        .foregroundColor(.secondary)
+                default:
+                    ProgressView()
+                }
+            } else {
+                incognitoIcon(chat.chatInfo.incognito)
+            }
+        case .group:
+            if progressByTimeout {
                 ProgressView()
+            } else {
+                incognitoIcon(chat.chatInfo.incognito)
             }
         default:
             incognitoIcon(chat.chatInfo.incognito)
@@ -263,30 +287,30 @@ struct ChatPreviewView_Previews: PreviewProvider {
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: []
-            ))
+            ), progressByTimeout: Binding.constant(false))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))]
-            ))
+            ), progressByTimeout: Binding.constant(false))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                 chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
-            ))
+            ), progressByTimeout: Binding.constant(false))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))]
-            ))
+            ), progressByTimeout: Binding.constant(false))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete))],
                 chatStats: ChatStats(unreadCount: 3, minUnreadItemId: 0)
-            ))
+            ), progressByTimeout: Binding.constant(false))
             ChatPreviewView(chat: Chat(
                 chatInfo: ChatInfo.sampleData.group,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "Lorem ipsum dolor sit amet, d. consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")],
                 chatStats: ChatStats(unreadCount: 11, minUnreadItemId: 0)
-            ))
+            ), progressByTimeout: Binding.constant(false))
         }
         .previewLayout(.fixed(width: 360, height: 78))
     }

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

@@ -61,7 +61,7 @@ struct ContactConnectionInfo: View {
 
                     if contactConnection.initiated,
                        let connReqInv = contactConnection.connReqInv {
-                        QRCode(uri: connReqInv)
+                        SimpleXLinkQRCode(uri: simplexChatLink(connReqInv))
                         incognitoEnabled()
                         shareLinkButton(connReqInv)
                         oneTimeLinkLearnMoreButton()
@@ -119,7 +119,7 @@ struct ContactConnectionInfo: View {
                 if let conn = try await apiSetConnectionAlias(connId: contactConnection.pccConnId, localAlias: localAlias) {
                     await MainActor.run {
                         contactConnection = conn
-                        ChatModel.shared.updateContactConnection(conn)
+                        m.updateContactConnection(conn)
                         dismiss()
                     }
                 }

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,11 +8,15 @@
 
 import SwiftUI
 
-func showShareSheet(items: [Any]) {
+func showShareSheet(items: [Any], completed: (() -> Void)? = nil) {
     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/Helpers/VideoPlayerView.swift

@@ -52,7 +52,6 @@ struct VideoPlayerView: UIViewRepresentable {
         var timeObserver: Any? = nil
 
         deinit {
-            print("deinit coordinator of VideoPlayer")
             if let timeObserver = timeObserver {
                 NotificationCenter.default.removeObserver(timeObserver)
             }

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

@@ -21,7 +21,7 @@ struct AddContactView: View {
             List {
                 Section {
                     if connReqInvitation != "" {
-                        QRCode(uri: connReqInvitation)
+                        SimpleXLinkQRCode(uri: connReqInvitation)
                     } else {
                         ProgressView()
                             .progressViewStyle(.circular)
@@ -48,7 +48,7 @@ struct AddContactView: View {
                        let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
                         await MainActor.run {
                             contactConnection = conn
-                            ChatModel.shared.updateContactConnection(conn)
+                            chatModel.updateContactConnection(conn)
                         }
                     }
                 } catch {
@@ -99,7 +99,7 @@ func sharedProfileInfo(_ incognito: Bool) -> Text {
 
 func shareLinkButton(_ connReqInvitation: String) -> some View {
     Button {
-        showShareSheet(items: [connReqInvitation])
+        showShareSheet(items: [simplexChatLink(connReqInvitation)])
     } label: {
         settingsRow("square.and.arrow.up") {
             Text("Share 1-time link")

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

@@ -12,27 +12,45 @@ import SimpleXChat
 struct AddGroupView: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
     @State private var chat: Chat?
     @State private var groupInfo: GroupInfo?
     @State private var profile = GroupProfile(displayName: "", fullName: "")
     @FocusState private var focusDisplayName
-    @FocusState private var focusFullName
     @State private var showChooseSource = false
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
+    @State private var showInvalidNameAlert = false
+    @State private var groupLink: String?
+    @State private var groupLinkMemberRole: GroupMemberRole = .member
 
     var body: some View {
         if let chat = chat, let groupInfo = groupInfo {
-            AddGroupMembersViewCommon(
-                chat: chat,
-                groupInfo: groupInfo,
-                creatingGroup: true,
-                showFooterCounter: false
-            ) { _ in
-                dismiss()
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                    m.chatId = groupInfo.id
+            if !groupInfo.membership.memberIncognito {
+                AddGroupMembersViewCommon(
+                    chat: chat,
+                    groupInfo: groupInfo,
+                    creatingGroup: true,
+                    showFooterCounter: false
+                ) { _ in
+                    dismiss()
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                        m.chatId = groupInfo.id
+                    }
+                }
+            } else {
+                GroupLinkView(
+                    groupId: groupInfo.groupId,
+                    groupLink: $groupLink,
+                    groupLinkMemberRole: $groupLinkMemberRole,
+                    showTitle: true,
+                    creatingGroup: true
+                ) {
+                    dismiss()
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                        m.chatId = groupInfo.id
+                    }
                 }
             }
         } else {
@@ -41,79 +59,62 @@ struct AddGroupView: View {
     }
 
     func createGroupView() -> some View {
-        VStack(alignment: .leading) {
-            Text("Create secret group")
-                .font(.largeTitle)
-                .padding(.vertical, 4)
-            Text("The group is fully decentralized – it is visible only to the members.")
-                .padding(.bottom, 4)
+        List {
+            Group {
+                Text("Create secret group")
+                    .font(.largeTitle)
+                    .bold()
+                    .fixedSize(horizontal: false, vertical: true)
+                    .padding(.bottom, 24)
+                    .onTapGesture(perform: hideKeyboard)
 
-            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)
-
-            ZStack(alignment: .center) {
-                ZStack(alignment: .topTrailing) {
-                    profileImageView(profile.image)
-                    if profile.image != nil {
-                        Button {
-                            profile.image = nil
-                        } label: {
-                            Image(systemName: "multiply")
-                                .resizable()
-                                .aspectRatio(contentMode: .fit)
-                                .frame(width: 12)
+                ZStack(alignment: .center) {
+                    ZStack(alignment: .topTrailing) {
+                        ProfileImage(imageStr: profile.image, color: Color(uiColor: .secondarySystemGroupedBackground))
+                            .aspectRatio(1, contentMode: .fit)
+                            .frame(maxWidth: 128, maxHeight: 128)
+                        if profile.image != nil {
+                            Button {
+                                profile.image = nil
+                            } label: {
+                                Image(systemName: "multiply")
+                                    .resizable()
+                                    .aspectRatio(contentMode: .fit)
+                                    .frame(width: 12)
+                            }
                         }
                     }
+
+                    editImageButton { showChooseSource = true }
+                        .buttonStyle(BorderlessButtonStyle()) // otherwise whole "list row" is clickable
                 }
-
-                editImageButton { showChooseSource = true }
+                .frame(maxWidth: .infinity, alignment: .center)
             }
-            .frame(maxWidth: .infinity, alignment: .center)
-            .padding(.bottom, 4)
+            .listRowBackground(Color.clear)
+            .listRowSeparator(.hidden)
+            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
 
-            ZStack(alignment: .topLeading) {
-                if !validDisplayName(profile.displayName) {
-                    Image(systemName: "exclamationmark.circle")
-                        .foregroundColor(.red)
-                        .padding(.top, 4)
+            Section {
+                groupNameTextField()
+                Button(action: createGroup) {
+                    settingsRow("checkmark", color: .accentColor) { Text("Create group") }
                 }
-                textField("Group display name", text: $profile.displayName)
-                    .focused($focusDisplayName)
-                    .submitLabel(.next)
-                    .onSubmit {
-                        if canCreateProfile() { focusFullName = true }
-                        else { focusDisplayName = true }
-                    }
-            }
-            textField("Group full name (optional)", text: $profile.fullName)
-                .focused($focusFullName)
-                .submitLabel(.go)
-                .onSubmit {
-                    if canCreateProfile() { createGroup() }
-                    else { focusFullName = true }
+                .disabled(!canCreateProfile())
+                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+            } footer: {
+                VStack(alignment: .leading, spacing: 4) {
+                    sharedGroupProfileInfo(incognitoDefault)
+                    Text("Fully decentralized – visible only to members.")
                 }
-
-            Spacer()
-
-            Button {
-                createGroup()
-            } label: {
-                Text("Create")
-                Image(systemName: "greaterthan")
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .onTapGesture(perform: hideKeyboard)
             }
-            .disabled(!canCreateProfile())
-            .frame(maxWidth: .infinity, alignment: .trailing)
         }
         .onAppear() {
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                 focusDisplayName = true
             }
         }
-        .padding()
         .confirmationDialog("Group image", isPresented: $showChooseSource, titleVisibility: .visible) {
             Button("Take picture") {
                 showTakePhoto = true
@@ -133,6 +134,9 @@ struct AddGroupView: View {
                 didSelectItem in showImagePicker = false
             }
         }
+        .alert(isPresented: $showInvalidNameAlert) {
+            createInvalidNameAlert(mkValidName(profile.displayName), $profile.displayName)
+        }
         .onChange(of: chosenImage) { image in
             if let image = image {
                 profile.image = resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
@@ -140,26 +144,52 @@ struct AddGroupView: View {
                 profile.image = nil
             }
         }
-        .contentShape(Rectangle())
-        .onTapGesture { hideKeyboard() }
+    }
+
+    func groupNameTextField() -> some View {
+        ZStack(alignment: .leading) {
+            let name = profile.displayName.trimmingCharacters(in: .whitespaces)
+            if name != mkValidName(name) {
+                Button {
+                    showInvalidNameAlert = true
+                } label: {
+                    Image(systemName: "exclamationmark.circle").foregroundColor(.red)
+                }
+            } else {
+                Image(systemName: "pencil").foregroundColor(.secondary)
+            }
+            textField("Enter group name…", text: $profile.displayName)
+                .focused($focusDisplayName)
+                .submitLabel(.continue)
+                .onSubmit {
+                    if canCreateProfile() { createGroup() }
+                }
+        }
     }
 
     func textField(_ placeholder: LocalizedStringKey, text: Binding<String>) -> some View {
         TextField(placeholder, text: text)
-            .textInputAutocapitalization(.never)
-            .disableAutocorrection(true)
-            .padding(.leading, 28)
-            .padding(.bottom)
+            .padding(.leading, 36)
+    }
+
+    func sharedGroupProfileInfo(_ 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 createGroup() {
         hideKeyboard()
         do {
-            let gInfo = try apiNewGroup(profile)
+            profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
+            let gInfo = try apiNewGroup(incognito: incognitoDefault, groupProfile: profile)
             Task {
                 let groupMembers = await apiListMembers(gInfo.groupId)
                 await MainActor.run {
-                    ChatModel.shared.groupMembers = groupMembers
+                    m.groupMembers = groupMembers.map { GMember.init($0) }
                 }
             }
             let c = Chat(chatInfo: .group(groupInfo: gInfo), chatItems: [])
@@ -180,7 +210,8 @@ struct AddGroupView: View {
     }
 
     func canCreateProfile() -> Bool {
-        profile.displayName != "" && validDisplayName(profile.displayName)
+        let name = profile.displayName.trimmingCharacters(in: .whitespaces)
+        return name != "" && validDisplayName(name)
     }
 }
 

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

@@ -58,65 +58,369 @@ struct NewChatButton: View {
     }
 }
 
-enum ConnReqType: Equatable {
-    case contact
-    case invitation
+enum PlanAndConnectAlert: Identifiable {
+    case ownInvitationLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case invitationLinkConnecting(connectionLink: String)
+    case ownContactAddressConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case contactAddressConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConnecting(connectionLink: String, groupInfo: GroupInfo?)
+
+    var id: String {
+        switch self {
+        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink)"
+        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink)"
+        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink)"
+        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink)"
+        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink)"
+        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink)"
+        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink)"
+        }
+    }
 }
 
-func connectViaLink(_ connectionLink: String, dismiss: DismissAction? = nil, incognito: Bool) {
-    Task {
-        if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
-            DispatchQueue.main.async {
-                dismiss?()
-                AlertManager.shared.showAlert(connReqSentAlert(connReqType))
-            }
+func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool) -> Alert {
+    switch alert {
+    case let .ownInvitationLinkConfirmConnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Connect to yourself?"),
+            message: Text("This is your own one-time link!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Connect incognito" : "Connect"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
+            ),
+            secondaryButton: .cancel()
+        )
+    case .invitationLinkConnecting:
+        return Alert(
+            title: Text("Already connecting!"),
+            message: Text("You are already connecting via this one-time link!")
+        )
+    case let .ownContactAddressConfirmConnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Connect to yourself?"),
+            message: Text("This is your own SimpleX address!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Connect incognito" : "Connect"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
+            ),
+            secondaryButton: .cancel()
+        )
+    case let .contactAddressConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Repeat connection request?"),
+            message: Text("You have already requested connection via this address!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Connect incognito" : "Connect"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
+            ),
+            secondaryButton: .cancel()
+        )
+    case let .groupLinkConfirmConnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Join group?"),
+            message: Text("You will connect to all group members."),
+            primaryButton: .default(
+                Text(incognito ? "Join incognito" : "Join"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
+            ),
+            secondaryButton: .cancel()
+        )
+    case let .groupLinkConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
+        return Alert(
+            title: Text("Repeat join request?"),
+            message: Text("You are already joining the group via this link!"),
+            primaryButton: .destructive(
+                Text(incognito ? "Join incognito" : "Join"),
+                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) }
+            ),
+            secondaryButton: .cancel()
+        )
+    case let .groupLinkConnecting(_, groupInfo):
+        if let groupInfo = groupInfo {
+            return Alert(
+                title: Text("Group already exists!"),
+                message: Text("You are already joining the group \(groupInfo.displayName).")
+            )
         } else {
-            DispatchQueue.main.async {
-                dismiss?()
+            return Alert(
+                title: Text("Already joining the group!"),
+                message: Text("You are already joining the group via this link.")
+            )
+        }
+    }
+}
+
+enum PlanAndConnectActionSheet: Identifiable {
+    case askCurrentOrIncognitoProfile(connectionLink: String, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
+    case askCurrentOrIncognitoProfileDestructive(connectionLink: String, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
+    case ownGroupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool?, groupInfo: GroupInfo)
+
+    var id: String {
+        switch self {
+        case let .askCurrentOrIncognitoProfile(connectionLink, _, _): return "askCurrentOrIncognitoProfile \(connectionLink)"
+        case let .askCurrentOrIncognitoProfileDestructive(connectionLink, _, _): return "askCurrentOrIncognitoProfileDestructive \(connectionLink)"
+        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink)"
+        }
+    }
+}
+
+func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool) -> ActionSheet {
+    switch sheet {
+    case let .askCurrentOrIncognitoProfile(connectionLink, connectionPlan, title):
+        return ActionSheet(
+            title: Text(title),
+            buttons: [
+                .default(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
+                .default(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
+                .cancel()
+            ]
+        )
+    case let .askCurrentOrIncognitoProfileDestructive(connectionLink, connectionPlan, title):
+        return ActionSheet(
+            title: Text(title),
+            buttons: [
+                .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
+                .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
+                .cancel()
+            ]
+        )
+    case let .ownGroupLinkConfirmConnect(connectionLink, connectionPlan, incognito, groupInfo):
+        if let incognito = incognito {
+            return ActionSheet(
+                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
+                buttons: [
+                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
+                    .destructive(Text(incognito ? "Join incognito" : "Join with current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito) },
+                    .cancel()
+                ]
+            )
+        } else {
+            return ActionSheet(
+                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
+                buttons: [
+                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
+                    .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false) },
+                    .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true) },
+                    .cancel()
+                ]
+            )
+        }
+    }
+}
+
+func planAndConnect(
+    _ connectionLink: String,
+    showAlert: @escaping (PlanAndConnectAlert) -> Void,
+    showActionSheet: @escaping (PlanAndConnectActionSheet) -> Void,
+    dismiss: Bool,
+    incognito: Bool?
+) {
+    Task {
+        do {
+            let connectionPlan = try await apiConnectPlan(connReq: connectionLink)
+            switch connectionPlan {
+            case let .invitationLink(ilp):
+                switch ilp {
+                case .ok:
+                    logger.debug("planAndConnect, .invitationLink, .ok, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito)
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
+                    }
+                case .ownLink:
+                    logger.debug("planAndConnect, .invitationLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.ownInvitationLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own one-time link!"))
+                    }
+                case let .connecting(contact_):
+                    logger.debug("planAndConnect, .invitationLink, .connecting, incognito=\(incognito?.description ?? "nil")")
+                    if let contact = contact_ {
+                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
+                    } else {
+                        showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
+                    }
+                case let .known(contact):
+                    logger.debug("planAndConnect, .invitationLink, .known, incognito=\(incognito?.description ?? "nil")")
+                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
+                }
+            case let .contactAddress(cap):
+                switch cap {
+                case .ok:
+                    logger.debug("planAndConnect, .contactAddress, .ok, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito)
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
+                    }
+                case .ownLink:
+                    logger.debug("planAndConnect, .contactAddress, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.ownContactAddressConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own SimpleX address!"))
+                    }
+                case .connectingConfirmReconnect:
+                    logger.debug("planAndConnect, .contactAddress, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.contactAddressConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You have already requested connection!\nRepeat connection request?"))
+                    }
+                case let .connectingProhibit(contact):
+                    logger.debug("planAndConnect, .contactAddress, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
+                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
+                case let .known(contact):
+                    logger.debug("planAndConnect, .contactAddress, .known, incognito=\(incognito?.description ?? "nil")")
+                    openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
+                }
+            case let .groupLink(glp):
+                switch glp {
+                case .ok:
+                    if let incognito = incognito {
+                        showAlert(.groupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Join group"))
+                    }
+                case let .ownLink(groupInfo):
+                    logger.debug("planAndConnect, .groupLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    showActionSheet(.ownGroupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito, groupInfo: groupInfo))
+                case .connectingConfirmReconnect:
+                    logger.debug("planAndConnect, .groupLink, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
+                    if let incognito = incognito {
+                        showAlert(.groupLinkConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
+                    } else {
+                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You are already joining the group!\nRepeat join request?"))
+                    }
+                case let .connectingProhibit(groupInfo_):
+                    logger.debug("planAndConnect, .groupLink, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
+                    showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
+                case let .known(groupInfo):
+                    logger.debug("planAndConnect, .groupLink, .known, incognito=\(incognito?.description ?? "nil")")
+                    openKnownGroup(groupInfo, dismiss: dismiss) { AlertManager.shared.showAlert(groupAlreadyExistsAlert(groupInfo)) }
+                }
+            }
+        } catch {
+            logger.debug("planAndConnect, plan error")
+            if let incognito = incognito {
+                connectViaLink(connectionLink, connectionPlan: nil, dismiss: dismiss, incognito: incognito)
+            } else {
+                showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: nil, title: "Connect via link"))
             }
         }
     }
 }
 
-struct CReqClientData: Decodable {
-    var type: String
-    var groupLinkId: String?
-}
-
-func parseLinkQueryData(_ connectionLink: String) -> CReqClientData? {
-    if let hashIndex = connectionLink.firstIndex(of: "#"),
-       let urlQuery = URL(string: String(connectionLink[connectionLink.index(after: hashIndex)...])),
-       let components = URLComponents(url: urlQuery, resolvingAgainstBaseURL: false),
-       let data = components.queryItems?.first(where: { $0.name == "data" })?.value,
-       let d = data.data(using: .utf8),
-       let crData = try? getJSONDecoder().decode(CReqClientData.self, from: d) {
-        return crData
-    } else {
-        return nil
+private func connectViaLink(_ connectionLink: String, connectionPlan: ConnectionPlan?, dismiss: Bool, incognito: Bool) {
+    Task {
+        if let connReqType = await apiConnect(incognito: incognito, connReq: connectionLink) {
+            let crt: ConnReqType
+            if let plan = connectionPlan {
+                crt = planToConnReqType(plan)
+            } else {
+                crt = connReqType
+            }
+            DispatchQueue.main.async {
+                if dismiss {
+                    dismissAllSheets(animated: true) {
+                        AlertManager.shared.showAlert(connReqSentAlert(crt))
+                    }
+                } else {
+                    AlertManager.shared.showAlert(connReqSentAlert(crt))
+                }
+            }
+        } else {
+            if dismiss {
+                DispatchQueue.main.async {
+                    dismissAllSheets(animated: true)
+                }
+            }
+        }
     }
 }
 
-func checkCRDataGroup(_ crData: CReqClientData) -> Bool {
-    return crData.type == "group" && crData.groupLinkId != nil
+func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
+    Task {
+        let m = ChatModel.shared
+        if let c = m.getContactChat(contact.contactId) {
+            DispatchQueue.main.async {
+                if dismiss {
+                    dismissAllSheets(animated: true) {
+                        m.chatId = c.id
+                        showAlreadyExistsAlert?()
+                    }
+                } else {
+                    m.chatId = c.id
+                    showAlreadyExistsAlert?()
+                }
+            }
+        }
+    }
 }
 
-func groupLinkAlert(_ connectionLink: String, incognito: Bool) -> 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)
-        },
-        secondaryButton: .cancel()
+func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
+    Task {
+        let m = ChatModel.shared
+        if let g = m.getGroupChat(groupInfo.groupId) {
+            DispatchQueue.main.async {
+                if dismiss {
+                    dismissAllSheets(animated: true) {
+                        m.chatId = g.id
+                        showAlreadyExistsAlert?()
+                    }
+                } else {
+                    m.chatId = g.id
+                    showAlreadyExistsAlert?()
+                }
+            }
+        }
+    }
+}
+
+func contactAlreadyConnectingAlert(_ contact: Contact) -> Alert {
+    mkAlert(
+        title: "Contact already exists",
+        message: "You are already connecting to \(contact.displayName)."
     )
 }
 
+func groupAlreadyExistsAlert(_ groupInfo: GroupInfo) -> Alert {
+    mkAlert(
+        title: "Group already exists",
+        message: "You are already in group \(groupInfo.displayName)."
+    )
+}
+
+enum ConnReqType: Equatable {
+    case invitation
+    case contact
+    case groupLink
+
+    var connReqSentText: LocalizedStringKey {
+        switch self {
+        case .invitation: return "You will be connected when your contact's device is online, please wait or check later!"
+        case .contact: return "You will be connected when your connection request is accepted, please wait or check later!"
+        case .groupLink: return "You will be connected when group link host's device is online, please wait or check later!"
+        }
+    }
+}
+
+private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType {
+    switch connectionPlan {
+    case .invitationLink: return .invitation
+    case .contactAddress: return .contact
+    case .groupLink: return .groupLink
+    }
+}
+
 func connReqSentAlert(_ type: ConnReqType) -> Alert {
     return mkAlert(
         title: "Connection request sent!",
-        message: type == .contact
-            ? "You will be connected when your connection request is accepted, please wait or check later!"
-            : "You will be connected when your contact's device is online, please wait or check later!"
+        message: type.connReqSentText
     )
 }
 

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

@@ -14,6 +14,8 @@ struct PasteToConnectView: View {
     @State private var connectionLink: String = ""
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
     @FocusState private var linkEditorFocused: Bool
+    @State private var alert: PlanAndConnectAlert?
+    @State private var sheet: PlanAndConnectActionSheet?
 
     var body: some View {
         List {
@@ -52,11 +54,15 @@ struct PasteToConnectView: View {
                 
                 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.")
+                VStack(alignment: .leading, spacing: 4) {
+                    sharedProfileInfo(incognitoDefault)
+                    Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
             }
         }
+        .alert(item: $alert) { a in planAndConnectAlert(a, dismiss: true) }
+        .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
     }
 
     private func linkEditor() -> some View {
@@ -83,13 +89,13 @@ struct PasteToConnectView: View {
 
     private func connect() {
         let link = connectionLink.trimmingCharacters(in: .whitespaces)
-        if let crData = parseLinkQueryData(link),
-           checkCRDataGroup(crData) {
-            dismiss()
-            AlertManager.shared.showAlert(groupLinkAlert(link, incognito: incognitoDefault))
-        } else {
-            connectViaLink(link, dismiss: dismiss, incognito: incognitoDefault)
-        }
+        planAndConnect(
+            link,
+            showAlert: { alert = $0 },
+            showActionSheet: { sheet = $0 },
+            dismiss: true,
+            incognito: incognitoDefault
+        )
     }
 }
 

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

@@ -28,6 +28,22 @@ struct MutableQRCode: View {
     }
 }
 
+struct SimpleXLinkQRCode: View {
+    let uri: String
+    var withLogo: Bool = true
+    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
+
+    var body: some View {
+        QRCode(uri: simplexChatLink(uri), withLogo: withLogo, tintColor: tintColor)
+    }
+}
+
+func simplexChatLink(_ uri: String) -> String {
+    uri.starts(with: "simplex:/")
+    ? uri.replacingOccurrences(of: "simplex:/", with: "https://simplex.chat/")
+    : uri
+}
+
 struct QRCode: View {
     let uri: String
     var withLogo: Bool = true

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

@@ -13,6 +13,8 @@ import CodeScanner
 struct ScanToConnectView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+    @State private var alert: PlanAndConnectAlert?
+    @State private var sheet: PlanAndConnectActionSheet?
 
     var body: some View {
         ScrollView {
@@ -36,11 +38,11 @@ struct ScanToConnectView: View {
                     )
                     .padding(.top)
 
-                Group {
+                VStack(alignment: .leading, spacing: 4) {
                     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.")
+                    Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
                 }
+                .frame(maxWidth: .infinity, alignment: .leading)
                 .font(.footnote)
                 .foregroundColor(.secondary)
                 .padding(.horizontal)
@@ -49,18 +51,20 @@ struct ScanToConnectView: View {
             .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
         }
         .background(Color(.systemGroupedBackground))
+        .alert(item: $alert) { a in planAndConnectAlert(a, dismiss: true) }
+        .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
     }
 
     func processQRCode(_ resp: Result<ScanResult, ScanError>) {
         switch resp {
         case let .success(r):
-            if let crData = parseLinkQueryData(r.string),
-               checkCRDataGroup(crData) {
-                dismiss()
-                AlertManager.shared.showAlert(groupLinkAlert(r.string, incognito: incognitoDefault))
-            } else {
-                Task { connectViaLink(r.string, dismiss: dismiss, incognito: incognitoDefault) }
-            }
+            planAndConnect(
+                r.string,
+                showAlert: { alert = $0 },
+                showActionSheet: { sheet = $0 },
+                dismiss: true,
+                incognito: incognitoDefault
+            )
         case let .failure(e):
             logger.error("ConnectContactView.processQRCode QR code error: \(e.localizedDescription)")
             dismiss()

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

@@ -9,175 +9,244 @@
 import SwiftUI
 import SimpleXChat
 
+enum UserProfileAlert: Identifiable {
+    case duplicateUserError
+    case createUserError(error: LocalizedStringKey)
+    case invalidNameError(validName: String)
+
+    var id: String {
+        switch self {
+        case .duplicateUserError: return "duplicateUserError"
+        case .createUserError: return "createUserError"
+        case let .invalidNameError(validName): return "invalidNameError \(validName)"
+        }
+    }
+}
+
 struct CreateProfile: View {
+    @Environment(\.dismiss) var dismiss
+    @State private var displayName: String = ""
+    @FocusState private var focusDisplayName
+    @State private var alert: UserProfileAlert?
+
+    var body: some View {
+        List {
+            Section {
+                TextField("Enter your name…", text: $displayName)
+                    .focused($focusDisplayName)
+                Button {
+                    createProfile(displayName, showAlert: { alert = $0 }, dismiss: dismiss)
+                } label: {
+                    Label("Create profile", systemImage: "checkmark")
+                }
+                .disabled(!canCreateProfile(displayName))
+            } header: {
+                HStack {
+                    Text("Your profile")
+                    let name = displayName.trimmingCharacters(in: .whitespaces)
+                    let validName = mkValidName(name)
+                    if name != validName {
+                        Spacer()
+                        Image(systemName: "exclamationmark.circle")
+                            .foregroundColor(.red)
+                            .onTapGesture {
+                                alert = .invalidNameError(validName: validName)
+                            }
+                    }
+                }
+                .frame(height: 20)
+            } footer: {
+                VStack(alignment: .leading, spacing: 8) {
+                    Text("Your profile, contacts and delivered messages are stored on your device.")
+                    Text("The profile is only shared with your contacts.")
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
+            }
+        }
+        .navigationTitle("Create your profile")
+        .alert(item: $alert) { a in userProfileAlert(a, $displayName) }
+        .onAppear() {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                focusDisplayName = true
+            }
+        }
+        .keyboardPadding()
+    }
+}
+
+struct CreateFirstProfile: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.dismiss) var dismiss
     @State private var displayName: String = ""
-    @State private var fullName: String = ""
     @FocusState private var focusDisplayName
-    @FocusState private var focusFullName
-    @State private var alert: CreateProfileAlert?
-
-    private enum CreateProfileAlert: Identifiable {
-        case duplicateUserError
-        case createUserError(error: LocalizedStringKey)
-
-        var id: String {
-            switch self {
-            case .duplicateUserError: return "duplicateUserError"
-            case .createUserError: return "createUserError"
-            }
-        }
-    }
 
     var body: some View {
         VStack(alignment: .leading) {
-            Text("Create your profile")
-                .font(.largeTitle)
-                .bold()
-                .padding(.bottom, 4)
-                .frame(maxWidth: .infinity)
-            Text("Your profile, contacts and delivered messages are stored on your device.")
-                .padding(.bottom, 4)
-            Text("The profile is only shared with your contacts.")
-                .padding(.bottom)
+            Group {
+                Text("Create your profile")
+                    .font(.largeTitle)
+                    .bold()
+                Text("Your profile, contacts and delivered messages are stored on your device.")
+                    .foregroundColor(.secondary)
+                Text("The profile is only shared with your contacts.")
+                    .foregroundColor(.secondary)
+                    .padding(.bottom)
+            }
+            .padding(.bottom)
+
             ZStack(alignment: .topLeading) {
-                if !validDisplayName(displayName) {
-                    Image(systemName: "exclamationmark.circle")
-                        .foregroundColor(.red)
-                        .padding(.top, 4)
+                let name = displayName.trimmingCharacters(in: .whitespaces)
+                let validName = mkValidName(name)
+                if name != validName {
+                    Button {
+                        showAlert(.invalidNameError(validName: validName))
+                    } label: {
+                        Image(systemName: "exclamationmark.circle").foregroundColor(.red)
+                    }
+                } else {
+                    Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                 }
-                textField("Display name", text: $displayName)
+                TextField("Enter your name…", text: $displayName)
                     .focused($focusDisplayName)
-                    .submitLabel(.next)
-                    .onSubmit {
-                        if canCreateProfile() { focusFullName = true }
-                        else { focusDisplayName = true }
-                    }
+                    .padding(.leading, 32)
             }
-            textField("Full name (optional)", text: $fullName)
-                .focused($focusFullName)
-                .submitLabel(.go)
-                .onSubmit {
-                    if canCreateProfile() { createProfile() }
-                    else { focusFullName = true }
-                }
-
+            .padding(.bottom)
             Spacer()
-
-            HStack {
-                if m.users.isEmpty {
-                    Button {
-                        hideKeyboard()
-                        withAnimation {
-                            m.onboardingStage = .step1_SimpleXInfo
-                        }
-                    } label: {
-                        HStack {
-                            Image(systemName: "lessthan")
-                            Text("About SimpleX")
-                        }
-                    }
-                }
-
-                Spacer()
-
-                HStack {
-                    Button {
-                        createProfile()
-                    } label: {
-                        Text("Create")
-                        Image(systemName: "greaterthan")
-                    }
-                    .disabled(!canCreateProfile())
-                }
-            }
+            onboardingButtons()
         }
         .onAppear() {
             focusDisplayName = true
             setLastVersionDefault()
         }
-        .alert(item: $alert) { a in
-            switch a {
-            case .duplicateUserError: return duplicateUserAlert
-            case let .createUserError(err): return creatUserErrorAlert(err)
-            }
-        }
         .padding()
+        .frame(maxWidth: .infinity, alignment: .leading)
         .keyboardPadding()
     }
 
-    func textField(_ placeholder: LocalizedStringKey, text: Binding<String>) -> some View {
-        TextField(placeholder, text: text)
-            .textInputAutocapitalization(.never)
-            .disableAutocorrection(true)
-            .padding(.leading, 28)
-            .padding(.bottom)
-    }
-
-    func createProfile() {
-        hideKeyboard()
-        let profile = Profile(
-            displayName: displayName,
-            fullName: fullName
-        )
-        do {
-            m.currentUser = try apiCreateActiveUser(profile)
-            if m.users.isEmpty {
-                try startChat()
+    func onboardingButtons() -> some View {
+        HStack {
+            Button {
+                hideKeyboard()
                 withAnimation {
-                    onboardingStageDefault.set(.step3_CreateSimpleXAddress)
-                    m.onboardingStage = .step3_CreateSimpleXAddress
+                    m.onboardingStage = .step1_SimpleXInfo
                 }
-            } else {
-                onboardingStageDefault.set(.onboardingComplete)
-                m.onboardingStage = .onboardingComplete
-                dismiss()
-                m.users = try listUsers()
-                try getUserChatData()
-            }
-        } catch let error {
-            switch error as? ChatResponse {
-            case .chatCmdError(_, .errorStore(.duplicateName)),
-                 .chatCmdError(_, .error(.userExists)):
-                if m.currentUser == nil {
-                    AlertManager.shared.showAlert(duplicateUserAlert)
-                } else {
-                    alert = .duplicateUserError
-                }
-            default:
-                let err: LocalizedStringKey = "Error: \(responseError(error))"
-                if m.currentUser == nil {
-                    AlertManager.shared.showAlert(creatUserErrorAlert(err))
-                } else {
-                    alert = .createUserError(error: err)
+            } label: {
+                HStack {
+                    Image(systemName: "lessthan")
+                    Text("About SimpleX")
                 }
             }
-            logger.error("Failed to create user or start chat: \(responseError(error))")
+
+            Spacer()
+
+            Button {
+                createProfile(displayName, showAlert: showAlert, dismiss: dismiss)
+            } label: {
+                HStack {
+                    Text("Create")
+                    Image(systemName: "greaterthan")
+                }
+            }
+            .disabled(!canCreateProfile(displayName))
         }
     }
 
-    func canCreateProfile() -> Bool {
-        displayName != "" && validDisplayName(displayName)
-    }
-
-    private var duplicateUserAlert: Alert {
-        Alert(
-            title: Text("Duplicate display name!"),
-            message: Text("You already have a chat profile with the same display name. Please choose another name.")
-        )
-    }
-
-    private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
-        Alert(
-            title: Text("Error creating profile!"),
-            message: Text(err)
-        )
+    private func showAlert(_ alert: UserProfileAlert) {
+        AlertManager.shared.showAlert(userProfileAlert(alert, $displayName))
     }
 }
 
+private func createProfile(_ displayName: String, showAlert: (UserProfileAlert) -> Void, dismiss: DismissAction) {
+    hideKeyboard()
+    let profile = Profile(
+        displayName: displayName.trimmingCharacters(in: .whitespaces),
+        fullName: ""
+    )
+    let m = ChatModel.shared
+    do {
+        m.currentUser = try apiCreateActiveUser(profile)
+        if m.users.isEmpty {
+            try startChat()
+            withAnimation {
+                onboardingStageDefault.set(.step3_CreateSimpleXAddress)
+                m.onboardingStage = .step3_CreateSimpleXAddress
+            }
+        } else {
+            onboardingStageDefault.set(.onboardingComplete)
+            m.onboardingStage = .onboardingComplete
+            dismiss()
+            m.users = try listUsers()
+            try getUserChatData()
+        }
+    } catch let error {
+        switch error as? ChatResponse {
+        case .chatCmdError(_, .errorStore(.duplicateName)),
+             .chatCmdError(_, .error(.userExists)):
+            if m.currentUser == nil {
+                AlertManager.shared.showAlert(duplicateUserAlert)
+            } else {
+                showAlert(.duplicateUserError)
+            }
+        default:
+            let err: LocalizedStringKey = "Error: \(responseError(error))"
+            if m.currentUser == nil {
+                AlertManager.shared.showAlert(creatUserErrorAlert(err))
+            } else {
+                showAlert(.createUserError(error: err))
+            }
+        }
+        logger.error("Failed to create user or start chat: \(responseError(error))")
+    }
+}
+
+private func canCreateProfile(_ displayName: String) -> Bool {
+    let name = displayName.trimmingCharacters(in: .whitespaces)
+    return name != "" && mkValidName(name) == name
+}
+
+func userProfileAlert(_ alert: UserProfileAlert, _ displayName: Binding<String>) -> Alert {
+    switch alert {
+    case .duplicateUserError: return duplicateUserAlert
+    case let .createUserError(err): return creatUserErrorAlert(err)
+    case let .invalidNameError(name): return createInvalidNameAlert(name, displayName)
+    }
+}
+
+private var duplicateUserAlert: Alert {
+    Alert(
+        title: Text("Duplicate display name!"),
+        message: Text("You already have a chat profile with the same display name. Please choose another name.")
+    )
+}
+
+private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
+    Alert(
+        title: Text("Error creating profile!"),
+        message: Text(err)
+    )
+}
+
+func createInvalidNameAlert(_ name: String, _ displayName: Binding<String>) -> Alert {
+    name == ""
+    ? Alert(title: Text("Invalid name!"))
+    : Alert(
+        title: Text("Invalid name!"),
+        message: Text("Correct name to \(name)?"),
+        primaryButton: .default(
+            Text("Ok"),
+            action: { displayName.wrappedValue = name }
+        ),
+        secondaryButton: .cancel()
+    )
+}
+
 func validDisplayName(_ name: String) -> Bool {
-    name.firstIndex(of: " ") == nil && name.first != "@" && name.first != "#"
+    mkValidName(name.trimmingCharacters(in: .whitespaces)) == name
+}
+
+func mkValidName(_ s: String) -> String {
+    var c = s.cString(using: .utf8)!
+    return fromCString(chat_valid_name(&c)!)
 }
 
 struct CreateProfile_Previews: PreviewProvider {

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

@@ -31,7 +31,7 @@ struct CreateSimpleXAddress: View {
                         Spacer()
 
                         if let userAddress = m.userAddress {
-                            QRCode(uri: userAddress.connReqContact)
+                            SimpleXLinkQRCode(uri: userAddress.connReqContact)
                                 .frame(maxHeight: g.size.width)
                             shareQRCodeButton(userAddress)
                                 .frame(maxWidth: .infinity)
@@ -126,7 +126,7 @@ struct CreateSimpleXAddress: View {
 
     private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
         Button {
-            showShareSheet(items: [userAddress.connReqContact])
+            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
         } label: {
             Label("Share", systemImage: "square.and.arrow.up")
         }
@@ -194,7 +194,7 @@ struct SendAddressMailView: View {
         let messageBody = String(format: NSLocalizedString("""
             <p>Hi!</p>
             <p><a href="%@">Connect to me via SimpleX Chat</a></p>
-            """, comment: "email text"), userAddress.connReqContact)
+            """, comment: "email text"), simplexChatLink(userAddress.connReqContact))
         MailView(
             isShowing: self.$showMailView,
             result: $mailViewResult,

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

@@ -14,7 +14,7 @@ struct OnboardingView: View {
     var body: some View {
         switch onboarding {
         case .step1_SimpleXInfo: SimpleXInfo(onboarding: true)
-        case .step2_CreateProfile: CreateProfile()
+        case .step2_CreateProfile: CreateFirstProfile()
         case .step3_CreateSimpleXAddress: CreateSimpleXAddress()
         case .step4_SetNotificationsMode: SetNotificationsMode()
         case .onboardingComplete: EmptyView()

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

@@ -251,7 +251,38 @@ 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
@@ -321,12 +352,15 @@ 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).foregroundColor(.secondary)
+                Image(systemName: icon)
+                    .symbolRenderingMode(.monochrome)
+                    .foregroundColor(.secondary)
                     .frame(minWidth: 30, alignment: .center)
                 Text(title).font(.title3).bold()
             }
             Text(description)
                 .multilineTextAlignment(.leading)
+                .lineLimit(10)
         }
     }
 

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

@@ -53,7 +53,7 @@ struct AdvancedNetworkSettings: View {
 
                     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: [10_000, 20_000, 40_000, 75_000, 100_000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [15_000, 30_000, 60_000, 90_000, 120_000], label: secondsLabel)
                     timeoutSettingPicker("PING interval", selection: $netCfg.smpPingInterval, values: [120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000, 3600_000000], label: secondsLabel)
                     intSettingPicker("PING count", selection: $netCfg.smpPingCount, values: [1, 2, 3, 5, 8], label: "")
                     Toggle("Enable TCP keep-alive", isOn: $enableKeepAlive)

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

@@ -71,9 +71,10 @@ struct PreferencesView: View {
             do {
                 var p = fromLocalProfile(profile)
                 p.preferences = fullPreferencesToPreferences(preferences)
-                if let newProfile = try await apiUpdateProfile(profile: p) {
+                if let (newProfile, updatedContacts) = 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

@@ -15,6 +15,7 @@ struct PrivacySettings: View {
     @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
@@ -63,6 +64,12 @@ struct PrivacySettings: View {
                 }
 
                 Section {
+                    settingsRow("lock.doc") {
+                        Toggle("Encrypt local files", isOn: $encryptLocalFiles)
+                            .onChange(of: encryptLocalFiles) {
+                                setEncryptLocalFiles($0)
+                            }
+                    }
                     settingsRow("photo") {
                         Toggle("Auto-accept images", isOn: $autoAcceptImages)
                             .onChange(of: autoAcceptImages) {
@@ -86,7 +93,9 @@ struct PrivacySettings: View {
                     }
                     settingsRow("link") {
                         Picker("SimpleX links", selection: $simplexLinkMode) {
-                            ForEach(SimpleXLinkMode.values) { mode in
+                            ForEach(
+                                SimpleXLinkMode.values + (SimpleXLinkMode.values.contains(simplexLinkMode) ? [] : [simplexLinkMode])
+                            ) { mode in
                                 Text(mode.text)
                             }
                         }
@@ -97,10 +106,6 @@ struct PrivacySettings: View {
                     }
                 } header: {
                     Text("Chats")
-                } footer: {
-                    if case .browser = simplexLinkMode {
-                        Text("Opening the link in the browser may reduce connection privacy and security. Untrusted SimpleX links will be red.")
-                    }
                 }
 
                 Section {
@@ -114,7 +119,7 @@ struct PrivacySettings: View {
                     Text("Send delivery receipts to")
                 } footer: {
                     VStack(alignment: .leading) {
-                        Text("These settings are for your current profile **\(ChatModel.shared.currentUser?.displayName ?? "")**.")
+                        Text("These settings are for your current profile **\(m.currentUser?.displayName ?? "")**.")
                         Text("They can be overridden in contact and group settings.")
                     }
                     .frame(maxWidth: .infinity, alignment: .leading)
@@ -179,6 +184,16 @@ struct PrivacySettings: View {
         }
     }
 
+    private func setEncryptLocalFiles(_ enable: Bool) {
+        do {
+            try apiSetEncryptLocalFiles(enable)
+        } catch let error {
+            let err = responseError(error)
+            logger.error("apiSetEncryptLocalFiles \(err)")
+            alert = .error(title: "Error", error: "\(err)")
+        }
+    }
+
     private func setOrAskSendReceiptsContacts(_ enable: Bool) {
         contactReceiptsOverrides = m.chats.reduce(0) { count, chat in
             let sendRcpts = chat.chatInfo.contact?.chatSettings.sendRcpts
@@ -341,7 +356,7 @@ struct SimplexLockView: View {
         var id: Self { self }
     }
 
-    let laDelays: [Int] = [10, 30, 60, 180, 0]
+    let laDelays: [Int] = [10, 30, 60, 180, 600, 0]
 
     func laDelayText(_ t: Int) -> LocalizedStringKey {
         let m = t / 60
@@ -363,6 +378,7 @@ struct SimplexLockView: View {
                             Text(mode.text)
                         }
                     }
+                    .frame(height: 36)
                     if performLA {
                         Picker("Lock after", selection: $laLockDelay) {
                             let delays = laDelays.contains(laLockDelay) ? laDelays : [laLockDelay] + laDelays
@@ -370,6 +386,7 @@ struct SimplexLockView: View {
                                 Text(laDelayText(t))
                             }
                         }
+                        .frame(height: 36)
                         if showChangePassword && laMode == .passcode {
                             Button("Change passcode") {
                                 changeLAPassword()

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

@@ -93,7 +93,7 @@ enum SimpleXLinkMode: String, Identifiable {
     case full
     case browser
 
-    static var values: [SimpleXLinkMode] = [.description, .full, .browser]
+    static var values: [SimpleXLinkMode] = [.description, .full]
 
     public var id: Self { self }
 
@@ -381,7 +381,9 @@ struct ProfilePreview: View {
                 Text(profileOf.displayName)
                     .fontWeight(.bold)
                     .font(.title2)
-                Text(profileOf.fullName)
+                if profileOf.fullName != "" && profileOf.fullName != profileOf.displayName {
+                    Text(profileOf.fullName)
+                }
             }
         }
     }

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

@@ -190,7 +190,7 @@ struct UserAddressView: View {
 
     @ViewBuilder private func existingAddressView(_ userAddress: UserContactLink) -> some View {
         Section {
-            QRCode(uri: userAddress.connReqContact)
+            MutableQRCode(uri: Binding.constant(simplexChatLink(userAddress.connReqContact)))
             shareQRCodeButton(userAddress)
             if MFMailComposeViewController.canSendMail() {
                 shareViaEmailButton(userAddress)
@@ -248,7 +248,7 @@ struct UserAddressView: View {
 
     private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
         Button {
-            showShareSheet(items: [userAddress.connReqContact])
+            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
         } label: {
             settingsRow("square.and.arrow.up") {
                 Text("Share address")

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

@@ -17,6 +17,8 @@ struct UserProfile: View {
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
+    @State private var alert: UserProfileAlert?
+    @FocusState private var focusDisplayName
 
     var body: some View {
         let user: User = chatModel.currentUser!
@@ -47,18 +49,27 @@ struct UserProfile: View {
 
                 VStack(alignment: .leading) {
                     ZStack(alignment: .leading) {
-                        if !validDisplayName(profile.displayName) {
-                            Image(systemName: "exclamationmark.circle")
-                                .foregroundColor(.red)
-                                .padding(.bottom, 10)
+                        if !validNewProfileName(user) {
+                            Button {
+                                alert = .invalidNameError(validName: mkValidName(profile.displayName))
+                            } label: {
+                                Image(systemName: "exclamationmark.circle").foregroundColor(.red)
+                            }
+                        } else {
+                            Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                         }
-                        profileNameTextEdit("Display name", $profile.displayName)
+                        profileNameTextEdit("Profile name", $profile.displayName)
+                            .focused($focusDisplayName)
+                    }
+                    .padding(.bottom)
+                    if showFullName(user) {
+                        profileNameTextEdit("Full name (optional)", $profile.fullName)
+                            .padding(.bottom)
                     }
-                    profileNameTextEdit("Full name (optional)", $profile.fullName)
                     HStack(spacing: 20) {
                         Button("Cancel") { editProfile = false }
                         Button("Save (and notify contacts)") { saveProfile() }
-                            .disabled(profile.displayName == "" || !validDisplayName(profile.displayName))
+                            .disabled(!canSaveProfile(user))
                     }
                 }
                 .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -74,11 +85,14 @@ struct UserProfile: View {
                 .frame(maxWidth: .infinity, alignment: .center)
 
                 VStack(alignment: .leading) {
-                    profileNameView("Display name:", user.profile.displayName)
-                    profileNameView("Full name:", user.profile.fullName)
+                    profileNameView("Profile name:", user.profile.displayName)
+                    if showFullName(user) {
+                        profileNameView("Full name:", user.profile.fullName)
+                    }
                     Button("Edit") {
                         profile = fromLocalProfile(user.profile)
                         editProfile = true
+                        focusDisplayName = true
                     }
                 }
                 .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -117,14 +131,12 @@ struct UserProfile: View {
                 profile.image = nil
             }
         }
+        .alert(item: $alert) { a in userProfileAlert(a, $profile.displayName) }
     }
 
     func profileNameTextEdit(_ label: LocalizedStringKey, _ name: Binding<String>) -> some View {
         TextField(label, text: name)
-            .textInputAutocapitalization(.never)
-            .disableAutocorrection(true)
-            .padding(.bottom)
-            .padding(.leading, 28)
+            .padding(.leading, 32)
     }
 
     func profileNameView(_ label: LocalizedStringKey, _ name: String) -> some View {
@@ -141,19 +153,34 @@ struct UserProfile: View {
         showChooseSource = true
     }
 
+    private func validNewProfileName(_ user: User) -> Bool {
+        profile.displayName == user.profile.displayName || validDisplayName(profile.displayName.trimmingCharacters(in: .whitespaces))
+    }
+
+    private func showFullName(_ user: User) -> Bool {
+        user.profile.fullName != "" && user.profile.fullName != user.profile.displayName
+    }
+
+    private func canSaveProfile(_ user: User) -> Bool {
+        profile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName(user)
+    }
+
     func saveProfile() {
         Task {
             do {
-                if let newProfile = try await apiUpdateProfile(profile: profile) {
+                profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
+                if let (newProfile, _) = try await apiUpdateProfile(profile: profile) {
                     DispatchQueue.main.async {
                         chatModel.updateCurrentUser(newProfile)
                         profile = newProfile
                     }
+                    editProfile = false
+                } else {
+                    alert = .duplicateUserError
                 }
             } catch {
                 logger.error("UserProfile apiUpdateProfile error: \(responseError(error))")
             }
-            editProfile = false
         }
     }
 }

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

@@ -3655,6 +3655,26 @@ SimpleX servers cannot see your profile.</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

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

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

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

@@ -0,0 +1,23 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.000",
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "0.533"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "properties" : {
+    "localizable" : true
+  },
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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

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

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

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

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

@@ -0,0 +1,30 @@
+/* No comment provided by engineer. */
+"_italic_" = "\\_italic_";
+
+/* No comment provided by engineer. */
+"**Add new contact**: to create your one-time QR Code for your contact." = "**Add new contact**: to create your one-time QR Code or link for your contact.";
+
+/* No comment provided by engineer. */
+"*bold*" = "\\*bold*";
+
+/* No comment provided by engineer. */
+"`a + b`" = "\\`a + b`";
+
+/* No comment provided by engineer. */
+"~strike~" = "\\~strike~";
+
+/* call status */
+"connecting call" = "connecting call…";
+
+/* No comment provided by engineer. */
+"Connecting server…" = "Connecting to server…";
+
+/* No comment provided by engineer. */
+"Connecting server… (error: %@)" = "Connecting to server… (error: %@)";
+
+/* rcv group event chat item */
+"member connected" = "connected";
+
+/* No comment provided by engineer. */
+"No group!" = "Group not found!";
+

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

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

@@ -0,0 +1,12 @@
+{
+  "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="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="&#10;" xml:space="preserve">
@@ -44,14 +44,17 @@
       </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">
@@ -84,6 +87,11 @@
         <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>
@@ -114,6 +122,11 @@
         <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>
@@ -184,6 +197,10 @@
         <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>
@@ -314,6 +331,12 @@
         <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.
@@ -411,6 +434,7 @@
       </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>
         <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">
@@ -468,7 +492,7 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Přijmout kontakt</target>
+        <target>Přijmout kontakt?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -686,6 +710,10 @@
         <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>
@@ -821,6 +849,10 @@
         <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>
@@ -1054,15 +1086,17 @@
       </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 kontaktní odkaz?</target>
+        <target>Připojit se přes odkaz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1082,7 +1116,7 @@
       </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>
+        <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">
@@ -1215,6 +1249,10 @@
         <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>
@@ -1560,6 +1598,7 @@
       </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">
@@ -1667,6 +1706,10 @@
         <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>
@@ -1802,6 +1845,14 @@
         <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>
@@ -1927,11 +1978,19 @@
         <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>
@@ -2052,6 +2111,10 @@
         <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>
@@ -2574,6 +2637,7 @@
       </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>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2650,6 +2714,7 @@
       </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">
@@ -2735,12 +2800,12 @@
       </trans-unit>
       <trans-unit id="Join incognito" xml:space="preserve">
         <source>Join incognito</source>
-        <target>Připojte se inkognito</target>
+        <target>Připojit 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řipojení ke skupině</target>
+        <target>Připojování ke skupině</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
@@ -3000,6 +3065,7 @@
       </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">
@@ -3062,6 +3128,10 @@
         <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>
@@ -3275,6 +3345,10 @@
         <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>
@@ -4009,6 +4083,10 @@
         <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>
@@ -4232,6 +4310,10 @@
         <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>
@@ -4302,6 +4384,10 @@
         <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>
@@ -4610,7 +4696,7 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
       </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>
+        <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">
@@ -4694,6 +4780,10 @@ 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>
@@ -5539,6 +5629,10 @@ 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>
@@ -5733,6 +5827,10 @@ 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>
@@ -5994,6 +6092,10 @@ 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>
@@ -6138,7 +6240,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="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6170,7 +6272,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="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">

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

@@ -1 +0,0 @@
-

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

@@ -3,7 +3,7 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "cs",
   "toolInfo" : {
-    "toolBuildNumber" : "15A5219j",
+    "toolBuildNumber" : "15A240d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
     "toolVersion" : "15.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="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="&#10;" xml:space="preserve">
@@ -44,14 +44,17 @@
       </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">
@@ -84,6 +87,11 @@
         <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>
@@ -114,6 +122,11 @@
         <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>
@@ -184,6 +197,10 @@
         <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>
@@ -314,6 +331,12 @@
         <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.
@@ -411,6 +434,7 @@
       </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>
         <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">
@@ -468,7 +492,7 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Kontakt annehmen</target>
+        <target>Kontaktanfrage annehmen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -686,9 +710,13 @@
         <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">
@@ -733,12 +761,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">
@@ -821,6 +849,10 @@
         <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>
@@ -954,7 +986,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">
@@ -1054,15 +1086,17 @@
       </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>
+        <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">
@@ -1082,7 +1116,7 @@
       </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>
+        <target>Über einen Einmal-Link verbinden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1157,7 +1191,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">
@@ -1215,9 +1249,13 @@
         <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>Erstellen Sie einen einmaligen Einladungslink</target>
+        <target>Einmal-Einladungslink erstellen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create queue" xml:space="preserve">
@@ -1560,6 +1598,7 @@
       </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">
@@ -1594,12 +1633,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">
@@ -1624,7 +1663,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">
@@ -1667,6 +1706,10 @@
         <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>
@@ -1744,7 +1787,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">
@@ -1802,6 +1845,15 @@
         <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>
@@ -1927,11 +1979,20 @@
         <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>
@@ -1974,7 +2035,7 @@
       </trans-unit>
       <trans-unit id="Error enabling delivery receipts!" xml:space="preserve">
         <source>Error enabling delivery receipts!</source>
-        <target>Fehler beim Aktivieren der Empfangsbestätigungen!</target>
+        <target>Fehler beim Aktivieren von Empfangsbestätigungen!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error enabling notifications" xml:space="preserve">
@@ -2052,6 +2113,10 @@
         <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>
@@ -2059,7 +2124,7 @@
       </trans-unit>
       <trans-unit id="Error setting delivery receipts!" xml:space="preserve">
         <source>Error setting delivery receipts!</source>
-        <target>Fehler beim Setzen der Empfangsbestätigungen!</target>
+        <target>Fehler beim Setzen von Empfangsbestätigungen!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error starting chat" xml:space="preserve">
@@ -2324,7 +2389,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, sie wurde vom Absender entfernt.</target>
+        <target>Die Gruppeneinladung ist nicht mehr gültig, da sie vom Absender entfernt wurde.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group link" xml:space="preserve">
@@ -2379,7 +2444,7 @@
       </trans-unit>
       <trans-unit id="Group preferences" xml:space="preserve">
         <source>Group preferences</source>
-        <target>Gruppenpräferenzen</target>
+        <target>Gruppen-Präferenzen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Group profile" xml:space="preserve">
@@ -2569,11 +2634,12 @@
       </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>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2650,6 +2716,7 @@
       </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">
@@ -3000,6 +3067,7 @@
       </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">
@@ -3062,6 +3130,10 @@
         <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>
@@ -3109,6 +3181,7 @@
       </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">
@@ -3212,7 +3285,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>Gruppenpräferenzen können nur von Gruppen-Eigentümern geändert werden.</target>
+        <target>Gruppen-Prä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">
@@ -3275,6 +3348,10 @@
         <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>
@@ -3312,7 +3389,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">
@@ -3512,7 +3589,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">
@@ -3617,6 +3694,7 @@
       </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">
@@ -4009,6 +4087,10 @@
         <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>
@@ -4041,7 +4123,7 @@
       </trans-unit>
       <trans-unit id="Send receipts" xml:space="preserve">
         <source>Send receipts</source>
-        <target>Quittierungen versenden</target>
+        <target>Bestätigungen senden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send them from gallery or custom keyboards." xml:space="preserve">
@@ -4076,20 +4158,22 @@
       </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>Das Senden von Empfangsbestätigungen an %lld Kontakte ist deaktiviert</target>
+        <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>
         <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>Das Senden von Empfangsbestätigungen an %lld Kontakte ist aktiviert</target>
+        <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>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending via" xml:space="preserve">
@@ -4154,7 +4238,7 @@
       </trans-unit>
       <trans-unit id="Set group preferences" xml:space="preserve">
         <source>Set group preferences</source>
-        <target>Gruppenpräferenzen einstellen</target>
+        <target>Gruppen-Präferenzen einstellen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Set it instead of system authentication." xml:space="preserve">
@@ -4232,6 +4316,11 @@
         <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>
@@ -4254,7 +4343,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">
@@ -4264,12 +4353,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">
@@ -4279,7 +4368,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">
@@ -4299,9 +4388,13 @@
       </trans-unit>
       <trans-unit id="SimpleX one-time invitation" xml:space="preserve">
         <source>SimpleX one-time invitation</source>
-        <target>SimpleX Einmal-Link</target>
+        <target>SimpleX-Einmal-Einladung</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>
@@ -4314,6 +4407,7 @@
       </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">
@@ -4630,6 +4724,7 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
       </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">
@@ -4670,7 +4765,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>
@@ -4694,6 +4789,10 @@ 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>
@@ -4863,7 +4962,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">
@@ -4873,6 +4972,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </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">
@@ -4887,6 +4987,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       </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">
@@ -4906,7 +5007,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>Verwende SimpleX Chat Server.</target>
+        <target>Verwendung von SimpleX-Chat-Servern.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Verify connection security" xml:space="preserve">
@@ -5146,7 +5247,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">
@@ -5365,6 +5466,7 @@ Sie können es in den Einstellungen ändern.</target>
       </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">
@@ -5531,7 +5633,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">
@@ -5539,6 +5641,10 @@ 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>
@@ -5561,7 +5667,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>Verbindung (eingeladen)</target>
+        <target>Verbinde (nach einer Einladung)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="connecting call" xml:space="preserve">
@@ -5651,6 +5757,7 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
       </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">
@@ -5733,6 +5840,11 @@ 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>
@@ -5994,6 +6106,10 @@ 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>
@@ -6138,7 +6254,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="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6170,7 +6286,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="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">

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

@@ -1 +0,0 @@
-

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

@@ -3,7 +3,7 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "de",
   "toolInfo" : {
-    "toolBuildNumber" : "15A5219j",
+    "toolBuildNumber" : "15A240d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
     "toolVersion" : "15.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="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="&#10;" xml:space="preserve">
@@ -87,6 +87,11 @@
         <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>
@@ -117,6 +122,11 @@
         <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>
@@ -187,6 +197,11 @@
         <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>
@@ -317,6 +332,15 @@
         <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.
@@ -690,6 +714,11 @@
         <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>
@@ -825,6 +854,11 @@
         <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>
@@ -1221,6 +1255,11 @@
         <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>
@@ -1674,6 +1713,11 @@
         <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>
@@ -1809,6 +1853,16 @@
         <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>
@@ -1934,11 +1988,21 @@
         <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>
@@ -2059,6 +2123,11 @@
         <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>
@@ -3072,6 +3141,11 @@
         <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>
@@ -3286,6 +3360,11 @@
         <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>
@@ -4021,6 +4100,11 @@
         <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>
@@ -4246,6 +4330,11 @@
         <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>
@@ -4316,6 +4405,11 @@
         <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>
@@ -4710,6 +4804,11 @@ 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>
@@ -5558,6 +5657,11 @@ 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>
@@ -5753,6 +5857,11 @@ 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>
@@ -6014,6 +6123,11 @@ 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>
@@ -6158,7 +6272,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="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6190,7 +6304,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="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">

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

@@ -1 +0,0 @@
-

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

@@ -3,7 +3,7 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "en",
   "toolInfo" : {
-    "toolBuildNumber" : "15A5219j",
+    "toolBuildNumber" : "15A240d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
     "toolVersion" : "15.0"

apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.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="es" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="&#10;" xml:space="preserve">
@@ -44,14 +44,17 @@
       </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>## Historial</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="## In reply to" xml:space="preserve">
         <source>## In reply to</source>
+        <target>## En respuesta a</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="#secret#" xml:space="preserve">
@@ -84,6 +87,11 @@
         <target>%@ / %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="%@ and %@ connected" xml:space="preserve">
+        <source>%@ and %@ connected</source>
+        <target>%@ y %@ conectados</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="%@ at %@:" xml:space="preserve">
         <source>%1$@ at %2$@:</source>
         <target>%1$@ a las %2$@:</target>
@@ -114,6 +122,11 @@
         <target>¡ %@ quiere contactar!</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>%@, %@ y %lld miembros más conectados</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="%@:" xml:space="preserve">
         <source>%@:</source>
         <target>%@:</target>
@@ -184,6 +197,10 @@
         <target>%lld minutos</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 segundo(s)</target>
@@ -314,6 +331,12 @@
         <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.
@@ -411,6 +434,7 @@
       </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>Se compartirá un perfil nuevo aleatorio.</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">
@@ -452,7 +476,7 @@
       </trans-unit>
       <trans-unit id="About SimpleX address" xml:space="preserve">
         <source>About SimpleX address</source>
-        <target>Acerca de dirección SimpleX</target>
+        <target>Acerca de la dirección SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accent color" xml:space="preserve">
@@ -468,7 +492,7 @@
       </trans-unit>
       <trans-unit id="Accept connection request?" xml:space="preserve">
         <source>Accept connection request?</source>
-        <target>Aceptar contacto</target>
+        <target>¿Aceptar solicitud de conexión?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -668,12 +692,12 @@
       </trans-unit>
       <trans-unit id="Always use relay" xml:space="preserve">
         <source>Always use relay</source>
-        <target>Siempre usar relay</target>
+        <target>Usar siempre retransmisor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="An empty chat profile with the provided name is created, and the app opens as usual." xml:space="preserve">
         <source>An empty chat profile with the provided name is created, and the app opens as usual.</source>
-        <target>Se creará un perfil de chat vacío con el nombre proporcionado, y la aplicación se abrirá como de costumbre.</target>
+        <target>Se creará un perfil vacío con el nombre proporcionado, y la aplicación se abrirá como de costumbre.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Answer call" xml:space="preserve">
@@ -686,6 +710,10 @@
         <target>Compilación 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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="App icon" xml:space="preserve">
         <source>App icon</source>
         <target>Icono aplicación</target>
@@ -821,9 +849,13 @@
         <target>Tanto tú como tu contacto podéis enviar mensajes de voz.</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>Mediante perfil de Chat (por defecto) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
+        <target>Mediante perfil (por defecto) o [por conexión](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
@@ -1054,15 +1086,17 @@
       </trans-unit>
       <trans-unit id="Connect directly" xml:space="preserve">
         <source>Connect directly</source>
+        <target>Conectar directamente</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect incognito" xml:space="preserve">
         <source>Connect incognito</source>
+        <target>Conectar 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>¿Conectar mediante enlace de contacto?</target>
+        <target>Conectar mediante enlace de contacto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connect via group link?" xml:space="preserve">
@@ -1082,7 +1116,7 @@
       </trans-unit>
       <trans-unit id="Connect via one-time link" xml:space="preserve">
         <source>Connect via one-time link</source>
-        <target>¿Conectar mediante enlace de un uso?</target>
+        <target>Conectar mediante enlace de un sólo uso</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Connecting server…" xml:space="preserve">
@@ -1192,12 +1226,12 @@
       </trans-unit>
       <trans-unit id="Create SimpleX address" xml:space="preserve">
         <source>Create SimpleX address</source>
-        <target>Crear dirección SimpleX</target>
+        <target>Crear tu dirección SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create an address to let people connect with you." xml:space="preserve">
         <source>Create an address to let people connect with you.</source>
-        <target>Crear una dirección para que otras personas se puedan conectar contigo.</target>
+        <target>Crea una dirección para que otras personas puedan conectar contigo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Create file" xml:space="preserve">
@@ -1215,6 +1249,10 @@
         <target>Crear enlace</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>Crea enlace de invitación de un uso</target>
@@ -1232,7 +1270,7 @@
       </trans-unit>
       <trans-unit id="Create your profile" xml:space="preserve">
         <source>Create your profile</source>
-        <target>Crear tu perfil</target>
+        <target>Crea tu perfil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Created on %@" xml:space="preserve">
@@ -1365,7 +1403,7 @@
       </trans-unit>
       <trans-unit id="Decentralized" xml:space="preserve">
         <source>Decentralized</source>
-        <target>Descentralizado</target>
+        <target>Descentralizada</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Decryption error" xml:space="preserve">
@@ -1415,12 +1453,12 @@
       </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
-        <target>Eliminar perfil de chat</target>
+        <target>Eliminar perfil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete chat profile?" xml:space="preserve">
         <source>Delete chat profile?</source>
-        <target>¿Eliminar el perfil de chat?</target>
+        <target>¿Eliminar el perfil?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete connection" xml:space="preserve">
@@ -1455,7 +1493,7 @@
       </trans-unit>
       <trans-unit id="Delete files for all chat profiles" xml:space="preserve">
         <source>Delete files for all chat profiles</source>
-        <target>Eliminar los archivos de todos los perfiles</target>
+        <target>Eliminar archivos de todos los perfiles</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete for everyone" xml:space="preserve">
@@ -1560,6 +1598,7 @@
       </trans-unit>
       <trans-unit id="Delivery" xml:space="preserve">
         <source>Delivery</source>
+        <target>Entrega</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delivery receipts are disabled!" xml:space="preserve">
@@ -1619,7 +1658,7 @@
       </trans-unit>
       <trans-unit id="Disable (keep overrides)" xml:space="preserve">
         <source>Disable (keep overrides)</source>
-        <target>Desactivar (mantener anulaciones)</target>
+        <target>Desactivar (conservando anulaciones)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Disable SimpleX Lock" xml:space="preserve">
@@ -1667,6 +1706,10 @@
         <target>Desconectar</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>Nombre mostrado</target>
@@ -1689,7 +1732,7 @@
       </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
-        <target>No crear dirección</target>
+        <target>No crear dirección SimpleX</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Don't enable" xml:space="preserve">
@@ -1802,6 +1845,14 @@
         <target>¿Cifrar base de datos?</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>Base de datos cifrada</target>
@@ -1927,11 +1978,19 @@
         <target>Error al crear enlace de grupo</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>¡Error al crear perfil!</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>Error al eliminar base de datos</target>
@@ -2052,6 +2111,10 @@
         <target>Error al enviar 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>Error al enviar mensaje</target>
@@ -2419,7 +2482,7 @@
       </trans-unit>
       <trans-unit id="Hidden chat profiles" xml:space="preserve">
         <source>Hidden chat profiles</source>
-        <target>Perfiles Chat ocultos</target>
+        <target>Perfiles ocultos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Hidden profile password" xml:space="preserve">
@@ -2574,6 +2637,7 @@
       </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>El modo incógnito protege tu privacidad creando un perfil aleatorio por cada contacto.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Incoming audio call" xml:space="preserve">
@@ -2650,6 +2714,7 @@
       </trans-unit>
       <trans-unit id="Invalid status" xml:space="preserve">
         <source>Invalid status</source>
+        <target>Estado no válido</target>
         <note>item status text</note>
       </trans-unit>
       <trans-unit id="Invitation expired!" xml:space="preserve">
@@ -2745,7 +2810,7 @@
       </trans-unit>
       <trans-unit id="Keep your connections" xml:space="preserve">
         <source>Keep your connections</source>
-        <target>Mantén tus conexiones</target>
+        <target>Conserva tus conexiones</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="KeyChain error" xml:space="preserve">
@@ -2845,7 +2910,7 @@
       </trans-unit>
       <trans-unit id="Make profile private!" xml:space="preserve">
         <source>Make profile private!</source>
-        <target>¡Hacer un perfil privado!</target>
+        <target>¡Hacer perfil privado!</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">
@@ -2880,7 +2945,7 @@
       </trans-unit>
       <trans-unit id="Markdown in messages" xml:space="preserve">
         <source>Markdown in messages</source>
-        <target>Sintaxis markdown en los mensajes</target>
+        <target>Sintaxis Markdown</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Max 30 seconds, received instantly." xml:space="preserve">
@@ -3000,6 +3065,7 @@
       </trans-unit>
       <trans-unit id="Most likely this connection is deleted." xml:space="preserve">
         <source>Most likely this connection is deleted.</source>
+        <target>Probablemente la conexión ha sido eliminada.</target>
         <note>item status description</note>
       </trans-unit>
       <trans-unit id="Most likely this contact has deleted the connection with you." xml:space="preserve">
@@ -3009,7 +3075,7 @@
       </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
-        <target>Múltiples perfiles de chat</target>
+        <target>Múltiples perfiles</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Mute" xml:space="preserve">
@@ -3062,6 +3128,10 @@
         <target>Nuevo archivo de bases de datos</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>Nuevo nombre mostrado</target>
@@ -3109,6 +3179,7 @@
       </trans-unit>
       <trans-unit id="No delivery information" xml:space="preserve">
         <source>No delivery information</source>
+        <target>Sin información de entrega</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No device token!" xml:space="preserve">
@@ -3217,12 +3288,12 @@
       </trans-unit>
       <trans-unit id="Only group owners can enable files and media." xml:space="preserve">
         <source>Only group owners can enable files and media.</source>
-        <target>Sólo los propietarios pueden activar archivos y multimedia.</target>
+        <target>Sólo los propietarios del grupo pueden activar los archivos y multimedia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only group owners can enable voice messages." xml:space="preserve">
         <source>Only group owners can enable voice messages.</source>
-        <target>Sólo los propietarios pueden activar los mensajes de voz.</target>
+        <target>Sólo los propietarios del grupo pueden activar los mensajes de voz.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Only you can add message reactions." xml:space="preserve">
@@ -3275,6 +3346,10 @@
         <target>Sólo tu contacto puede enviar mensajes de voz.</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>Abrir Configuración</target>
@@ -3617,6 +3692,7 @@
       </trans-unit>
       <trans-unit id="Receipts are disabled" xml:space="preserve">
         <source>Receipts are disabled</source>
+        <target>Las confirmaciones están desactivadas</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Received at" xml:space="preserve">
@@ -3641,7 +3717,7 @@
       </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>La dirección de recepción se cambiará. El cambio se completará cuando el remitente esté en línea.</target>
+        <target>La dirección de recepción pasará a otro servidor. El cambio se completará cuando el remitente esté en línea.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Receiving file will be stopped." xml:space="preserve">
@@ -3701,12 +3777,12 @@
       </trans-unit>
       <trans-unit id="Relay server is only used if necessary. Another party can observe your IP address." xml:space="preserve">
         <source>Relay server is only used if necessary. Another party can observe your IP address.</source>
-        <target>El servidor de retransmisión sólo se usará en caso necesario. Un tercero podría ver tu dirección IP.</target>
+        <target>El retransmisor sólo se usa en caso de necesidad. Un tercero podría ver tu IP.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Relay server protects your IP address, but it can observe the duration of the call." xml:space="preserve">
         <source>Relay server protects your IP address, but it can observe the duration of the call.</source>
-        <target>El servidor de retransmisión protege tu dirección IP, pero puede observar la duración de la llamada.</target>
+        <target>El servidor de retransmisión protege tu IP pero puede ver la duración de la llamada.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove" xml:space="preserve">
@@ -4009,6 +4085,10 @@
         <target>Enviar mensaje directo</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>Enviar mensaje temporal</target>
@@ -4081,6 +4161,7 @@
       </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>El envío de confirmaciones está desactivado para %lld grupos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending receipts is enabled for %lld contacts" xml:space="preserve">
@@ -4090,6 +4171,7 @@
       </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>El envío de confirmaciones está activado para %lld grupos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sending via" xml:space="preserve">
@@ -4232,6 +4314,11 @@
         <target>Mostrar opciones de desarrollador</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>Mostrar último mensaje</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Show preview" xml:space="preserve">
         <source>Show preview</source>
         <target>Mostrar vista previa</target>
@@ -4302,6 +4389,10 @@
         <target>Invitación SimpleX de un uso</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>Omitir</target>
@@ -4314,6 +4405,7 @@
       </trans-unit>
       <trans-unit id="Small groups (max 20)" xml:space="preserve">
         <source>Small groups (max 20)</source>
+        <target>Grupos pequeños (máx. 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">
@@ -4353,7 +4445,7 @@
       </trans-unit>
       <trans-unit id="Stop chat to enable database actions" xml:space="preserve">
         <source>Stop chat to enable database actions</source>
-        <target>Para habilitar las acciones sobre la base de datos, previamente debes detener Chat</target>
+        <target>Detén SimpleX para habilitar las acciones sobre la base de datos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Stop chat to export, import or delete chat database. You will not be able to receive and send messages while the chat is stopped." xml:space="preserve">
@@ -4560,7 +4652,7 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="The next generation of private messaging" xml:space="preserve">
         <source>The next generation of private messaging</source>
-        <target>La próxima generación de mensajería privada</target>
+        <target>La nueva generación de mensajería privada</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The old database was not removed during the migration, it can be deleted." xml:space="preserve">
@@ -4595,12 +4687,12 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="There should be at least one user profile." xml:space="preserve">
         <source>There should be at least one user profile.</source>
-        <target>Debe haber al menos un perfil de usuario.</target>
+        <target>Debe haber al menos un perfil.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="There should be at least one visible user profile." xml:space="preserve">
         <source>There should be at least one visible user profile.</source>
-        <target>Debe haber al menos un perfil de usuario visible.</target>
+        <target>Debe haber al menos un perfil visible.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="These settings are for your current profile **%@**." xml:space="preserve">
@@ -4610,7 +4702,7 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="They can be overridden in contact and group settings." xml:space="preserve">
         <source>They can be overridden in contact and group settings.</source>
-        <target>Se pueden anular en la configuración de contactos</target>
+        <target>Se pueden anular en la configuración de contactos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This action cannot be undone - all received and sent files and media will be deleted. Low resolution pictures will remain." xml:space="preserve">
@@ -4630,6 +4722,7 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </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>Este grupo tiene más de %lld miembros, no se enviarán confirmaciones de entrega.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="This group no longer exists." xml:space="preserve">
@@ -4681,7 +4774,7 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
       </trans-unit>
       <trans-unit id="To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page." xml:space="preserve">
         <source>To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page.</source>
-        <target>Para hacer visible tu perfil oculto, introduce la contraseña completa en el campo de búsqueda de la página **Mis perfiles**.</target>
+        <target>Para hacer visible tu perfil oculto, introduce la contraseña en el campo de búsqueda del menú **Mis perfiles**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
@@ -4694,6 +4787,10 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
         <target>Para comprobar el cifrado de extremo a extremo con tu contacto compara (o escanea) el código en tus dispositivos.</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>Aislamiento de transporte</target>
@@ -4751,7 +4848,7 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
       </trans-unit>
       <trans-unit id="Unhide chat profile" xml:space="preserve">
         <source>Unhide chat profile</source>
-        <target>Mostrar perfil de chat</target>
+        <target>Mostrar perfil oculto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unhide profile" xml:space="preserve">
@@ -4874,6 +4971,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Use current profile" xml:space="preserve">
         <source>Use current profile</source>
+        <target>Usar perfil actual</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use for new connections" xml:space="preserve">
@@ -4888,6 +4986,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Use new incognito profile" xml:space="preserve">
         <source>Use new incognito profile</source>
+        <target>Usar nuevo perfil incógnito</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Use server" xml:space="preserve">
@@ -5067,7 +5166,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="You already have a chat profile with the same display name. Please choose another name." xml:space="preserve">
         <source>You already have a chat profile with the same display name. Please choose another name.</source>
-        <target>Tienes un perfil de chat con el mismo nombre mostrado. Debes elegir otro nombre.</target>
+        <target>Ya tienes un perfil con este nombre mostrado. Por favor, elige otro nombre.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already connected to %@." xml:space="preserve">
@@ -5097,7 +5196,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="You can create it later" xml:space="preserve">
         <source>You can create it later</source>
-        <target>Puedes crearlo más tarde</target>
+        <target>Puedes crearla más tarde</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can enable later via Settings" xml:space="preserve">
@@ -5112,7 +5211,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
         <source>You can hide or mute a user profile - swipe it to the right.</source>
-        <target>Puedes ocultar o silenciar un perfil de usuario: deslízalo hacia la derecha.</target>
+        <target>Puedes ocultar o silenciar un perfil deslizándolo a la derecha.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You can now send messages to %@" xml:space="preserve">
@@ -5222,7 +5321,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
         <source>You will be connected when your connection request is accepted, please wait or check later!</source>
-        <target>Te conectarás cuando se acepte tu solicitud de conexión, por favor espere o compruébalo más tarde.</target>
+        <target>Te conectarás cuando tu solicitud se acepte, por favor espera o compruébalo más tarde.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You will be connected when your contact's device is online, please wait or check later!" xml:space="preserve">
@@ -5297,7 +5396,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Your chat database" xml:space="preserve">
         <source>Your chat database</source>
-        <target>Base de datos Chat</target>
+        <target>Base de datos</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your chat database is not encrypted - set passphrase to encrypt it." xml:space="preserve">
@@ -5307,7 +5406,7 @@ Para conectarte, pide a tu contacto que cree otro enlace de conexión y comprueb
       </trans-unit>
       <trans-unit id="Your chat profile will be sent to group members" xml:space="preserve">
         <source>Your chat profile will be sent to group members</source>
-        <target>Tu perfil Chat será enviado a los miembros del grupo</target>
+        <target>Tu perfil será enviado a los miembros del grupo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
@@ -5366,6 +5465,7 @@ Puedes cambiarlo en Configuración.</target>
       </trans-unit>
       <trans-unit id="Your profile **%@** will be shared." xml:space="preserve">
         <source>Your profile **%@** will be shared.</source>
+        <target>Tu perfil **%@** será compartido.</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">
@@ -5377,7 +5477,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </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>Tu perfil, contactos y mensajes entregados se almacenan en tu dispositivo.</target>
+        <target>Tu perfil, contactos y mensajes se almacenan en tu dispositivo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your random profile" xml:space="preserve">
@@ -5412,7 +5512,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="[Star on GitHub](https://github.com/simplex-chat/simplex-chat)" xml:space="preserve">
         <source>[Star on GitHub](https://github.com/simplex-chat/simplex-chat)</source>
-        <target>[Estrella en GitHub] (https://github.com/simplex-chat/simplex-chat)</target>
+        <target>[Estrella en GitHub](https://github.com/simplex-chat/simplex-chat)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="_italic_" xml:space="preserve">
@@ -5540,6 +5640,10 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <target>conectado</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>conectando</target>
@@ -5652,6 +5756,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="disabled" xml:space="preserve">
         <source>disabled</source>
+        <target>desactivado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="duplicate message" xml:space="preserve">
@@ -5701,12 +5806,12 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="encryption re-negotiation allowed" xml:space="preserve">
         <source>encryption re-negotiation allowed</source>
-        <target>renegociación de cifrado permitida</target>
+        <target>renegociar el cifrado permitido</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="encryption re-negotiation allowed for %@" xml:space="preserve">
         <source>encryption re-negotiation allowed for %@</source>
-        <target>renegociación de cifrado permitida para %@</target>
+        <target>renegociar el cifrado permitido para %@</target>
         <note>chat item text</note>
       </trans-unit>
       <trans-unit id="encryption re-negotiation required" xml:space="preserve">
@@ -5734,6 +5839,11 @@ Los servidores de SimpleX no pueden ver tu perfil.</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>evento ocurrido</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="group deleted" xml:space="preserve">
         <source>group deleted</source>
         <target>grupo eliminado</target>
@@ -5801,7 +5911,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="invited" xml:space="preserve">
         <source>invited</source>
-        <target>ha invitado a</target>
+        <target>ha sido invitado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="invited %@" xml:space="preserve">
@@ -5995,6 +6105,10 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
         <target>código de seguridad cambiado</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>inicializando…</target>
@@ -6042,7 +6156,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
       </trans-unit>
       <trans-unit id="via relay" xml:space="preserve">
         <source>via relay</source>
-        <target>mediante servidor relay</target>
+        <target>mediante retransmisor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="video call (not e2e encrypted)" xml:space="preserve">
@@ -6139,7 +6253,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="es" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="CFBundleName" xml:space="preserve">
@@ -6171,7 +6285,7 @@ Los servidores de SimpleX no pueden ver tu perfil.</target>
   </file>
   <file original="SimpleX NSE/en.lproj/InfoPlist.strings" source-language="en" target-language="es" datatype="plaintext">
     <header>
-      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A5219j"/>
+      <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="15.0" build-num="15A240d"/>
     </header>
     <body>
       <trans-unit id="CFBundleDisplayName" xml:space="preserve">

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

@@ -1 +0,0 @@
-

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

@@ -3,7 +3,7 @@
   "project" : "SimpleX.xcodeproj",
   "targetLocale" : "es",
   "toolInfo" : {
-    "toolBuildNumber" : "15A5219j",
+    "toolBuildNumber" : "15A240d",
     "toolID" : "com.apple.dt.xcode",
     "toolName" : "Xcode",
     "toolVersion" : "15.0"

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

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

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

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

@@ -0,0 +1,23 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.000",
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "0.533"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "properties" : {
+    "localizable" : true
+  },
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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

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