Merge branch 'master-ghc8107' into master-android

.github/workflows/build.yml

@@ -9,7 +9,6 @@ on:
     tags:
       - "v*"
       - "!*-fdroid"
-      - "!*-armv7a"
   pull_request:
 
 jobs:
@@ -43,7 +42,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   build:
-    name: build-${{ matrix.os }}-${{ matrix.ghc }}
+    name: build-${{ matrix.os }}
     if: always()
     needs: prepare-release
     runs-on: ${{ matrix.os }}
@@ -52,25 +51,18 @@ jobs:
       matrix:
         include:
           - os: ubuntu-20.04
-            ghc: "8.10.7"
-            cache_path: ~/.cabal/store
-          - os: ubuntu-20.04
-            ghc: "9.6.3"
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-ubuntu-20_04-x86-64
             desktop_asset_name: simplex-desktop-ubuntu-20_04-x86_64.deb
           - os: ubuntu-22.04
-            ghc: "9.6.3"
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-ubuntu-22_04-x86-64
             desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
           - os: macos-latest
-            ghc: "9.6.3"
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-macos-x86-64
             desktop_asset_name: simplex-desktop-macos-x86_64.dmg
           - os: windows-latest
-            ghc: "9.6.3"
             cache_path: C:/cabal
             asset_name: simplex-chat-windows-x86-64
             desktop_asset_name: simplex-desktop-windows-x86_64.msi
@@ -87,19 +79,18 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
         with:
-          ghc-version: ${{ matrix.ghc }}
+          ghc-version: "8.10.7"
-          cabal-version: "3.10.1.0"
+          cabal-version: "latest"
 
-      - name: Restore cached build
+      - name: Cache dependencies
-        id: restore_cache
+        uses: actions/cache@v3
-        uses: actions/cache/restore@v3
         with:
           path: |
             ${{ matrix.cache_path }}
             dist-newstyle
-          key: ${{ matrix.os }}-ghc${{ matrix.ghc }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
+          key: ${{ matrix.os }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
 
       # / Unix
 
@@ -114,7 +105,7 @@ jobs:
           echo "    flags: +openssl"                                        >> cabal.project.local
 
       - name: Install AppImage dependencies
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
         run: sudo apt install -y desktop-file-utils
 
       - name: Install pkg-config for Mac
@@ -140,7 +131,7 @@ jobs:
           echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
 
       - name: Unix upload CLI binary to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -149,7 +140,7 @@ jobs:
           tag: ${{ github.ref }}
 
       - name: Unix update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -159,7 +150,7 @@ jobs:
             ${{ steps.unix_cli_build.outputs.bin_hash }}
 
       - name: Setup Java
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name
+        if: startsWith(github.ref, 'refs/tags/v')
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
@@ -168,7 +159,7 @@ jobs:
 
       - name: Linux build desktop
         id: linux_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
         shell: bash
         run: |
           scripts/desktop/build-lib-linux.sh
@@ -180,7 +171,7 @@ jobs:
       
       - name: Linux make AppImage
         id: linux_appimage_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
         shell: bash
         run: |
           scripts/desktop/make-appimage-linux.sh
@@ -197,13 +188,13 @@ jobs:
           APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
           APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
         run: |
-          scripts/ci/build-desktop-mac.sh
+          scripts/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.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -212,7 +203,7 @@ jobs:
           tag: ${{ github.ref }}
 
       - name: Linux update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        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 }}
@@ -222,7 +213,7 @@ jobs:
             ${{ steps.linux_desktop_build.outputs.package_hash }}
 
       - name: Linux upload AppImage to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -231,7 +222,7 @@ jobs:
           tag: ${{ github.ref }}
 
       - name: Linux update AppImage hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -259,15 +250,6 @@ jobs:
           body: |
             ${{ steps.mac_desktop_build.outputs.package_hash }}
 
-      - name: Cache unix build
-        uses: actions/cache/save@v3
-        if: matrix.os != 'windows-latest'
-        with:
-          path: |
-            ${{ matrix.cache_path }}
-            dist-newstyle
-          key: ${{ steps.restore_cache.outputs.cache-primary-key }}
-
       - name: Unix test
         if: matrix.os != 'windows-latest'
         timeout-minutes: 30
@@ -277,40 +259,15 @@ jobs:
       # Unix /
 
       # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
-
-      - name: 'Setup MSYS2'
-        if: matrix.os == 'windows-latest'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: ucrt64
-          update: true
-          install: >-
-            git
-            perl
-            make
-          pacboy: >-
-            toolchain:p
-            cmake:p
 
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
 
       - name: Windows build
         id: windows_build
         if: matrix.os == 'windows-latest'
-        shell: msys2 {0}
+        shell: cmd
         run: |
-          export PATH=$PATH:/c/ghcup/bin:$(echo /c/tools/ghc-*/bin || echo)
-          scripts/desktop/prepare-openssl-windows.sh
-          openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-1.1.1w | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
-          rm cabal.project.local 2>/dev/null || true
-          echo "ignore-project: False" >> cabal.project.local
-          echo "package direct-sqlcipher" >> cabal.project.local
-          echo "    flags: +openssl" >> cabal.project.local
-          echo "    extra-include-dirs: $openssl_windows_style_path\include" >> cabal.project.local
-          echo "    extra-lib-dirs: $openssl_windows_style_path" >> cabal.project.local
-
-          rm -rf dist-newstyle/src/direct-sq*
-          sed -i "s/, unix /--, unix /" simplex-chat.cabal
           cabal build --enable-tests
           rm -rf dist-newstyle/src/direct-sq*
           path=$(cabal list-bin simplex-chat | tail -n 1)
@@ -336,45 +293,4 @@ jobs:
           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'
-        shell: msys2 {0}
-        run: |
-          export PATH=$PATH:/c/ghcup/bin:$(echo /c/tools/ghc-*/bin || echo)
-          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 }}
-
-      - name: Cache windows build
-        uses: actions/cache/save@v3
-        if: matrix.os == 'windows-latest'
-        with:
-          path: |
-            ${{ matrix.cache_path }}
-            dist-newstyle
-          key: ${{ steps.restore_cache.outputs.cache-primary-key }}
-
       # Windows /

.github/workflows/web.yml

@@ -9,7 +9,6 @@ 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 9.6.3
+RUN ghcup install ghc 8.10.7
 # Install cabal
-RUN ghcup install cabal 3.10.1.0
+RUN ghcup install cabal
 # Set both as default
-RUN ghcup set ghc 9.6.3 && \
+RUN ghcup set ghc 8.10.7 && \
-    ghcup set cabal 3.10.1.0
+    ghcup set cabal
 
 COPY . /project
 WORKDIR /project

README.md

@@ -72,7 +72,7 @@ You must:
 
 Messages not following these rules will be deleted, the right to send messages may be revoked, and the access to the new members to the group may be temporarily restricted, to prevent re-joining under a different name - our imperfect group moderation does not have a better solution at the moment.
 
-You can join an English-speaking users group if you want to ask any questions: [#SimpleX users group](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fos8FftfoV8zjb2T89fUEjJtF7y64p5av%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAQqMgh0fw2lPhjn3PDIEfAKA_E0-gf8Hr8zzhYnDivRs%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22lBPiveK2mjfUH43SN77R0w%3D%3D%22%7D)
+You can join an English-speaking users group if you want to ask any questions: [#SimpleX-Group-4](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2Fw2GlucRXtRVgYnbt_9ZP-kmt76DekxxS%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA0tJhTyMGUxznwmjb7aT24P1I1Wry_iURTuhOFlMb1Eo%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22WoPxjFqGEDlVazECOSi2dg%3D%3D%22%7D)
 
 There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F6eHqy7uAbZPOcA6qBtrQgQquVlt4Ll91%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAqV_pg3FF00L98aCXp4D3bOs4Sxv_UmSd-gb0juVoQVs%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22XonlixcHBIb2ijCehbZoiw%3D%3D%22%7D) for developers who build on SimpleX platform:
 
@@ -127,7 +127,6 @@ Join our translators to help SimpleX grow!
 |🇫🇮 fi|Suomi     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/fi/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fi/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fi/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fi/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fi/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fi/)||
 |🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi-sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
 |🇮🇱 he|עִברִית     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/he/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/he/)<br>-|||
-|🇭🇺 hu|Magyar    | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/hu/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/hu/)<br>-|||
 |🇮🇹 it|Italiano  |[unbranched](https://github.com/unbranched)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/it/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/it/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/it/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/it/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/it/)||
 |🇯🇵 ja|日本語     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/ja/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/ja/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ja/)||
 |🇳🇱 nl|Nederlands|[mika-nl](https://github.com/mika-nl)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/nl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/nl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/nl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/nl/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/nl/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/nl/)||
@@ -135,7 +134,6 @@ Join our translators to help SimpleX grow!
 |🇧🇷 pt-BR|Português||[![android app](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pt_BR/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/pt_BR/)||
 |🇷🇺 ru|Русский   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ru/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ru/)|||
 |🇹🇭 th|ภาษาไทย   |[titapa-punpun](https://github.com/titapa-punpun)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/th/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/th/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/th/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/th/)|||
-|🇹🇷 tr|Türkçe   | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/tr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/tr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/tr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/tr/)|||
 |🇺🇦 uk|Українська| |[![android app](https://hosted.weblate.org/widgets/simplex-chat/uk/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/uk/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/uk/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/uk/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/uk/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/uk/)||
 |🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)<br><br>[Float-hu](https://github.com/Float-hu)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)<br>&nbsp;|<br><br>[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||
 
@@ -234,10 +232,6 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 Recent and important updates:
 
-[Jan 24, 2024. SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.](./blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
-
-[Nov 25, 2023. SimpleX Chat v5.4 released: link mobile and desktop apps via quantum resistant protocol, and much better groups](./blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.md).
-
 [Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).
 
 [Jul 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
@@ -301,7 +295,7 @@ What is already implemented:
 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.
+14. Local files encryption, except videos (to be added later).
 
 We plan to add:
 
@@ -372,14 +366,13 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Message delivery confirmation (with sender opt-out per contact).
 - ✅ Desktop client.
 - ✅ Encryption of local files stored in the app.
-- ✅ Using mobile profiles from the desktop app.
+- 🏗 Using mobile profiles from the desktop app.
-- ✅ Private notes.
+- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
-- ✅ Improve sending videos (including encryption of locally stored videos).
+- Post-quantum resistant key exchange in double ratchet protocol.
-- 🏗 Improve experience for the new users.
+- Large groups, communities and public channels.
-- 🏗 Post-quantum resistant key exchange in double ratchet protocol.
-- 🏗 Large groups, communities and public channels.
-- 🏗 Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - Privacy & security slider - a simple way to set all settings at once.
+- Improve sending videos (including encryption of locally stored videos).
+- Improve experience for the new users.
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).

apps/ios/Shared/AppDelegate.swift

@@ -15,7 +15,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         logger.debug("AppDelegate: didFinishLaunchingWithOptions")
         application.registerForRemoteNotifications()
         if #available(iOS 17.0, *) { trackKeyboard() }
-        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
         return true
     }
 
@@ -37,17 +36,12 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         ChatModel.shared.keyboardHeight = 0
     }
 
-    @objc func pasteboardChanged() {
-        ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
-    }
-
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         let token = deviceToken.map { String(format: "%02hhx", $0) }.joined()
         logger.debug("AppDelegate: didRegisterForRemoteNotificationsWithDeviceToken \(token)")
         let m = ChatModel.shared
         let deviceToken = DeviceToken(pushProvider: PushProvider(env: pushEnvironment), token: token)
         m.deviceToken = deviceToken
-        // savedToken is set in startChat, when it is started before this method is called
         if m.savedToken != nil {
             registerToken(token: deviceToken)
         }
@@ -61,6 +55,7 @@ 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 {
@@ -86,7 +81,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                 }
             } else if let checkMessages = ntfData["checkMessages"] as? Bool, checkMessages {
                 logger.debug("AppDelegate: didReceiveRemoteNotification: checkMessages")
-                if m.ntfEnablePeriodic && allowBackgroundRefresh() && BGManager.shared.lastRanLongAgo {
+                if appStateGroupDefault.get().inactive && m.ntfEnablePeriodic {
                     receiveMessages(completionHandler)
                 } else {
                     completionHandler(.noData)
@@ -126,10 +121,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 
         BGManager.shared.receiveMessages(complete)
     }
-
-    static func keepScreenOn(_ on: Bool) {
-        UIApplication.shared.isIdleTimerDisabled = on
-    }
 }
 
 class SceneDelegate: NSObject, ObservableObject, UIWindowSceneDelegate {

apps/ios/Shared/ContentView.swift

@@ -14,14 +14,11 @@ struct ContentView: View {
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var callController = CallController.shared
     @Environment(\.colorScheme) var colorScheme
-
+    @Binding var doAuthenticate: Bool
-    var contentAccessAuthenticationExtended: Bool
+    @Binding var userAuthorized: Bool?
-
+    @Binding var canConnectCall: Bool
-    @Environment(\.scenePhase) var scenePhase
+    @Binding var lastSuccessfulUnlock: TimeInterval?
-    @State private var automaticAuthenticationAttempted = false
+    @Binding var showInitializationView: Bool
-    @State private var canConnectViewCall = false
-    @State private var lastSuccessfulUnlock: TimeInterval? = nil
-
     @AppStorage(DEFAULT_SHOW_LA_NOTICE) private var prefShowLANotice = false
     @AppStorage(DEFAULT_LA_NOTICE_SHOWN) private var prefLANoticeShown = false
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
@@ -31,44 +28,28 @@ struct ContentView: View {
     @State private var showWhatsNew = false
     @State private var showChooseLAMode = false
     @State private var showSetPasscode = false
-    @State private var waitingForOrPassedAuth = true
     @State private var chatListActionSheet: ChatListActionSheet? = nil
 
     private enum ChatListActionSheet: Identifiable {
-        case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
+        case connectViaUrl(action: ConnReqType, link: String)
 
         var id: String {
             switch self {
-            case let .planAndConnectSheet(sheet): return sheet.id
+            case let .connectViaUrl(_, link): return "connectViaUrl \(link)"
             }
         }
     }
 
-    private var accessAuthenticated: Bool {
-        chatModel.contentViewAccessAuthenticated || contentAccessAuthenticationExtended
-    }
-
     var body: some View {
         ZStack {
-            // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
-            // i.e. with separate branches like this settings are closed: `if prefPerformLA { ... contentView() ... } else { contentView() }
-            if !prefPerformLA || accessAuthenticated {
             contentView()
-            } else {
-                lockButton()
-            }
             if chatModel.showCallView, let call = chatModel.activeCall {
                 callView(call)
             }
             if !showSettings, let la = chatModel.laRequest {
                 LocalAuthView(authRequest: la)
-                    .onDisappear {
-                        // this flag is separate from accessAuthenticated to show initializationView while we wait for authentication
-                        waitingForOrPassedAuth = accessAuthenticated
-                    }
             } else if showSetPasscode {
                 SetAppPasscodeView {
-                    chatModel.contentViewAccessAuthenticated = true
                     prefPerformLA = true
                     showSetPasscode = false
                     privacyLocalAuthModeDefault.set(.passcode)
@@ -78,10 +59,15 @@ struct ContentView: View {
                     showSetPasscode = false
                     alertManager.showAlert(laPasscodeNotSetAlert())
                 }
-            } else if chatModel.chatDbStatus == nil && AppChatState.shared.value != .stopped && waitingForOrPassedAuth {
-                initializationView()
             }
         }
+        .onAppear {
+            if prefPerformLA { requestNtfAuthorization() }
+            initAuthenticate()
+        }
+        .onChange(of: doAuthenticate) { _ in
+            initAuthenticate()
+        }
         .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
         .sheet(isPresented: $showSettings) {
             SettingsView(showSettings: $showSettings)
@@ -90,44 +76,14 @@ struct ContentView: View {
             Button("System authentication") { initialEnableLA() }
             Button("Passcode entry") { showSetPasscode = true }
         }
-        .onChange(of: scenePhase) { phase in
-            logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
-            switch (phase) {
-            case .background:
-                // also see .onChange(of: scenePhase) in SimpleXApp: on entering background
-                // it remembers enteredBackgroundAuthenticated and sets chatModel.contentViewAccessAuthenticated to false
-                automaticAuthenticationAttempted = false
-                canConnectViewCall = false
-            case .active:
-                canConnectViewCall = !prefPerformLA || contentAccessAuthenticationExtended || unlockedRecently()
-                
-                // condition `!chatModel.contentViewAccessAuthenticated` is required for when authentication is enabled in settings or on initial notice
-                if prefPerformLA && !chatModel.contentViewAccessAuthenticated {
-                    if AppChatState.shared.value != .stopped {
-                        if contentAccessAuthenticationExtended {
-                            chatModel.contentViewAccessAuthenticated = true
-                        } else {
-                            if !automaticAuthenticationAttempted {
-                                automaticAuthenticationAttempted = true
-                                // authenticate if call kit call is not in progress
-                                if !(CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil) {
-                                    authenticateContentViewAccess()
-                                }
-                            }
-                        }
-                    } else {
-                        // when app is stopped automatic authentication is not attempted
-                        chatModel.contentViewAccessAuthenticated = contentAccessAuthenticationExtended
-                    }
-                }
-            default:
-                break
-            }
-        }
     }
 
     @ViewBuilder private func contentView() -> some View {
-        if let status = chatModel.chatDbStatus, status != .ok {
+        if prefPerformLA && userAuthorized != true {
+            lockButton()
+        } else if chatModel.chatDbStatus == nil && showInitializationView {
+            initializationView()
+        } else if let status = chatModel.chatDbStatus, status != .ok {
             DatabaseErrorView(status: status)
         } else if !chatModel.v3DBMigration.startChat {
             MigrateToAppGroupView()
@@ -137,7 +93,7 @@ struct ContentView: View {
                 mainView()
                 .actionSheet(item: $chatListActionSheet) { sheet in
                     switch sheet {
-                    case let .planAndConnectSheet(sheet): return planAndConnectActionSheet(sheet, dismiss: false)
+                    case let .connectViaUrl(action, link): return connectViaUrlSheet(action, link)
                     }
                 }
             } else {
@@ -150,11 +106,11 @@ struct ContentView: View {
         if CallController.useCallKit() {
             ActiveCallView(call: call, canConnectCall: Binding.constant(true))
                 .onDisappear {
-                    if prefPerformLA && !accessAuthenticated { authenticateContentViewAccess() }
+                    if userAuthorized == false && doAuthenticate { runAuthenticate() }
                 }
         } else {
-            ActiveCallView(call: call, canConnectCall: $canConnectViewCall)
+            ActiveCallView(call: call, canConnectCall: $canConnectCall)
-            if prefPerformLA && !accessAuthenticated {
+            if prefPerformLA && userAuthorized != true {
                 Rectangle()
                     .fill(colorScheme == .dark ? .black : .white)
                     .frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -164,29 +120,24 @@ struct ContentView: View {
     }
 
     private func lockButton() -> some View {
-        Button(action: authenticateContentViewAccess) { Label("Unlock", systemImage: "lock") }
+        Button(action: runAuthenticate) { Label("Unlock", systemImage: "lock") }
     }
 
     private func initializationView() -> some View {
         VStack {
             ProgressView().scaleEffect(2)
-            Text("Opening app…")
+            Text("Opening database…")
                 .padding()
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity )
-        .background(
-            Rectangle()
-                .fill(.background)
-        ) 
     }
 
     private func mainView() -> some View {
         ZStack(alignment: .top) {
             ChatListView(showSettings: $showSettings).privacySensitive(protectScreen)
             .onAppear {
-                requestNtfAuthorization()
+                if !prefPerformLA { requestNtfAuthorization() }
                 // Local Authentication notice is to be shown on next start after onboarding is complete
-                if (!prefLANoticeShown && prefShowLANotice && chatModel.chats.count > 2) {
+                if (!prefLANoticeShown && prefShowLANotice && !chatModel.chats.isEmpty) {
                     prefLANoticeShown = true
                     alertManager.showAlert(laNoticeAlert())
                 } else if !chatModel.showCallView && CallController.shared.activeCallInvitation == nil {
@@ -236,40 +187,51 @@ struct ContentView: View {
         }
     }
 
-    private func unlockedRecently() -> Bool {
+    private func initAuthenticate() {
-        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
+        logger.debug("initAuthenticate")
-            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
+        if CallController.useCallKit() && chatModel.showCallView && chatModel.activeCall != nil {
+            userAuthorized = false
+        } else if doAuthenticate {
+            runAuthenticate()
+        }
+    }
+
+    private func runAuthenticate() {
+        logger.debug("DEBUGGING: runAuthenticate")
+        if !prefPerformLA {
+            userAuthorized = true
         } else {
-            return false
+            logger.debug("DEBUGGING: before dismissAllSheets")
-        }
-    }
-
-    private func authenticateContentViewAccess() {
-        logger.debug("DEBUGGING: authenticateContentViewAccess")
             dismissAllSheets(animated: false) {
-            logger.debug("DEBUGGING: authenticateContentViewAccess, in dismissAllSheets callback")
+                logger.debug("DEBUGGING: in dismissAllSheets callback")
                 chatModel.chatId = nil
+                justAuthenticate()
+            }
+        }
+    }
 
+    private func justAuthenticate() {
+        userAuthorized = false
+        let laMode = privacyLocalAuthModeDefault.get()
         authenticate(reason: NSLocalizedString("Unlock app", comment: "authentication reason"), selfDestruct: true) { laResult in
             logger.debug("DEBUGGING: authenticate callback: \(String(describing: laResult))")
             switch (laResult) {
             case .success:
-                    chatModel.contentViewAccessAuthenticated = true
+                userAuthorized = true
-                    canConnectViewCall = true
+                canConnectCall = true
                 lastSuccessfulUnlock = ProcessInfo.processInfo.systemUptime
             case .failed:
-                    chatModel.contentViewAccessAuthenticated = false
+                if laMode == .passcode {
-                    if privacyLocalAuthModeDefault.get() == .passcode {
                     AlertManager.shared.showAlert(laFailedAlert())
                 }
             case .unavailable:
+                userAuthorized = true
                 prefPerformLA = false
-                    canConnectViewCall = true
+                canConnectCall = true
                 AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
             }
         }
     }
-    }
 
     func requestNtfAuthorization() {
         NtfManager.shared.requestAuthorization(
@@ -297,7 +259,6 @@ struct ContentView: View {
         authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
             switch laResult {
             case .success:
-                chatModel.contentViewAccessAuthenticated = true
                 prefPerformLA = true
                 alertManager.showAlert(laTurnedOnAlert())
             case .failed:
@@ -329,16 +290,12 @@ struct ContentView: View {
             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)")
-                    planAndConnect(
+                    chatListActionSheet = .connectViaUrl(action: action, link: link)
-                        link,
-                        showAlert: showPlanAndConnectAlert,
-                        showActionSheet: { chatListActionSheet = .planAndConnectSheet(sheet: $0) },
-                        dismiss: false,
-                        incognito: nil
-                    )
                 } else {
                     AlertManager.shared.showAlert(Alert(title: Text("Error: URL is invalid")))
                 }
@@ -346,8 +303,20 @@ struct ContentView: View {
         }
     }
 
-    private func showPlanAndConnectAlert(_ alert: PlanAndConnectAlert) {
+    private func connectViaUrlSheet(_ action: ConnReqType, _ link: String) -> ActionSheet {
-        AlertManager.shared.showAlert(planAndConnectAlert(alert, dismiss: false))
+        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()
+            ]
+        )
     }
 }
 

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -46,7 +46,6 @@ class AudioRecorder {
             audioRecorder?.record(forDuration: MAX_VOICE_MESSAGE_LENGTH)
 
             await MainActor.run {
-                AppDelegate.keepScreenOn(true)
                 recordingTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
                     guard let time = self.audioRecorder?.currentTime else { return }
                     self.onTimer?(time)
@@ -58,10 +57,6 @@ class AudioRecorder {
             }
             return nil
         } catch let error {
-            await MainActor.run {
-                AppDelegate.keepScreenOn(false)
-            }
-            try? av.setCategory(AVAudioSession.Category.soloAmbient)
             logger.error("AudioRecorder startAudioRecording error \(error.localizedDescription)")
             return .error(error.localizedDescription)
         }
@@ -76,8 +71,6 @@ class AudioRecorder {
             timer.invalidate()
         }
         recordingTimer = nil
-        AppDelegate.keepScreenOn(false)
-        try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
     }
 
     private func checkPermission() async -> Bool {
@@ -128,19 +121,14 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
 
         playbackTimer = Timer.scheduledTimer(withTimeInterval: 0.01, repeats: true) { timer in
             if self.audioPlayer?.isPlaying ?? false {
-                AppDelegate.keepScreenOn(true)
                 guard let time = self.audioPlayer?.currentTime else { return }
                 self.onTimer?(time)
-                AudioPlayer.changeAudioSession(true)
-            } else {
-                AudioPlayer.changeAudioSession(false)
             }
         }
     }
 
     func pause() {
         audioPlayer?.pause()
-        AppDelegate.keepScreenOn(false)
     }
 
     func play() {
@@ -161,8 +149,6 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
     func stop() {
         if let player = audioPlayer {
             player.stop()
-            AppDelegate.keepScreenOn(false)
-            AudioPlayer.changeAudioSession(false)
         }
         audioPlayer = nil
         if let timer = playbackTimer {
@@ -171,24 +157,6 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         playbackTimer = nil
     }
 
-    static func changeAudioSession(_ playback: Bool) {
-        // When there is a audio recording, setting any other category will disable sound
-        if AVAudioSession.sharedInstance().category == .playAndRecord {
-            return
-        }
-        if playback {
-            if AVAudioSession.sharedInstance().category != .playback {
-                logger.log("AudioSession: playback")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: .duckOthers)
-            }
-        } else {
-            if AVAudioSession.sharedInstance().category != .soloAmbient {
-                logger.log("AudioSession: soloAmbient")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.soloAmbient)
-            }
-        }
-    }
-
     func audioPlayerDidFinishPlaying(_ player: AVAudioPlayer, successfully flag: Bool) {
         stop()
         self.onFinishPlayback?()

apps/ios/Shared/Model/BGManager.swift

@@ -15,13 +15,7 @@ private let receiveTaskId = "chat.simplex.app.receive"
 // TCP timeout + 2 sec
 private let waitForMessages: TimeInterval = 6
 
-// This is the smallest interval between refreshes, and also target interval in "off" mode
+private let bgRefreshInterval: TimeInterval = 450
-private let bgRefreshInterval: TimeInterval = 600 // 10 minutes
-
-// This intervals are used for background refresh in instant and periodic modes
-private let periodicBgRefreshInterval: TimeInterval = 1200 // 20 minutes
-
-private let maxBgRefreshInterval: TimeInterval = 2400 // 40 minutes
 
 private let maxTimerCount = 9
 
@@ -39,14 +33,14 @@ class BGManager {
         }
     }
 
-    func schedule(interval: TimeInterval? = nil) {
+    func schedule() {
         if !ChatModel.shared.ntfEnableLocal {
             logger.debug("BGManager.schedule: disabled")
             return
         }
         logger.debug("BGManager.schedule")
         let request = BGAppRefreshTaskRequest(identifier: receiveTaskId)
-        request.earliestBeginDate = Date(timeIntervalSinceNow: interval ?? runInterval)
+        request.earliestBeginDate = Date(timeIntervalSinceNow: bgRefreshInterval)
         do {
             try BGTaskScheduler.shared.submit(request)
         } catch {
@@ -54,34 +48,20 @@ class BGManager {
         }
     }
 
-    var runInterval: TimeInterval {
-        switch ChatModel.shared.notificationMode {
-        case .instant: maxBgRefreshInterval
-        case .periodic: periodicBgRefreshInterval
-        case .off: bgRefreshInterval
-        }
-    }
-
-    var lastRanLongAgo: Bool {
-        Date.now.timeIntervalSince(chatLastBackgroundRunGroupDefault.get()) > runInterval
-    }
-
     private func handleRefresh(_ task: BGAppRefreshTask) {
         if !ChatModel.shared.ntfEnableLocal {
             logger.debug("BGManager.handleRefresh: disabled")
             return
         }
         logger.debug("BGManager.handleRefresh")
-        let shouldRun_ = lastRanLongAgo
-        if allowBackgroundRefresh() && shouldRun_ {
         schedule()
+        if appStateGroupDefault.get().inactive {
             let completeRefresh = completionHandler {
                 task.setTaskCompleted(success: true)
             }
             task.expirationHandler = { completeRefresh("expirationHandler") }
             receiveMessages(completeRefresh)
         } else {
-            schedule(interval: shouldRun_ ? bgRefreshInterval : runInterval)
             logger.debug("BGManager.completionHandler: already active, not started")
             task.setTaskCompleted(success: true)
         }
@@ -110,22 +90,20 @@ class BGManager {
         }
         self.completed = false
         DispatchQueue.main.async {
-            chatLastBackgroundRunGroupDefault.set(Date.now)
             let m = ChatModel.shared
             if (!m.chatInitialized) {
-                setAppState(.bgRefresh)
                 do {
                     try initializeChat(start: true)
                 } catch let error {
                     fatalError("Failed to start or load chats: \(responseError(error))")
                 }
             }
-            activateChat(appState: .bgRefresh)
             if m.currentUser == nil {
                 completeReceiving("no current user")
                 return
             }
             logger.debug("BGManager.receiveMessages: starting chat")
+            activateChat(appState: .bgRefresh)
             let cr = ChatReceiver()
             self.chatReceiver = cr
             cr.start()

apps/ios/Shared/Model/ChatModel.swift

@@ -54,21 +54,16 @@ final class ChatModel: ObservableObject {
     @Published var chatDbChanged = false
     @Published var chatDbEncrypted: Bool?
     @Published var chatDbStatus: DBMigrationResult?
-    @Published var ctrlInitInProgress: Bool = false
-    // local authentication
-    @Published var contentViewAccessAuthenticated: Bool = false
     @Published var laRequest: LocalAuthRequest?
     // list of chat "previews"
     @Published var chats: [Chat] = []
-    @Published var deletedChats: Set<String> = []
     // map of connections network statuses, key is agent connection id
     @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
     // current chat
     @Published var chatId: String?
     @Published var reversedChatItems: [ChatItem] = []
-    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
     @Published var chatToTop: String?
-    @Published var groupMembers: [GMember] = []
+    @Published var groupMembers: [GroupMember] = []
     // items in the terminal view
     @Published var showingTerminal = false
     @Published var terminalItems: [TerminalItem] = []
@@ -87,19 +82,16 @@ final class ChatModel: ObservableObject {
     // current WebRTC call
     @Published var callInvitations: Dictionary<ChatId, RcvCallInvitation> = [:]
     @Published var activeCall: Call?
-    let callCommand: WebRTCCommandProcessor = WebRTCCommandProcessor()
+    @Published var callCommand: WCallCommand?
     @Published var showCallView = false
-    // remote desktop
+    // currently showing QR code
-    @Published var remoteCtrlSession: RemoteCtrlSession?
+    @Published var connReqInv: String?
-    // currently showing invitation
-    @Published var showingInvitation: ShowingInvitation?
     // audio recording and playback
     @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
     @Published var draft: ComposeState?
     @Published var draftChatId: String?
     // tracks keyboard height via subscription in AppDelegate
     @Published var keyboardHeight: CGFloat = 0
-    @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
 
     var messageDelivery: Dictionary<Int64, () -> Void> = [:]
 
@@ -109,14 +101,12 @@ final class ChatModel: ObservableObject {
 
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
-    let ntfEnableLocal = true
+    var ntfEnableLocal: Bool {
-
+        notificationMode == .off || ntfEnableLocalGroupDefault.get()
-    var ntfEnablePeriodic: Bool {
-        notificationMode != .off
     }
 
-    var activeRemoteCtrl: Bool {
+    var ntfEnablePeriodic: Bool {
-        remoteCtrlSession?.active ?? false
+        notificationMode == .periodic || ntfEnablePeriodicGroupDefault.get()
     }
 
     func getUser(_ userId: Int64) -> User? {
@@ -139,7 +129,7 @@ final class ChatModel: ObservableObject {
     }
 
     func removeUser(_ user: User) {
-        if let i = getUserIndex(user) {
+        if let i = getUserIndex(user), users[i].user.userId != currentUser?.userId {
             users.remove(at: i)
         }
     }
@@ -162,20 +152,6 @@ 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 })
     }
@@ -189,7 +165,6 @@ final class ChatModel: ObservableObject {
     func updateChatInfo(_ cInfo: ChatInfo) {
         if let i = getChatIndex(cInfo.id) {
             chats[i].chatInfo = cInfo
-            chats[i].created = Date.now
         }
     }
 
@@ -203,7 +178,7 @@ final class ChatModel: ObservableObject {
 
     func updateContactConnectionStats(_ contact: Contact, _ connectionStats: ConnectionStats) {
         var updatedConn = contact.activeConn
-        updatedConn?.connectionStats = connectionStats
+        updatedConn.connectionStats = connectionStats
         var updatedContact = contact
         updatedContact.activeConn = updatedConn
         updateContact(updatedContact)
@@ -270,20 +245,7 @@ final class ChatModel: ObservableObject {
     func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
         // update previews
         if let i = getChatIndex(cInfo.id) {
-            chats[i].chatItems = switch cInfo {
+            chats[i].chatItems = [cItem]
-            case .group:
-                if let currentPreviewItem = chats[i].chatItems.first {
-                    if cItem.meta.itemTs >= currentPreviewItem.meta.itemTs {
-                        [cItem]
-                    } else {
-                        [currentPreviewItem]
-                    }
-                } else {
-                    [cItem]
-                }
-            default:
-                [cItem]
-            }
             if case .rcvNew = cItem.meta.itemStatus {
                 chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
                 increaseUnreadCounter(user: currentUser!)
@@ -334,11 +296,7 @@ final class ChatModel: ObservableObject {
             return false
         } else {
             withAnimation(itemAnimation()) {
-                var ci = cItem
+                reversedChatItems.insert(cItem, at: hasLiveDummy ? 1 : 0)
-                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
         }
@@ -351,22 +309,26 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
+    func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
         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
+        }
     }
 
-    func getChatItemIndex(_ cItem: ChatItem) -> Int? {
+    private func getChatItemIndex(_ cItem: ChatItem) -> Int? {
         reversedChatItems.firstIndex(where: { $0.id == cItem.id })
     }
 
@@ -502,7 +464,6 @@ final class ChatModel: ObservableObject {
         }
         // clear current chat
         if chatId == cInfo.id {
-            chatItemStatuses = [:]
             reversedChatItems = []
         }
     }
@@ -555,62 +516,27 @@ final class ChatModel: ObservableObject {
             users.filter { !$0.user.activeUser }.reduce(0, { unread, next -> Int in unread + next.unreadCount })
     }
 
-    // this function analyses "connected" events and assumes that each member will be there only once
+    func getConnectedMemberNames(_ ci: ChatItem) -> [String] {
-    func getConnectedMemberNames(_ chatItem: ChatItem) -> (Int, [String]) {
+        guard var i = getChatItemIndex(ci) else { return [] }
-        var count = 0
         var ns: [String] = []
-        if let ciCategory = chatItem.mergeCategory,
+        while i < reversedChatItems.count, let m = reversedChatItems[i].memberConnected {
-           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)
     }
 
-    // returns the index of the passed item and the next item (it has smaller index)
+    func getChatItemNeighbors(_ ci: ChatItem) -> (ChatItem?, ChatItem?) {
-    func getNextChatItem(_ ci: ChatItem) -> (Int?, ChatItem?) {
         if let i = getChatItemIndex(ci)  {
-            (i, i > 0 ? reversedChatItems[i - 1] : nil)
+            return (
+                i + 1 < reversedChatItems.count ? reversedChatItems[i + 1] : nil,
+                i - 1 >= 0 ? reversedChatItems[i - 1] : nil
+            )
         } else {
-            (nil, nil)
+            return (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)
@@ -623,16 +549,14 @@ final class ChatModel: ObservableObject {
     }
 
     func dismissConnReqView(_ id: String) {
-        if id == showingInvitation?.connId {
+        if let connReqInv = connReqInv,
-            markShowingInvitationUsed()
+           let c = getChat(id),
+           case let .contactConnection(contactConnection) = c.chatInfo,
+           connReqInv == contactConnection.connReqInv {
             dismissAllSheets()
         }
     }
 
-    func markShowingInvitationUsed() {
-        showingInvitation?.connChatUsed = true
-    }
-
     func removeChat(_ id: String) {
         withAnimation {
             chats.removeAll(where: { $0.id == id })
@@ -647,14 +571,13 @@ final class ChatModel: ObservableObject {
         }
         // update current chat
         if chatId == groupInfo.id {
-            if let i = groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
+            if let i = groupMembers.firstIndex(where: { $0.id == member.id }) {
                 withAnimation(.default) {
-                    self.groupMembers[i].wrapped = member
+                    self.groupMembers[i] = member
-                    self.groupMembers[i].created = Date.now
                 }
                 return false
             } else {
-                withAnimation { groupMembers.append(GMember(member)) }
+                withAnimation { groupMembers.append(member) }
                 return true
             }
         } else {
@@ -663,10 +586,11 @@ final class ChatModel: ObservableObject {
     }
 
     func updateGroupMemberConnectionStats(_ groupInfo: GroupInfo, _ member: GroupMember, _ connectionStats: ConnectionStats) {
-        if var conn = member.activeConn {
+        if let conn = member.activeConn {
-            conn.connectionStats = connectionStats
+            var updatedConn = conn
+            updatedConn.connectionStats = connectionStats
             var updatedMember = member
-            updatedMember.activeConn = conn
+            updatedMember.activeConn = updatedConn
             _ = upsertGroupMember(groupInfo, updatedMember)
         }
     }
@@ -695,23 +619,12 @@ final class ChatModel: ObservableObject {
     }
 
     func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        if let conn = contact.activeConn {
+        networkStatuses[contact.activeConn.agentConnId] = status
-            networkStatuses[conn.agentConnId] = status
-        }
     }
 
     func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        if let conn = contact.activeConn {
+        networkStatuses[contact.activeConn.agentConnId] ?? .unknown
-            networkStatuses[conn.agentConnId] ?? .unknown
-        } else {
-            .unknown
     }
-    }
-}
-
-struct ShowingInvitation {
-    var connId: String
-    var connChatUsed: Bool
 }
 
 struct NTFContactRequest {
@@ -756,8 +669,6 @@ final class Chat: ObservableObject, Identifiable {
         case let .group(groupInfo):
             let m = groupInfo.membership
             return m.memberActive && m.memberRole >= .member
-        case .local:
-            return true
         default: return false
         }
     }
@@ -778,53 +689,40 @@ final class Chat: ObservableObject, Identifiable {
     public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
 }
 
-final class GMember: ObservableObject, Identifiable {
+enum NetworkStatus: Decodable, Equatable {
-    @Published var wrapped: GroupMember
+    case unknown
-    var created = Date.now
+    case connected
+    case disconnected
+    case error(String)
 
-    init(_ member: GroupMember) {
+    var statusString: LocalizedStringKey {
-        self.wrapped = member
+        get {
+            switch self {
+            case .connected: return "connected"
+            case .error: return "error"
+            default: return "connecting"
+            }
+        }
     }
 
-    var id: String { wrapped.id }
+    var statusExplanation: LocalizedStringKey {
-    var groupId: Int64 { wrapped.groupId }
+        get {
-    var groupMemberId: Int64 { wrapped.groupMemberId }
+            switch self {
-    var displayName: String { wrapped.displayName }
+            case .connected: return "You are connected to the server used to receive messages from this contact."
-    var viewId: String { get { "\(wrapped.id) \(created.timeIntervalSince1970)" } }
+            case let .error(err): return "Trying to connect to the server used to receive messages from this contact (error: \(err))."
-    static let sampleData = GMember(GroupMember.sampleData)
+            default: return "Trying to connect to the server used to receive messages from this contact."
-}
+            }
-
+        }
-struct RemoteCtrlSession {
-    var ctrlAppInfo: CtrlAppInfo?
-    var appVersion: String
-    var sessionState: UIRemoteCtrlSessionState
-
-    func updateState(_ state: UIRemoteCtrlSessionState) -> RemoteCtrlSession {
-        RemoteCtrlSession(ctrlAppInfo: ctrlAppInfo, appVersion: appVersion, sessionState: state)
     }
 
-    var active: Bool {
+    var imageName: String {
-        if case .connected = sessionState { true } else { false }
+        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 discovery: Bool {
-        if case .searching = sessionState { true } else { false }
-    }
-
-    var sessionCode: String? {
-        switch sessionState {
-        case let .pendingConfirmation(_, sessionCode): sessionCode
-        case let .connected(_, sessionCode): sessionCode
-        default: nil
         }
     }
 }
-
-enum UIRemoteCtrlSessionState {
-    case starting
-    case searching
-    case found(remoteCtrl: RemoteCtrlInfo, compatible: Bool)
-    case connecting(remoteCtrl_: RemoteCtrlInfo?)
-    case pendingConfirmation(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
-    case connected(remoteCtrl: RemoteCtrlInfo, sessionCode: String)
-}

apps/ios/Shared/Model/ImageUtils.swift

@@ -158,8 +158,7 @@ func imageHasAlpha(_ img: UIImage) -> Bool {
     return false
 }
 
-func saveFileFromURL(_ url: URL) -> CryptoFile? {
+func saveFileFromURL(_ url: URL, encrypted: Bool) -> CryptoFile? {
-    let encrypted = privacyEncryptLocalFilesGroupDefault.get()
     let savedFile: CryptoFile?
     if url.startAccessingSecurityScopedResource() {
         do {
@@ -186,37 +185,28 @@ func saveFileFromURL(_ url: URL) -> CryptoFile? {
 
 func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
     do {
-        let encrypted = privacyEncryptLocalFilesGroupDefault.get()
         let fileName = uniqueCombine(url.lastPathComponent)
-        let savedFile: CryptoFile?
-        if encrypted {
-            let cfArgs = try encryptCryptoFile(fromPath: url.path, toPath: getAppFilePath(fileName).path)
-            try FileManager.default.removeItem(atPath: url.path)
-            savedFile = CryptoFile(filePath: fileName, cryptoArgs: cfArgs)
-        } else {
         try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
-            savedFile = CryptoFile.plain(fileName)
-        }
         ChatModel.shared.filesToDelete.remove(url)
-        return savedFile
+        return CryptoFile.plain(fileName)
     } catch {
         logger.error("ImageUtils.moveTempFileFromURL error: \(error.localizedDescription)")
         return nil
     }
 }
 
-func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
+func generateNewFileName(_ prefix: String, _ ext: String) -> String {
-    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
+    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)")
 }
 
-private func uniqueCombine(_ fileName: String, fullPath: Bool = false) -> String {
+private func uniqueCombine(_ fileName: String) -> String {
     func tryCombine(_ fileName: String, _ n: Int) -> String {
         let ns = fileName as NSString
         let name = ns.deletingPathExtension
         let ext = ns.pathExtension
         let suffix = (n == 0) ? "" : "_\(n)"
         let f = "\(name)\(suffix).\(ext)"
-        return (FileManager.default.fileExists(atPath: fullPath ? f : getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
+        return (FileManager.default.fileExists(atPath: getAppFilePath(f).path)) ? tryCombine(fileName, n + 1) : f
     }
     return tryCombine(fileName, 0)
 }

apps/ios/Shared/Model/NSESubscriber.swift

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

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -211,7 +211,7 @@ func apiDeleteUser(_ userId: Int64, _ delSMPQueues: Bool, viewPwd: String?) asyn
 }
 
 func apiStartChat() throws -> Bool {
-    let r = chatSendCmdSync(.startChat(mainApp: true))
+    let r = chatSendCmdSync(.startChat(subscribe: true, expire: true, xftp: true))
     switch r {
     case .chatStarted: return true
     case .chatRunning: return false
@@ -228,8 +228,7 @@ func apiStopChat() async throws {
 }
 
 func apiActivateChat() {
-    chatReopenStore()
+    let r = chatSendCmdSync(.apiActivateChat)
-    let r = chatSendCmdSync(.apiActivateChat(restoreChat: true))
     if case .cmdOk = r { return }
     logger.error("apiActivateChat error: \(String(describing: r))")
 }
@@ -258,12 +257,6 @@ 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))
 }
@@ -313,7 +306,6 @@ 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)
@@ -365,13 +357,6 @@ func apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId:
     }
 }
 
-func apiCreateChatItem(noteFolderId: Int64, file: CryptoFile?, msg: MsgContent) async -> ChatItem? {
-    let r = await chatSendCmd(.apiCreateChatItem(noteFolderId: noteFolderId, file: file, msg: msg))
-    if case let .newChatItem(_, aChatItem) = r { return aChatItem.chatItem }
-    createChatItemErrorAlert(r)
-    return nil
-}
-
 private func sendMessageErrorAlert(_ r: ChatResponse) {
     logger.error("apiSendMessage error: \(String(describing: r))")
     AlertManager.shared.showAlertMsg(
@@ -380,14 +365,6 @@ private func sendMessageErrorAlert(_ r: ChatResponse) {
     )
 }
 
-private func createChatItemErrorAlert(_ r: ChatResponse) {
-    logger.error("apiCreateChatItem error: \(String(describing: r))")
-    AlertManager.shared.showAlertMsg(
-        title: "Error creating message",
-        message: "Error: \(String(describing: r))"
-    )
-}
-
 func apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent, live: Bool = false) async throws -> ChatItem {
     let r = await chatSendCmd(.apiUpdateChatItem(type: type, id: id, itemId: itemId, msg: msg, live: live), bgDelay: msgDelay)
     if case let .chatItemUpdated(_, aChatItem) = r { return aChatItem.chatItem }
@@ -418,7 +395,7 @@ func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode) {
     case let .ntfToken(token, status, ntfMode): return (token, status, ntfMode)
     case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off)
     default:
-        logger.debug("apiGetNtfToken response: \(String(describing: r))")
+        logger.debug("apiGetNtfToken response: \(String(describing: r), privacy: .public)")
         return (nil, nil, .off)
     }
 }
@@ -518,10 +495,6 @@ 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) }
@@ -596,15 +569,15 @@ func apiVerifyGroupMember(_ groupId: Int64, _ groupMemberId: Int64, connectionCo
     return nil
 }
 
-func apiAddContact(incognito: Bool) async -> ((String, PendingContactConnection)?, Alert?) {
+func apiAddContact(incognito: Bool) async -> (String, PendingContactConnection)? {
     guard let userId = ChatModel.shared.currentUser?.userId else {
         logger.error("apiAddContact: no current user")
-        return (nil, nil)
+        return nil
     }
     let r = await chatSendCmd(.apiAddContact(userId: userId, incognito: incognito), bgTask: false)
-    if case let .invitation(_, connReqInvitation, connection) = r { return ((connReqInvitation, connection), nil) }
+    if case let .invitation(_, connReqInvitation, connection) = r { return (connReqInvitation, connection) }
-    let alert = connectionErrorAlert(r)
+    AlertManager.shared.showAlert(connectionErrorAlert(r))
-    return (nil, alert)
+    return nil
 }
 
 func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> PendingContactConnection? {
@@ -613,41 +586,34 @@ func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> P
     throw r
 }
 
-func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
+func apiConnect(incognito: Bool, connReq: String) async -> ConnReqType? {
-    let userId = try currentUserId("apiConnectPlan")
+    let (connReqType, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
-    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, PendingContactConnection)? {
-    let (r, alert) = await apiConnect_(incognito: incognito, connReq: connReq)
     if let alert = alert {
         AlertManager.shared.showAlert(alert)
         return nil
     } else {
-        return r
+        return connReqType
     }
 }
 
-func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, PendingContactConnection)?, Alert?) {
+func apiConnect_(incognito: Bool, connReq: String) async -> (ConnReqType?, Alert?) {
     guard let userId = ChatModel.shared.currentUser?.userId else {
         logger.error("apiConnect: no current user")
         return (nil, nil)
     }
     let r = await chatSendCmd(.apiConnect(userId: userId, incognito: incognito, connReq: connReq))
-    let m = ChatModel.shared
     switch r {
-    case let .sentConfirmation(_, connection):
+    case .sentConfirmation: return (.invitation, nil)
-        return ((.invitation, connection), nil)
+    case .sentInvitation: return (.contact, nil)
-    case let .sentInvitation(_, connection):
-        return ((.contact, connection), nil)
     case let .contactAlreadyExists(_, contact):
+        let m = ChatModel.shared
         if let c = m.getContactChat(contact.contactId) {
             await MainActor.run { m.chatId = c.id }
         }
-        let alert = contactAlreadyExistsAlert(contact)
+        let alert = mkAlert(
+            title: "Contact already exists",
+            message: "You are already connected to \(contact.displayName)."
+        )
         return (nil, alert)
     case .chatCmdError(_, .error(.invalidConnReq)):
         let alert = mkAlert(
@@ -675,13 +641,6 @@ func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, Pendi
     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
@@ -693,33 +652,18 @@ private func connectionErrorAlert(_ r: ChatResponse) -> Alert {
     }
 }
 
-func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Contact?, Alert?) {
+func apiDeleteChat(type: ChatType, id: Int64) async throws {
-    guard let userId = ChatModel.shared.currentUser?.userId else {
+    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id), bgTask: false)
-        logger.error("apiConnectContactViaAddress: no current user")
-        return (nil, nil)
-    }
-    let r = await chatSendCmd(.apiConnectContactViaAddress(userId: userId, incognito: incognito, contactId: contactId))
-    if case let .sentInvitationToContact(_, contact, _) = r { return (contact, nil) }
-    logger.error("apiConnectContactViaAddress error: \(responseError(r))")
-    let alert = connectionErrorAlert(r)
-    return (nil, alert)
-}
-
-func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
-    let chatId = type.rawValue + id.description
-    DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
-    defer { DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) } }
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
     if case .direct = type, case .contactDeleted = r { return }
     if case .contactConnection = type, case .contactConnectionDeleted = r { return }
     if case .group = type, case .groupDeletedUser = r { return }
     throw r
 }
 
-func deleteChat(_ chat: Chat, notify: Bool? = nil) async {
+func deleteChat(_ chat: Chat) async {
     do {
         let cInfo = chat.chatInfo
-        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, notify: notify)
+        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId)
         DispatchQueue.main.async { ChatModel.shared.removeChat(cInfo.id) }
     } catch let error {
         logger.error("deleteChat apiDeleteChat error: \(responseError(error))")
@@ -757,9 +701,8 @@ 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 (profile, [])
+    case .userProfileNoChange: return nil
     case let .userProfileUpdated(_, _, toProfile, updateSummary): return (toProfile, updateSummary.changedContacts)
-    case .chatCmdError(_, .errorStore(.duplicateName)): return nil;
     default: throw r
     }
 }
@@ -870,8 +813,8 @@ func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
     try await sendCommandOkResp(.apiChatUnread(type: type, id: id, unreadChat: unreadChat))
 }
 
-func receiveFile(user: any UserLike, fileId: Int64, auto: Bool = false) async {
+func receiveFile(user: any UserLike, fileId: Int64, encrypted: Bool, auto: Bool = false) async {
-    if let chatItem = await apiReceiveFile(fileId: fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get(), auto: auto) {
+    if let chatItem = await apiReceiveFile(fileId: fileId, encrypted: encrypted, auto: auto) {
         await chatItemSimpleUpdate(user, chatItem)
     }
 }
@@ -926,46 +869,6 @@ func apiCancelFile(fileId: Int64) async -> AChatItem? {
     }
 }
 
-func setLocalDeviceName(_ displayName: String) throws {
-    try sendCommandOkRespSync(.setLocalDeviceName(displayName: displayName))
-}
-
-func connectRemoteCtrl(desktopAddress: String) async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String) {
-    let r = await chatSendCmd(.connectRemoteCtrl(xrcpInvitation: desktopAddress))
-    if case let .remoteCtrlConnecting(rc_, ctrlAppInfo, v) = r { return (rc_, ctrlAppInfo, v) }
-    throw r
-}
-
-func findKnownRemoteCtrl() async throws {
-    try await sendCommandOkResp(.findKnownRemoteCtrl)
-}
-
-func confirmRemoteCtrl(_ rcId: Int64) async throws -> (RemoteCtrlInfo?, CtrlAppInfo, String) {
-    let r = await chatSendCmd(.confirmRemoteCtrl(remoteCtrlId: rcId))
-    if case let .remoteCtrlConnecting(rc_, ctrlAppInfo, v) = r { return (rc_, ctrlAppInfo, v) }
-    throw r
-}
-
-func verifyRemoteCtrlSession(_ sessCode: String) async throws -> RemoteCtrlInfo {
-    let r = await chatSendCmd(.verifyRemoteCtrlSession(sessionCode: sessCode))
-    if case let .remoteCtrlConnected(rc) = r { return rc }
-    throw r
-}
-
-func listRemoteCtrls() throws -> [RemoteCtrlInfo] {
-    let r = chatSendCmdSync(.listRemoteCtrls)
-    if case let .remoteCtrlList(rcInfo) = r { return rcInfo }
-    throw r
-}
-
-func stopRemoteCtrl() async throws {
-    try await sendCommandOkResp(.stopRemoteCtrl)
-}
-
-func deleteRemoteCtrl(_ rcId: Int64) async throws {
-    try await sendCommandOkResp(.deleteRemoteCtrl(remoteCtrlId: rcId))
-}
-
 func networkErrorAlert(_ r: ChatResponse) -> Alert? {
     switch r {
     case let .chatCmdError(_, .errorAgent(.BROKER(addr, .TIMEOUT))):
@@ -1041,12 +944,6 @@ 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 {
@@ -1094,15 +991,9 @@ private func sendCommandOkResp(_ cmd: ChatCommand) async throws {
     throw r
 }
 
-private func sendCommandOkRespSync(_ cmd: ChatCommand) throws {
+func apiNewGroup(_ p: GroupProfile) throws -> GroupInfo {
-    let r = chatSendCmdSync(cmd)
-    if case .cmdOk = r { return }
-    throw r
-}
-
-func apiNewGroup(incognito: Bool, groupProfile: GroupProfile) throws -> GroupInfo {
     let userId = try currentUserId("apiNewGroup")
-    let r = chatSendCmdSync(.apiNewGroup(userId: userId, incognito: incognito, groupProfile: groupProfile))
+    let r = chatSendCmdSync(.apiNewGroup(userId: userId, groupProfile: p))
     if case let .groupCreated(_, groupInfo) = r { return groupInfo }
     throw r
 }
@@ -1141,12 +1032,6 @@ func apiMemberRole(_ groupId: Int64, _ memberId: Int64, _ memberRole: GroupMembe
     throw r
 }
 
-func apiBlockMemberForAll(_ groupId: Int64, _ memberId: Int64, _ blocked: Bool) async throws -> GroupMember {
-    let r = await chatSendCmd(.apiBlockMemberForAll(groupId: groupId, memberId: memberId, blocked: blocked), bgTask: false)
-    if case let .memberBlockedForAllUser(_, _, member, _) = r { return member }
-    throw r
-}
-
 func leaveGroup(_ groupId: Int64) async {
     do {
         let groupInfo = try await apiLeaveGroup(groupId)
@@ -1168,11 +1053,11 @@ func apiListMembers(_ groupId: Int64) async -> [GroupMember] {
     return []
 }
 
-func filterMembersToAdd(_ ms: [GMember]) -> [Contact] {
+func filterMembersToAdd(_ ms: [GroupMember]) -> [Contact] {
-    let memberContactIds = ms.compactMap{ m in m.wrapped.memberCurrent ? m.wrapped.memberContactId : nil }
+    let memberContactIds = ms.compactMap{ m in m.memberCurrent ? m.memberContactId : nil }
     return ChatModel.shared.chats
         .compactMap{ $0.chatInfo.contact }
-        .filter{ c in c.ready && c.active && !memberContactIds.contains(c.apiId) }
+        .filter{ !memberContactIds.contains($0.apiId) }
         .sorted{ $0.displayName.lowercased() < $1.displayName.lowercased() }
 }
 
@@ -1236,11 +1121,9 @@ private func currentUserId(_ funcName: String) throws -> Int64 {
     throw RuntimeError("\(funcName): no current user")
 }
 
-func initializeChat(start: Bool, confirmStart: Bool = false, dbKey: String? = nil, refreshInvitations: Bool = true, confirmMigrations: MigrationConfirmation? = nil) throws {
+func initializeChat(start: Bool, dbKey: String? = nil, refreshInvitations: Bool = true, confirmMigrations: MigrationConfirmation? = nil) throws {
     logger.debug("initializeChat")
     let m = ChatModel.shared
-    m.ctrlInitInProgress = true
-    defer { m.ctrlInitInProgress = false }
     (m.chatDbEncrypted, m.chatDbStatus) = chatMigrateInit(dbKey, confirmMigrations: confirmMigrations)
     if  m.chatDbStatus != .ok { return }
     // If we migrated successfully means previous re-encryption process on database level finished successfully too
@@ -1250,50 +1133,16 @@ func initializeChat(start: Bool, confirmStart: Bool = false, dbKey: String? = ni
     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 {
         onboardingStageDefault.set(.step1_SimpleXInfo)
         privacyDeliveryReceiptsSet.set(true)
         m.onboardingStage = .step1_SimpleXInfo
-    } else if confirmStart {
+    } else if start {
-        showStartChatAfterRestartAlert { start in
-            do {
-                if start { AppChatState.shared.set(.active) }
-                try chatInitialized(start: start, refreshInvitations: refreshInvitations)
-            } catch let error {
-                logger.error("ChatInitialized error: \(error)")
-            }
-        }
-    } else {
-        try chatInitialized(start: start, refreshInvitations: refreshInvitations)
-    }
-}
-
-func showStartChatAfterRestartAlert(result: @escaping (_ start: Bool) -> Void) {
-    AlertManager.shared.showAlert(Alert(
-        title: Text("Start chat?"),
-        message: Text("Chat is stopped. If you already used this database on another device, you should transfer it back before starting chat."),
-        primaryButton: .default(Text("Ok")) {
-            result(true)
-        },
-        secondaryButton: .cancel {
-            result(false)
-        }
-    ))
-}
-
-private func chatInitialized(start: Bool, refreshInvitations: Bool) throws {
-    let m = ChatModel.shared
-    if m.currentUser == nil { return }
-    if start {
         try startChat(refreshInvitations: refreshInvitations)
     } else {
         m.chatRunning = false
-        try getUserChatData()
-        NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
-        m.onboardingStage = onboardingStageDefault.get()
     }
 }
 
@@ -1310,8 +1159,6 @@ func startChat(refreshInvitations: Bool = true) throws {
             try refreshCallInvitations()
         }
         (m.savedToken, m.tokenStatus, m.notificationMode) = apiGetNtfToken()
-        // deviceToken is set when AppDelegate.application(didRegisterForRemoteNotificationsWithDeviceToken:) is called,
-        // when it is called before startChat
         if let token = m.deviceToken {
             registerToken(token: token)
         }
@@ -1345,12 +1192,8 @@ private func changeActiveUser_(_ userId: Int64, viewPwd: String?) throws {
     try getUserChatData()
 }
 
-func changeActiveUserAsync_(_ userId: Int64?, viewPwd: String?) async throws {
+func changeActiveUserAsync_(_ userId: Int64, viewPwd: String?) async throws {
-    let currentUser = if let userId = userId {
+    let currentUser = try await apiSetActiveUserAsync(userId, viewPwd: viewPwd)
-        try await apiSetActiveUserAsync(userId, viewPwd: viewPwd)
-    } else {
-        try apiGetActiveUser()
-    }
     let users = try await listUsersAsync()
     await MainActor.run {
         let m = ChatModel.shared
@@ -1359,7 +1202,7 @@ func changeActiveUserAsync_(_ userId: Int64?, viewPwd: String?) async throws {
     }
     try await getUserChatDataAsync()
     await MainActor.run {
-        if let currentUser = currentUser, var (_, invitation) = ChatModel.shared.callInvitations.first(where: { _, inv in inv.user.userId == userId }) {
+        if var (_, invitation) = ChatModel.shared.callInvitations.first(where: { _, inv in inv.user.userId == userId }) {
             invitation.user = currentUser
             activateCall(invitation)
         }
@@ -1375,22 +1218,15 @@ func getUserChatData() throws {
 }
 
 private func getUserChatDataAsync() async throws {
-    let m = ChatModel.shared
-    if m.currentUser != nil {
     let userAddress = try await apiGetUserAddressAsync()
     let chatItemTTL = try await getChatItemTTLAsync()
     let chats = try await apiGetChatsAsync()
     await MainActor.run {
+        let m = ChatModel.shared
         m.userAddress = userAddress
         m.chatItemTTL = chatItemTTL
         m.chats = chats.map { Chat.init($0) }
     }
-    } else {
-        await MainActor.run {
-            m.userAddress = nil
-            m.chats = []
-        }
-    }
 }
 
 class ChatReceiver {
@@ -1437,20 +1273,24 @@ func processReceivedMsg(_ res: ChatResponse) async {
     let m = ChatModel.shared
     logger.debug("processReceivedMsg: \(res.responseType)")
     switch res {
-    case let .contactDeletedByContact(user, contact):
+    case let .newContactConnection(user, connection):
-        if active(user) && contact.directOrUsed {
+        if active(user) {
             await MainActor.run {
-                m.updateContact(contact)
+                m.updateContactConnection(connection)
+            }
+        }
+    case let .contactConnectionDeleted(user, connection):
+        if active(user) {
+            await MainActor.run {
+                m.removeChat(connection.id)
             }
         }
     case let .contactConnected(user, contact, _):
         if active(user) && contact.directOrUsed {
             await MainActor.run {
                 m.updateContact(contact)
-                if let conn = contact.activeConn {
+                m.dismissConnReqView(contact.activeConn.id)
-                    m.dismissConnReqView(conn.id)
+                m.removeChat(contact.activeConn.id)
-                    m.removeChat(conn.id)
-                }
             }
         }
         if contact.directOrUsed {
@@ -1463,10 +1303,8 @@ func processReceivedMsg(_ res: ChatResponse) async {
         if active(user) && contact.directOrUsed {
             await MainActor.run {
                 m.updateContact(contact)
-                if let conn = contact.activeConn {
+                m.dismissConnReqView(contact.activeConn.id)
-                    m.dismissConnReqView(conn.id)
+                m.removeChat(contact.activeConn.id)
-                    m.removeChat(conn.id)
-                }
             }
         }
     case let .receivedContactRequest(user, contactRequest):
@@ -1491,12 +1329,6 @@ 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 {
@@ -1510,6 +1342,13 @@ 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 {
@@ -1524,18 +1363,6 @@ 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
@@ -1548,7 +1375,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 {
@@ -1557,8 +1384,11 @@ func processReceivedMsg(_ res: ChatResponse) async {
     case let .chatItemStatusUpdated(user, aChatItem):
         let cInfo = aChatItem.chatInfo
         let cItem = aChatItem.chatItem
-        if !cItem.isDeletedContent && active(user) {
+        if !cItem.isDeletedContent {
-            await MainActor.run { m.updateChatItem(cInfo, cItem, status: cItem.meta.itemStatus) }
+            let added = active(user) ? await MainActor.run { m.upsertChatItem(cInfo, cItem) } : true
+            if added && cItem.showNotification {
+                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
+            }
         }
         if let endTask = m.messageDelivery[cItem.id] {
             switch cItem.meta.itemStatus {
@@ -1605,19 +1435,9 @@ func processReceivedMsg(_ res: ChatResponse) async {
 
         await MainActor.run {
             m.updateGroup(groupInfo)
-            if let conn = hostContact?.activeConn {
+            if let hostContact = hostContact {
-                m.dismissConnReqView(conn.id)
+                m.dismissConnReqView(hostContact.activeConn.id)
-                m.removeChat(conn.id)
+                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):
@@ -1679,18 +1499,10 @@ func processReceivedMsg(_ res: ChatResponse) async {
                 m.updateGroup(toGroup)
             }
         }
-    case let .memberRole(user, groupInfo, byMember: _, member: member, fromRole: _, toRole: _):
+    case let .memberRole(user, groupInfo, _, _, _, _):
         if active(user) {
             await MainActor.run {
                 m.updateGroup(groupInfo)
-                _ = m.upsertGroupMember(groupInfo, member)
-            }
-        }
-    case let .memberBlockedForAll(user, groupInfo, byMember: _, member: member, blocked: _):
-        if active(user) {
-            await MainActor.run {
-                m.updateGroup(groupInfo)
-                _ = m.upsertGroupMember(groupInfo, member)
             }
         }
     case let .newMemberContactReceivedInv(user, contact, _, _):
@@ -1736,40 +1548,36 @@ func processReceivedMsg(_ res: ChatResponse) async {
         activateCall(invitation)
     case let .callOffer(_, contact, callType, offer, sharedKey, _):
         await withCall(contact) { call in
-            await MainActor.run {
             call.callState = .offerReceived
             call.peerMedia = callType.media
             call.sharedKey = sharedKey
-            }
             let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
             let iceServers = getIceServers()
             logger.debug(".callOffer useRelay \(useRelay)")
             logger.debug(".callOffer iceServers \(String(describing: iceServers))")
-            await m.callCommand.processCommand(.offer(
+            m.callCommand = .offer(
                 offer: offer.rtcSession,
                 iceCandidates: offer.rtcIceCandidates,
                 media: callType.media, aesKey: sharedKey,
                 iceServers: iceServers,
                 relay: useRelay
-            ))
+            )
         }
     case let .callAnswer(_, contact, answer):
         await withCall(contact) { call in
-            await MainActor.run {
             call.callState = .answerReceived
-            }
+            m.callCommand = .answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates)
-            await m.callCommand.processCommand(.answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates))
         }
     case let .callExtraInfo(_, contact, extraInfo):
         await withCall(contact) { _ in
-            await m.callCommand.processCommand(.ice(iceCandidates: extraInfo.rtcIceCandidates))
+            m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
         }
     case let .callEnded(_, contact):
         if let invitation = await MainActor.run(body: { m.callInvitations.removeValue(forKey: contact.id) }) {
             CallController.shared.reportCallRemoteEnded(invitation: invitation)
         }
         await withCall(contact) { call in
-            await m.callCommand.processCommand(.end)
+            m.callCommand = .end
             CallController.shared.reportCallRemoteEnded(call: call)
         }
     case .chatSuspended:
@@ -1790,67 +1598,19 @@ func processReceivedMsg(_ res: ChatResponse) async {
         await MainActor.run {
             m.updateGroupMemberConnectionStats(groupInfo, member, ratchetSyncProgress.connectionStats)
         }
-    case let .remoteCtrlFound(remoteCtrl, ctrlAppInfo_, appVersion, compatible):
-        await MainActor.run {
-            if let sess = m.remoteCtrlSession, case .searching = sess.sessionState {
-                let state = UIRemoteCtrlSessionState.found(remoteCtrl: remoteCtrl, compatible: compatible)
-                m.remoteCtrlSession = RemoteCtrlSession(
-                    ctrlAppInfo: ctrlAppInfo_,
-                    appVersion: appVersion,
-                    sessionState: state
-                )
-            }
-        }
-    case let .remoteCtrlSessionCode(remoteCtrl_, sessionCode):
-        await MainActor.run {
-            let state = UIRemoteCtrlSessionState.pendingConfirmation(remoteCtrl_: remoteCtrl_, sessionCode: sessionCode)
-            m.remoteCtrlSession = m.remoteCtrlSession?.updateState(state)
-        }
-    case let .remoteCtrlConnected(remoteCtrl):
-        // TODO currently it is returned in response to command, so it is redundant
-        await MainActor.run {
-            let state = UIRemoteCtrlSessionState.connected(remoteCtrl: remoteCtrl, sessionCode: m.remoteCtrlSession?.sessionCode ?? "")
-            m.remoteCtrlSession = m.remoteCtrlSession?.updateState(state)
-        }
-    case .remoteCtrlStopped:
-        // This delay is needed to cancel the session that fails on network failure,
-        // e.g. when user did not grant permission to access local network yet.
-        if let sess = m.remoteCtrlSession {
-            await MainActor.run {
-                m.remoteCtrlSession = nil
-            }
-            if case .connected = sess.sessionState {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                    switchToLocalSession()
-                }
-            }
-        }
     default:
         logger.debug("unsupported event: \(res.responseType)")
     }
 
-    func withCall(_ contact: Contact, _ perform: (Call) async -> Void) async {
+    func withCall(_ contact: Contact, _ perform: (Call) -> Void) async {
         if let call = m.activeCall, call.contact.apiId == contact.apiId {
-            await perform(call)
+            await MainActor.run { perform(call) }
         } else {
             logger.debug("processReceivedMsg: ignoring \(res.responseType), not in call with the contact \(contact.id)")
         }
     }
 }
 
-func switchToLocalSession() {
-    let m = ChatModel.shared
-    m.remoteCtrlSession = nil
-    do {
-        m.users = try listUsers()
-        try getUserChatData()
-        let statuses = (try apiGetNetworkStatuses()).map { s in (s.agentConnId, s.networkStatus) }
-        m.networkStatuses = Dictionary(uniqueKeysWithValues: statuses)
-    } catch let error {
-        logger.debug("error updating chat data: \(responseError(error))")
-    }
-}
-
 func active(_ user: any UserLike) -> Bool {
     user.userId == ChatModel.shared.currentUser?.id
 }
@@ -1883,7 +1643,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(connectionError: err))
+    m.setContactNetworkStatus(contact, .error(err))
 }
 
 func refreshCallInvitations() throws {

apps/ios/Shared/Model/SuspendChat.swift

@@ -9,63 +9,51 @@
 import Foundation
 import UIKit
 import SimpleXChat
-import SwiftUI
 
 private let suspendLockQueue = DispatchQueue(label: "chat.simplex.app.suspend.lock")
 
+let appSuspendTimeout: Int = 15 // seconds
+
 let bgSuspendTimeout: Int = 5 // seconds
 
 let terminationTimeout: Int = 3 // seconds
 
-let activationDelay: TimeInterval = 1.5
-
-let nseSuspendTimeout: TimeInterval = 5
-
 private func _suspendChat(timeout: Int) {
-    // this is a redundant check to prevent logical errors, like the one fixed in this PR
+    if ChatModel.ok {
-    let state = AppChatState.shared.value
+        appStateGroupDefault.set(.suspending)
-    if !state.canSuspend {
-        logger.error("_suspendChat called, current state: \(state.rawValue)")
-    } else if ChatModel.ok {
-        AppChatState.shared.set(.suspending)
         apiSuspendChat(timeoutMicroseconds: timeout * 1000000)
         let endTask = beginBGTask(chatSuspended)
         DispatchQueue.global().asyncAfter(deadline: .now() + Double(timeout) + 1, execute: endTask)
     } else {
-        AppChatState.shared.set(.suspended)
+        appStateGroupDefault.set(.suspended)
     }
 }
 
 func suspendChat() {
     suspendLockQueue.sync {
+        if appStateGroupDefault.get() != .stopped {
             _suspendChat(timeout: appSuspendTimeout)
         }
+    }
 }
 
 func suspendBgRefresh() {
     suspendLockQueue.sync {
-        if case .bgRefresh = AppChatState.shared.value  {
+        if case .bgRefresh = appStateGroupDefault.get()  {
             _suspendChat(timeout: bgSuspendTimeout)
         }
     }
 }
 
 func terminateChat() {
-    logger.debug("terminateChat")
     suspendLockQueue.sync {
-        switch AppChatState.shared.value {
+        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) }
-            chatCloseStore()
+        case .stopped: ()
-        case .suspended:
-            chatCloseStore()
-        case .stopped:
-            chatCloseStore()
         default:
-            // the store will be closed in _chatSuspended when event is received
             _suspendChat(timeout: terminationTimeout)
         }
     }
@@ -73,7 +61,7 @@ func terminateChat() {
 
 func chatSuspended() {
     suspendLockQueue.sync {
-        if case .suspending = AppChatState.shared.value {
+        if case .suspending = appStateGroupDefault.get() {
             _chatSuspended()
         }
     }
@@ -81,23 +69,16 @@ func chatSuspended() {
 
 private func _chatSuspended() {
     logger.debug("_chatSuspended")
-    AppChatState.shared.set(.suspended)
+    appStateGroupDefault.set(.suspended)
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.stop()
     }
-    chatCloseStore()
-}
-
-func setAppState(_ appState: AppState) {
-    suspendLockQueue.sync {
-        AppChatState.shared.set(appState)
-    }
 }
 
 func activateChat(appState: AppState = .active) {
     logger.debug("DEBUGGING: activateChat")
     suspendLockQueue.sync {
-        AppChatState.shared.set(appState)
+        appStateGroupDefault.set(appState)
         if ChatModel.ok { apiActivateChat() }
         logger.debug("DEBUGGING: activateChat: after apiActivateChat")
     }
@@ -106,86 +87,24 @@ func activateChat(appState: AppState = .active) {
 func initChatAndMigrate(refreshInvitations: Bool = true) {
     let m = ChatModel.shared
     if (!m.chatInitialized) {
-        m.v3DBMigration = v3DBMigrationDefault.get()
-        if AppChatState.shared.value == .stopped && storeDBPassphraseGroupDefault.get() && kcDatabasePassword.get() != nil {
-            initialize(start: true, confirmStart: true)
-        } else {
-            initialize(start: true)
-        }
-    }
-
-    func initialize(start: Bool, confirmStart: Bool = false) {
         do {
-            try initializeChat(start: m.v3DBMigration.startChat && start, confirmStart: m.v3DBMigration.startChat && confirmStart, refreshInvitations: refreshInvitations)
+            m.v3DBMigration = v3DBMigrationDefault.get()
+            try initializeChat(start: m.v3DBMigration.startChat, refreshInvitations: refreshInvitations)
         } catch let error {
-            AlertManager.shared.showAlertMsg(
+            fatalError("Failed to start or load chats: \(responseError(error))")
-                title: start ? "Error starting chat" : "Error opening chat",
-                message: "Please contact developers.\nError: \(responseError(error))"
-            )
         }
     }
 }
 
-func startChatForCall() {
+func startChatAndActivate() {
-    logger.debug("DEBUGGING: startChatForCall")
-    if ChatModel.shared.chatRunning == true {
-        ChatReceiver.shared.start()
-        logger.debug("DEBUGGING: startChatForCall: after ChatReceiver.shared.start")
-    }
-    if .active != AppChatState.shared.value {
-        logger.debug("DEBUGGING: startChatForCall: before activateChat")
-        activateChat()
-        logger.debug("DEBUGGING: startChatForCall: after activateChat")
-    }
-}
-
-func startChatAndActivate(_ completion: @escaping () -> Void) {
     logger.debug("DEBUGGING: startChatAndActivate")
     if ChatModel.shared.chatRunning == true {
         ChatReceiver.shared.start()
         logger.debug("DEBUGGING: startChatAndActivate: after ChatReceiver.shared.start")
     }
-    if case .active = AppChatState.shared.value {
+    if .active != appStateGroupDefault.get()  {
-        completion()
-    } else if nseStateGroupDefault.get().inactive {
-        activate()
-    } else {
-        // setting app state to "activating" to notify NSE that it should suspend
-        setAppState(.activating)
-        waitNSESuspended(timeout: nseSuspendTimeout) { ok in
-            if !ok {
-                // if for some reason NSE failed to suspend,
-                // e.g., it crashed previously without setting its state to "suspended",
-                // set it to "suspended" state anyway, so that next time app
-                // does not have to wait when activating.
-                nseStateGroupDefault.set(.suspended)
-            }
-            if AppChatState.shared.value == .activating {
-                activate()
-            }
-        }
-    }
-
-    func activate() {
         logger.debug("DEBUGGING: startChatAndActivate: before activateChat")
         activateChat()
-        completion()
         logger.debug("DEBUGGING: startChatAndActivate: after activateChat")
     }
 }
-
-// appStateGroupDefault must not be used in the app directly, only via this singleton
-class AppChatState {
-    static let shared = AppChatState()
-    private var value_ = appStateGroupDefault.get()
-
-    var value: AppState {
-        value_
-    }
-
-    func set(_ state: AppState) {
-        appStateGroupDefault.set(state)
-        sendAppState(state)
-        value_ = state
-    }
-}

apps/ios/Shared/SimpleXApp.swift

@@ -16,15 +16,17 @@ struct SimpleXApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @StateObject private var chatModel = ChatModel.shared
     @ObservedObject var alertManager = AlertManager.shared
-
     @Environment(\.scenePhase) var scenePhase
-    @State private var enteredBackgroundAuthenticated: TimeInterval? = nil
+    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
+    @State private var userAuthorized: Bool?
+    @State private var doAuthenticate = false
+    @State private var enteredBackground: TimeInterval? = nil
+    @State private var canConnectCall = false
+    @State private var lastSuccessfulUnlock: TimeInterval? = nil
+    @State private var showInitializationView = false
 
     init() {
-        DispatchQueue.global(qos: .background).sync {
+        hs_init(0, nil)
-            haskell_init()
-//            hs_init(0, nil)
-        }
         UserDefaults.standard.register(defaults: appDefaults)
         setGroupDefaults()
         registerGroupDefaults()
@@ -34,55 +36,53 @@ struct SimpleXApp: App {
     }
 
     var body: some Scene {
-        WindowGroup {
+        return WindowGroup {
-            // contentAccessAuthenticationExtended has to be passed to ContentView on view initialization,
+            ContentView(
-            // so that it's computed by the time view renders, and not on event after rendering
+                doAuthenticate: $doAuthenticate,
-            ContentView(contentAccessAuthenticationExtended: !authenticationExpired())
+                userAuthorized: $userAuthorized,
+                canConnectCall: $canConnectCall,
+                lastSuccessfulUnlock: $lastSuccessfulUnlock,
+                showInitializationView: $showInitializationView
+            )
                 .environmentObject(chatModel)
                 .onOpenURL { url in
                     logger.debug("ContentView.onOpenURL: \(url)")
                     chatModel.appOpenUrl = url
                 }
                 .onAppear() {
-                    if kcAppPassword.get() == nil || kcSelfDestructPassword.get() == nil {
+                    showInitializationView = true
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                         initChatAndMigrate()
                     }
                 }
-                }
                 .onChange(of: scenePhase) { phase in
                     logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
                     switch (phase) {
                     case .background:
-                        // --- authentication
-                        // see ContentView .onChange(of: scenePhase) for remaining authentication logic
-                        if chatModel.contentViewAccessAuthenticated {
-                            enteredBackgroundAuthenticated = ProcessInfo.processInfo.systemUptime
-                        }
-                        chatModel.contentViewAccessAuthenticated = false
-                        // authentication ---
-
                         if CallController.useCallKit() && chatModel.activeCall != nil {
                             CallController.shared.shouldSuspendChat = true
                         } else {
                             suspendChat()
                             BGManager.shared.schedule()
                         }
+                        if userAuthorized == true {
+                            enteredBackground = ProcessInfo.processInfo.systemUptime
+                        }
+                        doAuthenticate = false
+                        canConnectCall = false
                         NtfManager.shared.setNtfBadgeCount(chatModel.totalUnreadCountForAllUsers())
                     case .active:
                         CallController.shared.shouldSuspendChat = false
-                        let appState = AppChatState.shared.value
+                        let appState = appStateGroupDefault.get()
-
+                        startChatAndActivate()
-                        if appState != .stopped {
-                            startChatAndActivate {
                         if appState.inactive && chatModel.chatRunning == true {
                             updateChats()
                             if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
                                 updateCallInvitations()
                             }
                         }
-                            }
+                        doAuthenticate = authenticationExpired()
-                        }
+                        canConnectCall = !(doAuthenticate && prefPerformLA) || unlockedRecently()
                     default:
                         break
                     }
@@ -100,12 +100,12 @@ struct SimpleXApp: App {
         if legacyDatabase, case .documents = dbContainerGroupDefault.get() {
             dbContainerGroupDefault.set(.documents)
             setMigrationState(.offer)
-            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath())*.db")
+            logger.debug("SimpleXApp init: using legacy DB in documents folder: \(getAppDatabasePath(), privacy: .public)*.db")
         } else {
             dbContainerGroupDefault.set(.group)
             setMigrationState(.ready)
-            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath())*.db")
+            logger.debug("SimpleXApp init: using DB in app group container: \(getAppDatabasePath(), privacy: .public)*.db")
-            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not") present")
+            logger.debug("SimpleXApp init: legacy DB\(legacyDatabase ? "" : " not", privacy: .public) present")
         }
     }
 
@@ -115,14 +115,22 @@ struct SimpleXApp: App {
     }
 
     private func authenticationExpired() -> Bool {
-        if let enteredBackgroundAuthenticated = enteredBackgroundAuthenticated {
+        if let enteredBackground = enteredBackground {
             let delay = Double(UserDefaults.standard.integer(forKey: DEFAULT_LA_LOCK_DELAY))
-            return ProcessInfo.processInfo.systemUptime - enteredBackgroundAuthenticated >= delay
+            return ProcessInfo.processInfo.systemUptime - enteredBackground >= delay
         } else {
             return true
         }
     }
 
+    private func unlockedRecently() -> Bool {
+        if let lastSuccessfulUnlock = lastSuccessfulUnlock {
+            return ProcessInfo.processInfo.systemUptime - lastSuccessfulUnlock < 2
+        } else {
+            return false
+        }
+    }
+
     private func updateChats() {
         do {
             let chats = try apiGetChats()

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

@@ -38,21 +38,19 @@ struct ActiveCallView: View {
             }
         }
         .onAppear {
-            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase)), canConnectCall \(canConnectCall)")
+            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase), privacy: .public), canConnectCall \(canConnectCall)")
-            AppDelegate.keepScreenOn(true)
             createWebRTCClient()
             dismissAllSheets()
         }
         .onChange(of: canConnectCall) { _ in
-            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall)")
+            logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall, privacy: .public)")
             createWebRTCClient()
         }
         .onDisappear {
             logger.debug("ActiveCallView: disappear")
-            Task { await m.callCommand.setClient(nil) }
-            AppDelegate.keepScreenOn(false)
             client?.endCall()
         }
+        .onChange(of: m.callCommand) { _ in sendCommandToClient()}
         .background(.black)
         .preferredColorScheme(.dark)
     }
@@ -60,8 +58,19 @@ struct ActiveCallView: View {
     private func createWebRTCClient() {
         if client == nil && canConnectCall {
             client = WebRTCClient($activeCall, { msg in await MainActor.run { processRtcMessage(msg: msg) } }, $localRendererAspectRatio)
+            sendCommandToClient()
+        }
+    }
+
+    private func sendCommandToClient() {
+        if call == m.activeCall,
+           m.activeCall != nil,
+           let client = client,
+           let cmd = m.callCommand {
+            m.callCommand = nil
+            logger.debug("sendCallCommand: \(cmd.cmdType)")
             Task {
-                await m.callCommand.setClient(client)
+                await client.sendCallCommand(command: cmd)
             }
         }
     }
@@ -157,10 +166,8 @@ struct ActiveCallView: View {
                 }
             case let .error(message):
                 logger.debug("ActiveCallView: command error: \(message)")
-                AlertManager.shared.showAlert(Alert(title: Text("Error"), message: Text(message)))
             case let .invalid(type):
                 logger.debug("ActiveCallView: invalid response: \(type)")
-                AlertManager.shared.showAlert(Alert(title: Text("Invalid response"), message: Text(type)))
             }
         }
     }
@@ -246,6 +253,7 @@ struct ActiveCallOverlay: View {
                 HStack {
                     Text(call.encryptionStatus)
                     if let connInfo = call.connectionInfo {
+//                        Text("(") + Text(connInfo.text) + Text(", \(connInfo.protocolText))")
                         Text("(") + Text(connInfo.text) + Text(")")
                     }
                 }

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

@@ -108,6 +108,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             try audioSession.setActive(true)
             logger.debug("audioSession activated")
         } catch {
+            print(error)
             logger.error("failed activating audio session")
         }
     }
@@ -120,6 +121,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             try audioSession.setActive(false)
             logger.debug("audioSession deactivated")
         } catch {
+            print(error)
             logger.error("failed deactivating audio session")
         }
         suspendOnEndCall()
@@ -130,7 +132,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             // The delay allows to accept the second call before suspending a chat
             // see `.onChange(of: scenePhase)` in SimpleXApp
             DispatchQueue.main.asyncAfter(deadline: .now() + 3) { [weak self] in
-                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat))")
+                logger.debug("CallController: shouldSuspendChat \(String(describing: self?.shouldSuspendChat), privacy: .public)")
                 if ChatModel.shared.activeCall == nil && self?.shouldSuspendChat == true {
                     self?.shouldSuspendChat = false
                     suspendChat()
@@ -142,46 +144,33 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     @objc(pushRegistry:didUpdatePushCredentials:forType:)
     func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
-        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue)")
+        logger.debug("CallController: didUpdate push credentials for type \(type.rawValue, privacy: .public)")
     }
 
     func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
-        logger.debug("CallController: did receive push with type \(type.rawValue)")
+        logger.debug("CallController: did receive push with type \(type.rawValue, privacy: .public)")
         if type != .voIP {
             completion()
             return
         }
-        if AppChatState.shared.value == .stopped {
-            self.reportExpiredCall(payload: payload, completion)
-            return
-        }
-        if (!ChatModel.shared.chatInitialized) {
         logger.debug("CallController: initializing chat")
-            do {
+        if (!ChatModel.shared.chatInitialized) {
-                try initializeChat(start: true, refreshInvitations: false)
+            initChatAndMigrate(refreshInvitations: false)
-            } catch let error {
-                logger.error("CallController: initializing chat error: \(error)")
-                self.reportExpiredCall(payload: payload, completion)
-                return
         }
-        }
+        startChatAndActivate()
-        logger.debug("CallController: initialized chat")
+        shouldSuspendChat = true
-        startChatForCall()
-        logger.debug("CallController: started chat")
-        self.shouldSuspendChat = true
         // There are no invitations in the model, as it was processed by NSE
         _ = try? justRefreshCallInvitations()
-        logger.debug("CallController: updated call invitations chat")
         // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
         // Extract the call information from the push notification payload
         let m = ChatModel.shared
         if let contactId = payload.dictionaryPayload["contactId"] as? String,
            let invitation = m.callInvitations[contactId] {
-            let update = self.cxCallUpdate(invitation: invitation)
+            let update = cxCallUpdate(invitation: invitation)
             if let uuid = invitation.callkitUUID {
                 logger.debug("CallController: report pushkit call via CallKit")
-                let update = self.cxCallUpdate(invitation: invitation)
+                let update = cxCallUpdate(invitation: invitation)
-                self.provider.reportNewIncomingCall(with: uuid, update: update) { error in
+                provider.reportNewIncomingCall(with: uuid, update: update) { error in
                     if error != nil {
                         m.callInvitations.removeValue(forKey: contactId)
                     }
@@ -189,10 +178,10 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                     completion()
                 }
             } else {
-                self.reportExpiredCall(update: update, completion)
+                reportExpiredCall(update: update, completion)
             }
         } else {
-            self.reportExpiredCall(payload: payload, completion)
+            reportExpiredCall(payload: payload, completion)
         }
     }
 
@@ -223,7 +212,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     }
 
     func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID))")
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID), privacy: .public)")
         if CallController.useCallKit(), let uuid = invitation.callkitUUID {
             if invitation.callTs.timeIntervalSinceNow >= -180 {
                 let update = cxCallUpdate(invitation: invitation)
@@ -363,7 +352,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     private func requestTransaction(with action: CXAction, onSuccess: @escaping () -> Void = {}) {
         controller.request(CXTransaction(action: action)) { error in
             if let error = error {
-                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription)")
+                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription, privacy: .public)")
             } else {
                 logger.debug("CallController.requestTransaction requested transaction successfully")
                 onSuccess()

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

@@ -22,7 +22,7 @@ class CallManager {
         let m = ChatModel.shared
         if let call = m.activeCall, call.callkitUUID == callUUID {
             m.showCallView = true
-            Task { await m.callCommand.processCommand(.capabilities(media: call.localMedia)) }
+            m.callCommand = .capabilities(media: call.localMedia)
             return true
         }
         return false
@@ -57,21 +57,19 @@ class CallManager {
             m.activeCall = call
             m.showCallView = true
 
-            Task {
+            m.callCommand = .start(
-                await m.callCommand.processCommand(.start(
                 media: invitation.callType.media,
                 aesKey: invitation.sharedKey,
                 iceServers: iceServers,
                 relay: useRelay
-                ))
+            )
-            }
         }
     }
 
     func enableMedia(media: CallMediaType, enable: Bool, callUUID: UUID) -> Bool {
         if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
             let m = ChatModel.shared
-            Task { await m.callCommand.processCommand(.media(media: media, enable: enable)) }
+            m.callCommand = .media(media: media, enable: enable)
             return true
         }
         return false
@@ -96,13 +94,11 @@ class CallManager {
             completed()
         } else {
             logger.debug("CallManager.endCall: ending call...")
-            Task {
+            m.callCommand = .end
-                await m.callCommand.processCommand(.end)
-                await MainActor.run {
             m.activeCall = nil
             m.showCallView = false
             completed()
-                }
+            Task {
                 do {
                     try await apiEndCall(call.contact)
                 } catch {

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

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

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

@@ -18,11 +18,10 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     }()
     private static let ivTagBytes: Int = 28
     private static let enableEncryption: Bool = true
-    private var chat_ctrl = getChatCtrl()
 
     struct Call {
         var connection: RTCPeerConnection
-        var iceCandidates: IceCandidates
+        var iceCandidates: [RTCIceCandidate]
         var localMedia: CallMediaType
         var localCamera: RTCVideoCapturer?
         var localVideoSource: RTCVideoSource?
@@ -34,24 +33,10 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         var frameDecryptor: RTCFrameDecryptor?
     }
 
-    actor IceCandidates {
-        private var candidates: [RTCIceCandidate] = []
-
-        func getAndClear() async -> [RTCIceCandidate] {
-            let cs = candidates
-            candidates = []
-            return cs
-        }
-
-        func append(_ c: RTCIceCandidate) async {
-            candidates.append(c)
-        }
-    }
-
     private let rtcAudioSession =  RTCAudioSession.sharedInstance()
     private let audioQueue = DispatchQueue(label: "audio")
     private var sendCallResponse: (WVAPIMessage) async -> Void
-    var activeCall: Binding<Call?>
+    private var activeCall: Binding<Call?>
     private var localRendererAspectRatio: Binding<CGFloat?>
 
     @available(*, unavailable)
@@ -75,7 +60,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
     ]
 
-    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
+    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ remoteIceCandidates: [RTCIceCandidate], _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
         let connection = createPeerConnection(iceServers ?? getWebRTCIceServers() ?? defaultIceServers, relay)
         connection.delegate = self
         createAudioSender(connection)
@@ -102,7 +87,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         }
         return Call(
             connection: connection,
-            iceCandidates: IceCandidates(),
+            iceCandidates: remoteIceCandidates,
             localMedia: mediaType,
             localCamera: localCamera,
             localVideoSource: localVideoSource,
@@ -159,18 +144,26 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
             logger.debug("starting incoming call - create webrtc session")
             if activeCall.wrappedValue != nil { endCall() }
             let encryption = WebRTCClient.enableEncryption
-            let call = initializeCall(iceServers?.toWebRTCIceServers(), media, encryption ? aesKey : nil, relay)
+            let call = initializeCall(iceServers?.toWebRTCIceServers(), [], media, encryption ? aesKey : nil, relay)
             activeCall.wrappedValue = call
-            let (offer, error) = await call.connection.offer()
+            call.connection.offer { answer in
-            if let offer = offer {
+                Task {
-                resp = .offer(
+                    let gotCandidates = await self.waitWithTimeout(10_000, stepMs: 1000, until: { self.activeCall.wrappedValue?.iceCandidates.count ?? 0 > 0 })
-                    offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: offer.type.toSdpType(), sdp: offer.sdp))),
+                    if gotCandidates {
-                    iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates())),
+                        await self.sendCallResponse(.init(
+                            corrId: nil,
+                            resp: .offer(
+                                offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
+                                iceCandidates: compressToBase64(input: encodeJSON(self.activeCall.wrappedValue?.iceCandidates ?? [])),
                                 capabilities: CallCapabilities(encryption: encryption)
+                            ),
+                            command: command)
                         )
-                self.waitForMoreIceCandidates()
                     } else {
-                resp = .error(message: "offer error: \(error?.localizedDescription ?? "unknown error")")
+                        self.endCall()
+                    }
+                }
+
             }
         case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay):
             if activeCall.wrappedValue != nil {
@@ -179,21 +172,26 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                 resp = .error(message: "accept: encryption is not supported")
             } else if let offer: CustomRTCSessionDescription = decodeJSON(decompressFromBase64(input: offer)),
                       let remoteIceCandidates: [RTCIceCandidate] = decodeJSON(decompressFromBase64(input: iceCandidates)) {
-                let call = initializeCall(iceServers?.toWebRTCIceServers(), media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
+                let call = initializeCall(iceServers?.toWebRTCIceServers(), remoteIceCandidates, media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
                 activeCall.wrappedValue = call
                 let pc = call.connection
                 if let type = offer.type, let sdp = offer.sdp {
                     if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
-                        let (answer, error) = await pc.answer()
+                        pc.answer { answer in
-                        if let answer = answer {
                             self.addIceCandidates(pc, remoteIceCandidates)
-                            resp = .answer(
+//                            Task {
+//                                try? await Task.sleep(nanoseconds: 32_000 * 1000000)
+                            Task {
+                                await self.sendCallResponse(.init(
+                                    corrId: nil,
+                                    resp: .answer(
                                         answer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: answer.type.toSdpType(), sdp: answer.sdp))),
-                                iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates()))
+                                        iceCandidates: compressToBase64(input: encodeJSON(call.iceCandidates))
+                                    ),
+                                    command: command)
                                 )
-                            self.waitForMoreIceCandidates()
+                            }
-                        } else {
+//                            }
-                            resp = .error(message: "answer error: \(error?.localizedDescription ?? "unknown error")")
                         }
                     } else {
                         resp = .error(message: "accept: remote description is not set")
@@ -236,7 +234,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                 resp = .ok
             }
         case .end:
-            // TODO possibly, endCall should be called before returning .ok
             await sendCallResponse(.init(corrId: nil, resp: .ok, command: command))
             endCall()
         }
@@ -245,33 +242,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         }
     }
 
-    func getInitialIceCandidates() async -> [RTCIceCandidate] {
-        await untilIceComplete(timeoutMs: 750, stepMs: 150) {}
-        let candidates = await activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
-        logger.debug("WebRTCClient: sending initial ice candidates: \(candidates.count)")
-        return candidates
-    }
-
-    func waitForMoreIceCandidates() {
-        Task {
-            await untilIceComplete(timeoutMs: 12000, stepMs: 1500) {
-                let candidates = await self.activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
-                if candidates.count > 0 {
-                    logger.debug("WebRTCClient: sending more ice candidates: \(candidates.count)")
-                    await self.sendIceCandidates(candidates)
-                }
-            }
-        }
-    }
-
-    func sendIceCandidates(_ candidates: [RTCIceCandidate]) async {
-        await self.sendCallResponse(.init(
-            corrId: nil,
-            resp: .ice(iceCandidates: compressToBase64(input: encodeJSON(candidates))),
-            command: nil)
-        )
-    }
-
     func enableMedia(_ media: CallMediaType, _ enable: Bool) {
         logger.debug("WebRTCClient: enabling media \(media.rawValue) \(enable)")
         media == .video ? setVideoEnabled(enable) : setAudioEnabled(enable)
@@ -309,7 +279,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
             memcpy(pointer, (unencrypted as NSData).bytes, unencrypted.count)
             let isKeyFrame = unencrypted[0] & 1 == 0
             let clearTextBytesSize = mediaType.rawValue == 0 ? 1 : isKeyFrame ? 10 : 3
-            logCrypto("encrypt", chat_encrypt_media(chat_ctrl, &key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
+            logCrypto("encrypt", chat_encrypt_media(&key, pointer.advanced(by: clearTextBytesSize), Int32(unencrypted.count + WebRTCClient.ivTagBytes - clearTextBytesSize)))
             return Data(bytes: pointer, count: unencrypted.count + WebRTCClient.ivTagBytes)
         } else {
             return nil
@@ -417,13 +387,12 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         audioSessionToDefaults()
     }
 
-    func untilIceComplete(timeoutMs: UInt64, stepMs: UInt64, action: @escaping () async -> Void) async {
+    func waitWithTimeout(_ timeoutMs: UInt64, stepMs: UInt64, until success: () -> Bool) async -> Bool {
-        var t: UInt64 = 0
+        let startedAt = DispatchTime.now()
-        repeat {
+        while !success() && startedAt.uptimeNanoseconds + timeoutMs * 1000000 > DispatchTime.now().uptimeNanoseconds {
-            _ = try? await Task.sleep(nanoseconds: stepMs * 1000000)
+            guard let _ = try? await Task.sleep(nanoseconds: stepMs * 1000000) else { break }
-            t += stepMs
+        }
-            await action()
+        return success()
-        } while t < timeoutMs && activeCall.wrappedValue?.connection.iceGatheringState != .complete
     }
 }
 
@@ -436,33 +405,25 @@ extension WebRTC.RTCPeerConnection {
             optionalConstraints: nil)
     }
 
-    func offer() async -> (RTCSessionDescription?, Error?) {
+    func offer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void) {
-        await withCheckedContinuation { cont in
         offer(for: mediaConstraints()) { (sdp, error) in
-                self.processSDP(cont, sdp, error)
+            guard let sdp = sdp else {
+                return
             }
-        }
-    }
-
-    func answer() async -> (RTCSessionDescription?, Error?)  {
-        await withCheckedContinuation { cont in
-            answer(for: mediaConstraints()) { (sdp, error) in
-                self.processSDP(cont, sdp, error)
-            }
-        }
-    }
-
-    private func processSDP(_ cont: CheckedContinuation<(RTCSessionDescription?, Error?), Never>, _ sdp: RTCSessionDescription?, _ error: Error?) {
-        if let sdp = sdp {
             self.setLocalDescription(sdp, completionHandler: { (error) in
-                if let error = error {
+                completion(sdp)
-                    cont.resume(returning: (nil, error))
+            })
-                } else {
+        }
-                    cont.resume(returning: (sdp, nil))
+    }
-                }
+
+    func answer(_ completion: @escaping (_ sdp: RTCSessionDescription) -> Void)  {
+        answer(for: mediaConstraints()) { (sdp, error) in
+            guard let sdp = sdp else {
+                return
+            }
+            self.setLocalDescription(sdp, completionHandler: { (error) in
+                completion(sdp)
             })
-        } else {
-            cont.resume(returning: (nil, error))
         }
     }
 }
@@ -518,7 +479,6 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                 default: enableSpeaker = false
                 }
                 setSpeakerEnabledAndConfigureSession(enableSpeaker)
-            case .connected: sendConnectedEvent(connection)
             case .disconnected, .failed: endCall()
             default: do {}
             }
@@ -531,9 +491,7 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
 
     func peerConnection(_ connection: RTCPeerConnection, didGenerate candidate: WebRTC.RTCIceCandidate) {
 //        logger.debug("Connection generated candidate \(candidate.debugDescription)")
-        Task {
+        activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil, nil))
-            await self.activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil))
-        }
     }
 
     func peerConnection(_ connection: RTCPeerConnection, didRemove candidates: [WebRTC.RTCIceCandidate]) {
@@ -548,9 +506,10 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                         lastReceivedMs lastDataReceivedMs: Int32,
                         changeReason reason: String) {
 //        logger.debug("Connection changed candidate \(reason) \(remote.debugDescription) \(remote.description)")
+        sendConnectedEvent(connection, local: local, remote: remote)
     }
 
-    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection) {
+    func sendConnectedEvent(_ connection: WebRTC.RTCPeerConnection, local: WebRTC.RTCIceCandidate, remote: WebRTC.RTCIceCandidate) {
         connection.statistics { (stats: RTCStatisticsReport) in
             stats.statistics.values.forEach { stat in
 //                logger.debug("Stat \(stat.debugDescription)")
@@ -558,25 +517,24 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
                    let localId = stat.values["localCandidateId"] as? String,
                    let remoteId = stat.values["remoteCandidateId"] as? String,
                    let localStats = stats.statistics[localId],
-                   let remoteStats = stats.statistics[remoteId]
+                   let remoteStats = stats.statistics[remoteId],
+                   local.sdp.contains("\((localStats.values["ip"] as? String ?? "--")) \((localStats.values["port"] as? String ?? "--"))") &&
+                   remote.sdp.contains("\((remoteStats.values["ip"] as? String ?? "--")) \((remoteStats.values["port"] as? String ?? "--"))")
                 {
                     Task {
                         await self.sendCallResponse(.init(
                             corrId: nil,
                             resp: .connected(connectionInfo: ConnectionInfo(
-                                localCandidate: RTCIceCandidate(
+                                localCandidate: local.toCandidate(
-                                    candidateType: RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
+                                    RTCIceCandidateType.init(rawValue: localStats.values["candidateType"] as! String),
-                                    protocol: localStats.values["protocol"] as? String,
+                                    localStats.values["protocol"] as? String,
-                                    sdpMid: nil,
+                                    localStats.values["relayProtocol"] as? String
-                                    sdpMLineIndex: nil,
-                                    candidate: ""
                                 ),
-                                remoteCandidate: RTCIceCandidate(
+                                remoteCandidate: remote.toCandidate(
-                                    candidateType: RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
+                                    RTCIceCandidateType.init(rawValue: remoteStats.values["candidateType"] as! String),
-                                    protocol: remoteStats.values["protocol"] as? String,
+                                    remoteStats.values["protocol"] as? String,
-                                    sdpMid: nil,
+                                    remoteStats.values["relayProtocol"] as? String
-                                    sdpMLineIndex: nil,
+                                ))),
-                                    candidate: ""))),
                             command: nil)
                         )
                     }
@@ -676,10 +634,11 @@ extension RTCIceCandidate {
 }
 
 extension WebRTC.RTCIceCandidate {
-    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?) -> RTCIceCandidate {
+    func toCandidate(_ candidateType: RTCIceCandidateType?, _ protocol: String?, _ relayProtocol: String?) -> RTCIceCandidate {
         RTCIceCandidate(
             candidateType: candidateType,
             protocol: `protocol`,
+            relayProtocol: relayProtocol,
             sdpMid: sdpMid,
             sdpMLineIndex: Int(sdpMLineIndex),
             candidate: sdp

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,6 +114,7 @@ struct ChatInfoView: View {
 
         var id: String {
             switch self {
+            case .deleteContactAlert: return "deleteContactAlert"
             case .clearChatAlert: return "clearChatAlert"
             case .networkStatusAlert: return "networkStatusAlert"
             case .switchAddressAlert: return "switchAddressAlert"
@@ -163,13 +164,13 @@ struct ChatInfoView: View {
 //                        synchronizeConnectionButtonForce()
 //                    }
                 }
-                .disabled(!contact.ready || !contact.active)
+                .disabled(!contact.ready)
 
                 if let contactLink = contact.contactLink {
                     Section {
-                        SimpleXLinkQRCode(uri: contactLink)
+                        QRCode(uri: contactLink)
                         Button {
-                            showShareSheet(items: [simplexChatLink(contactLink)])
+                            showShareSheet(items: [contactLink])
                         } label: {
                             Label("Share address", systemImage: "square.and.arrow.up")
                         }
@@ -180,7 +181,7 @@ struct ChatInfoView: View {
                     }
                 }
 
-                if contact.ready && contact.active {
+                if contact.ready {
                     Section("Servers") {
                         networkStatusRow()
                             .onTapGesture {
@@ -191,7 +192,8 @@ struct ChatInfoView: View {
                                 alert = .switchAddressAlert
                             }
                             .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                                !contact.ready
+                                || connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                                 || connStats.ratchetSyncSendProhibited
                             )
                             if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
@@ -232,6 +234,7 @@ 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)
@@ -240,26 +243,6 @@ 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 {
@@ -338,7 +321,7 @@ struct ChatInfoView: View {
                 verify: { code in
                     if let r = apiVerifyContact(chat.chatInfo.apiId, connectionCode: code) {
                         let (verified, existingCode) = r
-                        contact.activeConn?.connectionCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
+                        contact.activeConn.connectionCode = verified ? SecurityCode(securityCode: existingCode, verifiedAt: .now) : nil
                         connectionCode = existingCode
                         DispatchQueue.main.async {
                             chat.chatInfo = .direct(contact: contact)
@@ -432,7 +415,7 @@ struct ChatInfoView: View {
 
     private func deleteContactButton() -> some View {
         Button(role: .destructive) {
-            showDeleteContactActionSheet = true
+            alert = .deleteContactAlert
         } label: {
             Label("Delete contact", systemImage: "trash")
                 .foregroundColor(Color.red)
@@ -448,10 +431,14 @@ struct ChatInfoView: View {
         }
     }
 
-    private func deleteContact(notify: Bool? = nil) {
+    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, notify: notify)
+                        try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
                         await MainActor.run {
                             dismiss()
                             chatModel.chatId = nil
@@ -465,6 +452,9 @@ struct ChatInfoView: View {
                         }
                     }
                 }
+            },
+            secondaryButton: .cancel()
+        )
     }
 
     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
-    @ObservedObject var chat: Chat
+    var chatInfo: ChatInfo
     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) = chat.chatInfo {
+        if case let .direct(contact) = chatInfo {
             Button {
                 if let invitation = m.callInvitations[contact.id] {
                     CallController.shared.answerCall(invitation: invitation)

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

@@ -10,92 +10,20 @@ 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(.horizontal, 6)
+        .padding(.leading, 6)
-        .padding(.vertical, 4)
+        .padding(.bottom, 6)
         .textSelection(.disabled)
     }
 }
@@ -103,6 +31,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), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
+        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
     }
 }

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

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

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

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

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIFileView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     let file: CIFile?
     let edited: Bool
@@ -52,7 +51,7 @@ struct CIFileView: View {
     private var itemInteractive: Bool {
         if let file = file {
             switch (file.fileStatus) {
-            case .sndStored: return file.fileProtocol == .local
+            case .sndStored: return false
             case .sndTransfer: return false
             case .sndComplete: return false
             case .sndCancelled: return false
@@ -84,8 +83,9 @@ struct CIFileView: View {
                 if fileSizeValid() {
                     Task {
                         logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
-                        if let user = m.currentUser {
+                        if let user = ChatModel.shared.currentUser {
-                            await receiveFile(user: user, fileId: file.fileId)
+                            let encrypted = privacyEncryptLocalFilesGroupDefault.get()
+                            await receiveFile(user: user, fileId: file.fileId, encrypted: encrypted)
                         }
                     }
                 } else {
@@ -107,18 +107,12 @@ struct CIFileView: View {
                         title: "Waiting for file",
                         message: "File will be received when your contact is online, please wait or check later!"
                     )
-                case .local: ()
                 }
             case .rcvComplete:
                 logger.debug("CIFileView fileAction - in .rcvComplete")
                 if let fileSource = getLoadedFileSource(file) {
                     saveCryptoFile(fileSource)
                 }
-            case .sndStored:
-                logger.debug("CIFileView fileAction - in .sndStored")
-                if file.fileProtocol == .local, let fileSource = getLoadedFileSource(file) {
-                    saveCryptoFile(fileSource)
-                }
             default: break
             }
         }
@@ -131,13 +125,11 @@ struct CIFileView: View {
                 switch file.fileProtocol {
                 case .xftp: progressView()
                 case .smp: fileIcon("doc.fill")
-                case .local: fileIcon("doc.fill")
                 }
             case let .sndTransfer(sndProgress, sndTotal):
                 switch file.fileProtocol {
                 case .xftp: progressCircle(sndProgress, sndTotal)
                 case .smp: progressView()
-                case .local: EmptyView()
                 }
             case .sndComplete: fileIcon("doc.fill", innerIcon: "checkmark", innerIconSize: 10)
             case .sndCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
@@ -242,17 +234,18 @@ struct CIFileView_Previews: PreviewProvider {
             file: nil
         )
         Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentFile, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentFile, revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(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(chat: Chat.sampleData, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
         }
         .previewLayout(.fixed(width: 360, height: 360))
+        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -17,13 +17,10 @@ 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) {
-            ZStack {
             VStack(alignment: .leading) {
                 groupInfoView(action)
                 .padding(.horizontal, 2)
@@ -34,15 +31,13 @@ struct CIGroupInvitationView: View {
                 Divider().frame(width: frameWidth)
 
                 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)
+                        .foregroundColor(chatIncognito ? .indigo : .accentColor)
                         .font(.callout)
                         .padding(.trailing, 60)
                         .overlay(DetermineWidth())
-                        }
                 } else {
                     groupInvitationText()
                         .padding(.trailing, 60)
@@ -50,12 +45,6 @@ struct CIGroupInvitationView: View {
                 }
             }
             .padding(.bottom, 2)
-
-                if progressByTimeout {
-                    ProgressView().scaleEffect(2)
-                }
-            }
-
             chatItem.timestampText
                 .font(.caption)
                 .foregroundColor(.secondary)
@@ -66,24 +55,11 @@ 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 {
-                inProgress = true
+                joinGroup(groupInvitation.groupId)
-                joinGroup(groupInvitation.groupId) {
-                    await MainActor.run { inProgress = false }
             }
-            }
-            .disabled(inProgress)
         } else {
             v
         }
@@ -91,7 +67,7 @@ struct CIGroupInvitationView: View {
 
     private func groupInfoView(_ action: Bool) -> some View {
         var color: Color
-        if action && !inProgress {
+        if action {
             color = chatIncognito ? .indigo : .accentColor
         } else {
             color = Color(uiColor: .tertiaryLabel)

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIImageView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     let chatItem: ChatItem
     let image: String
@@ -37,8 +36,8 @@ struct CIImageView: View {
                             switch file.fileStatus {
                             case .rcvInvitation:
                                 Task {
-                                    if let user = m.currentUser {
+                                    if let user = ChatModel.shared.currentUser {
-                                        await receiveFile(user: user, fileId: file.fileId)
+                                        await receiveFile(user: user, fileId: file.fileId, encrypted: chatItem.encryptLocalFile)
                                     }
                                 }
                             case .rcvAccepted:
@@ -53,7 +52,6 @@ struct CIImageView: View {
                                         title: "Waiting for image",
                                         message: "Image will be received when your contact is online, please wait or check later!"
                                     )
-                                case .local: ()
                                 }
                             case .rcvTransfer: () // ?
                             case .rcvComplete: () // ?
@@ -91,7 +89,6 @@ struct CIImageView: View {
                 switch file.fileProtocol {
                 case .xftp: progressView()
                 case .smp: EmptyView()
-                case .local: EmptyView()
                 }
             case .sndTransfer: progressView()
             case .sndComplete: fileIcon("checkmark", 10, 13)

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIMemberCreatedContactView: View {
-    @EnvironmentObject var m: ChatModel
     var chatItem: ChatItem
     
     var body: some View {
@@ -22,7 +21,7 @@ struct CIMemberCreatedContactView: View {
                         .onTapGesture {
                             dismissAllSheets(animated: true)
                             DispatchQueue.main.async {
-                                m.chatId = "@\(contactId)"
+                                ChatModel.shared.chatId = "@\(contactId)"
                             }
                         }
                 } else {

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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct CIMetaView: View {
-    @ObservedObject var chat: Chat
+    @EnvironmentObject var chat: Chat
     var chatItem: ChatItem
     var metaColor = Color.secondary
     var paleMetaColor = Color(UIColor.tertiaryLabel)
@@ -95,14 +95,15 @@ private func statusIconText(_ icon: String, _ color: Color) -> Text {
 struct CIMetaView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
+            CIMetaView(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(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(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(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(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(chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
+            CIMetaView(chatItem: ChatItem.getDeletedContentSample())
         }
         .previewLayout(.fixed(width: 360, height: 100))
+        .environmentObject(Chat.sampleData)
     }
 }

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

@@ -12,8 +12,7 @@ import SimpleXChat
 let decryptErrorReason: LocalizedStringKey = "It can happen when you or your connection used the old database backup."
 
 struct CIRcvDecryptionError: View {
-    @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var chat: Chat
-    @ObservedObject var chat: Chat
     var msgDecryptError: MsgDecryptError
     var msgCount: UInt32
     var chatItem: ChatItem
@@ -46,7 +45,7 @@ struct CIRcvDecryptionError: View {
                     do {
                         let (member, stats) = try apiGroupMemberInfo(groupInfo.apiId, groupMember.groupMemberId)
                         if let s = stats {
-                            m.updateGroupMemberConnectionStats(groupInfo, member, s)
+                            ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, member, s)
                         }
                     } catch let error {
                         logger.error("apiGroupMemberInfo error: \(responseError(error))")
@@ -66,7 +65,7 @@ struct CIRcvDecryptionError: View {
 
     @ViewBuilder private func viewBody() -> some View {
         if case let .direct(contact) = chat.chatInfo,
-           let contactStats = contact.activeConn?.connectionStats {
+           let contactStats = contact.activeConn.connectionStats {
             if contactStats.ratchetSyncAllowed {
                 decryptionErrorItemFixButton(syncSupported: true) {
                     alert = .syncAllowedAlert { syncContactConnection(contact) }
@@ -80,8 +79,8 @@ struct CIRcvDecryptionError: View {
             }
         } else if case let .group(groupInfo) = chat.chatInfo,
                   case let .groupRcv(groupMember) = chatItem.chatDir,
-                  let mem = m.getGroupMember(groupMember.groupMemberId),
+                  let modelMember = ChatModel.shared.groupMembers.first(where: { $0.id == groupMember.id }),
-                  let memberStats = mem.wrapped.activeConn?.connectionStats {
+                  let memberStats = modelMember.activeConn?.connectionStats {
             if memberStats.ratchetSyncAllowed {
                 decryptionErrorItemFixButton(syncSupported: true) {
                     alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
@@ -123,7 +122,7 @@ struct CIRcvDecryptionError: View {
                 )
             }
             .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
@@ -143,7 +142,7 @@ struct CIRcvDecryptionError: View {
                 + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
             }
             .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem)
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
@@ -165,8 +164,6 @@ struct CIRcvDecryptionError: View {
             message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
         case .other:
             message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
-        case .ratchetSync:
-            message = Text("Encryption re-negotiation failed.")
         }
         return message
     }
@@ -176,7 +173,7 @@ struct CIRcvDecryptionError: View {
             do {
                 let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, false)
                 await MainActor.run {
-                    m.updateGroupMemberConnectionStats(groupInfo, mem, stats)
+                    ChatModel.shared.updateGroupMemberConnectionStats(groupInfo, mem, stats)
                 }
             } catch let error {
                 logger.error("syncMemberConnection apiSyncGroupMemberRatchet error: \(responseError(error))")
@@ -193,7 +190,7 @@ struct CIRcvDecryptionError: View {
             do {
                 let stats = try apiSyncContactRatchet(contact.apiId, false)
                 await MainActor.run {
-                    m.updateContactConnectionStats(contact, stats)
+                    ChatModel.shared.updateContactConnectionStats(contact, stats)
                 }
             } catch let error {
                 logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")

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

@@ -9,10 +9,8 @@
 import SwiftUI
 import AVKit
 import SimpleXChat
-import Combine
 
 struct CIVideoView: View {
-    @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     private let chatItem: ChatItem
     private let image: String
@@ -26,12 +24,9 @@ struct CIVideoView: View {
     @State private var player: AVPlayer?
     @State private var fullPlayer: AVPlayer?
     @State private var url: URL?
-    @State private var urlDecrypted: URL?
-    @State private var decryptionInProgress: Bool = false
     @State private var showFullScreenPlayer = false
     @State private var timeObserver: Any? = nil
     @State private var fullScreenTimeObserver: Any? = nil
-    @State private var publisher: AnyCancellable? = nil
 
     init(chatItem: ChatItem, image: String, duration: Int, maxWidth: CGFloat, videoWidth: Binding<CGFloat?>, scrollProxy: ScrollViewProxy?) {
         self.chatItem = chatItem
@@ -41,12 +36,8 @@ struct CIVideoView: View {
         self._videoWidth = videoWidth
         self.scrollProxy = scrollProxy
         if let url = getLoadedVideo(chatItem.file) {
-            let decrypted = chatItem.file?.fileSource?.cryptoArgs == nil ? url : chatItem.file?.fileSource?.decryptedGet()
+            self._player = State(initialValue: VideoPlayerView.getOrCreatePlayer(url, false))
-            self._urlDecrypted = State(initialValue: decrypted)
+            self._fullPlayer = State(initialValue: AVPlayer(url: url))
-            if let decrypted = decrypted {
-                self._player = State(initialValue: VideoPlayerView.getOrCreatePlayer(decrypted, false))
-                self._fullPlayer = State(initialValue: AVPlayer(url: decrypted))
-            }
             self._url = State(initialValue: url)
         }
         if let data = Data(base64Encoded: dropImagePrefix(image)),
@@ -59,10 +50,8 @@ struct CIVideoView: View {
         let file = chatItem.file
         ZStack {
             ZStack(alignment: .topLeading) {
-                if let file = file, let preview = preview, let player = player, let decrypted = urlDecrypted {
+                if let file = file, let preview = preview, let player = player, let url = url {
-                    videoView(player, decrypted, file, preview, duration)
+                    videoView(player, url, file, preview, duration)
-                } else if let file = file, let defaultPreview = preview, file.loaded && urlDecrypted == nil {
-                    videoViewEncrypted(file, defaultPreview, duration)
                 } else if let data = Data(base64Encoded: dropImagePrefix(image)),
                           let uiImage = UIImage(data: data) {
                     imageView(uiImage)
@@ -70,7 +59,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 +72,6 @@ struct CIVideoView: View {
                                         title: "Waiting for video",
                                         message: "Video will be received when your contact is online, please wait or check later!"
                                     )
-                                case .local: ()
                                 }
                             case .rcvTransfer: () // ?
                             case .rcvComplete: () // ?
@@ -97,7 +85,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")
                 }
@@ -105,49 +93,15 @@ struct CIVideoView: View {
         }
     }
 
-    private func videoViewEncrypted(_ file: CIFile, _ defaultPreview: UIImage, _ duration: Int) -> some View {
-        return ZStack(alignment: .topTrailing) {
-            ZStack(alignment: .center) {
-                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
-                imageView(defaultPreview)
-                .fullScreenCover(isPresented: $showFullScreenPlayer) {
-                    if let decrypted = urlDecrypted {
-                        fullScreenPlayer(decrypted)
-                    }
-                }
-                .onTapGesture {
-                    decrypt(file: file) {
-                        showFullScreenPlayer = urlDecrypted != nil
-                    }
-                }
-                if !decryptionInProgress {
-                    Button {
-                        decrypt(file: file) {
-                            if let decrypted = urlDecrypted {
-                                videoPlaying = true
-                                player?.play()
-                            }
-                        }
-                    } label: {
-                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
-                    }
-                    .disabled(!canBePlayed)
-                } else {
-                    videoDecryptionProgress()
-                }
-            }
-        }
-    }
-
     private func videoView(_ player: AVPlayer, _ url: URL, _ file: CIFile, _ preview: UIImage, _ duration: Int) -> some View {
         let w = preview.size.width <= preview.size.height ? maxWidth * 0.75 : maxWidth
         DispatchQueue.main.async { videoWidth = w }
         return ZStack(alignment: .topTrailing) {
             ZStack(alignment: .center) {
-                let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
+                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: m.stopPreviousRecPlay) { playingUrl in
+                .onChange(of: ChatModel.shared.stopPreviousRecPlay) { playingUrl in
                     if playingUrl != url {
                         player.pause()
                         videoPlaying = false
@@ -170,7 +124,7 @@ struct CIVideoView: View {
                 }
                 if !videoPlaying {
                     Button {
-                        m.stopPreviousRecPlay = url
+                        ChatModel.shared.stopPreviousRecPlay = url
                         player.play()
                     } label: {
                         playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
@@ -202,16 +156,6 @@ struct CIVideoView: View {
         .clipShape(Circle())
     }
 
-    private func videoDecryptionProgress(_ color: Color = .white) -> some View {
-        ProgressView()
-            .progressViewStyle(.circular)
-            .frame(width: 12, height: 12)
-            .tint(color)
-            .frame(width: 40, height: 40)
-            .background(Color.black.opacity(0.35))
-            .clipShape(Circle())
-    }
-
     private func durationProgress() -> some View {
         HStack {
             Text("\(durationText(videoPlaying ? progress : duration))")
@@ -255,13 +199,11 @@ struct CIVideoView: View {
                 switch file.fileProtocol {
                 case .xftp: progressView()
                 case .smp: EmptyView()
-                case .local: EmptyView()
                 }
             case let .sndTransfer(sndProgress, sndTotal):
                 switch file.fileProtocol {
                 case .xftp: progressCircle(sndProgress, sndTotal)
                 case .smp: progressView()
-                case .local: EmptyView()
                 }
             case .sndComplete: fileIcon("checkmark", 10, 13)
             case .sndCancelled: fileIcon("xmark", 10, 13)
@@ -312,10 +254,10 @@ struct CIVideoView: View {
     }
 
     // TODO encrypt: where file size is checked?
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, encrypted: Bool, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
         Task {
-            if let user = m.currentUser {
+            if let user = ChatModel.shared.currentUser {
-                await receiveFile(user, file.fileId, false)
+                await receiveFile(user, file.fileId, encrypted, false)
             }
         }
     }
@@ -348,17 +290,9 @@ struct CIVideoView: View {
             )
             .onAppear {
                 DispatchQueue.main.asyncAfter(deadline: .now()) {
-                    m.stopPreviousRecPlay = url
+                    ChatModel.shared.stopPreviousRecPlay = url
                     if let player = fullPlayer {
                         player.play()
-                        var played = false
-                        publisher = player.publisher(for: \.timeControlStatus).sink { status in
-                            if played || status == .playing {
-                                AppDelegate.keepScreenOn(status == .playing)
-                                AudioPlayer.changeAudioSession(status == .playing)
-                            }
-                            played = status == .playing
-                        }
                         fullScreenTimeObserver = NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { _ in
                             player.seek(to: CMTime.zero)
                             player.play()
@@ -373,23 +307,6 @@ struct CIVideoView: View {
                 fullScreenTimeObserver = nil
                 fullPlayer?.pause()
                 fullPlayer?.seek(to: CMTime.zero)
-                publisher?.cancel()
-            }
-        }
-    }
-
-    private func decrypt(file: CIFile, completed: (() -> Void)? = nil) {
-        if decryptionInProgress { return }
-        decryptionInProgress = true
-        Task {
-            urlDecrypted = await file.fileSource?.decryptedGetOrCreate(&ChatModel.shared.filesToDelete)
-            await MainActor.run {
-                if let decrypted = urlDecrypted {
-                    player = VideoPlayerView.getOrCreatePlayer(decrypted, false)
-                    fullPlayer = AVPlayer(url: decrypted)
-                }
-                decryptionInProgress = true
-                completed?()
             }
         }
     }

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct CIVoiceView: View {
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     let recordingFile: CIFile?
     let duration: Int
@@ -92,7 +91,7 @@ struct CIVoiceView: View {
     }
 
     private func metaView() -> some View {
-        CIMetaView(chat: chat, chatItem: chatItem)
+        CIMetaView(chatItem: chatItem)
     }
 }
 
@@ -220,8 +219,8 @@ struct VoiceMessagePlayer: View {
     private func downloadButton(_ recordingFile: CIFile) -> some View {
         Button {
             Task {
-                if let user = chatModel.currentUser {
+                if let user = ChatModel.shared.currentUser {
-                    await receiveFile(user: user, fileId: recordingFile.fileId)
+                    await receiveFile(user: user, fileId: recordingFile.fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get())
                 }
             }
         } label: {
@@ -285,7 +284,6 @@ struct CIVoiceView_Previews: PreviewProvider {
         )
         Group {
             CIVoiceView(
-                chat: Chat.sampleData,
                 chatItem: ChatItem.getVoiceMsgContentSample(),
                 recordingFile: CIFile.getSample(fileName: "voice.m4a", fileSize: 65536, fileStatus: .rcvComplete),
                 duration: 30,
@@ -294,11 +292,12 @@ struct CIVoiceView_Previews: PreviewProvider {
                 playbackTime: .constant(TimeInterval(20)),
                 allowMenu: Binding.constant(true)
             )
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(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(chat: Chat.sampleData, chatItem: voiceMessageWtFile, 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))
         }
         .previewLayout(.fixed(width: 360, height: 360))
+        .environmentObject(Chat.sampleData)
     }
 }

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

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

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

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

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

@@ -88,12 +88,13 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
             file: CIFile.getSample(fileStatus: .sndComplete)
         )
         Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(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(chat: Chat.sampleData, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, 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 {
-            m.stopPreviousRecPlay = url
+            ChatModel.shared.stopPreviousRecPlay = url
             player.play()
         }
     }

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

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

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

@@ -10,77 +10,39 @@ 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 {
-        (Text(mergedMarkedDeletedText).italic() + Text(" ") + chatItem.timestampText)
+        HStack(alignment: .bottom, spacing: 0) {
-        .font(.caption)
+            if case let .moderated(_, byGroupMember) = chatItem.meta.itemDeleted {
-        .foregroundColor(.secondary)
+                markedDeletedText("moderated by \(byGroupMember.chatViewName)")
+            } else {
+                markedDeletedText("marked deleted")
+            }
+            CIMetaView(chatItem: chatItem)
                 .padding(.horizontal, 12)
+        }
+        .padding(.leading, 12)
         .padding(.vertical, 6)
         .background(chatItemFrameColor(chatItem, colorScheme))
         .cornerRadius(18)
         .textSelection(.disabled)
     }
 
-    var mergedMarkedDeletedText: LocalizedStringKey {
+    func markedDeletedText(_ s: LocalizedStringKey) -> some View {
-        if !revealed,
+        Text(s)
-           let ciCategory = chatItem.mergeCategory,
+            .font(.caption)
-           var i = m.getChatItemIndex(chatItem) {
+            .foregroundColor(.secondary)
-            var moderated = 0
+            .italic()
-            var blocked = 0
+            .lineLimit(1)
-            var blockedByAdmin = 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 .blockedByAdmin: blockedByAdmin += 1
-                case .deleted: deleted += 1
-                }
-                i += 1
-            }
-            let total = moderated + blocked + blockedByAdmin + deleted
-            return total <= 1
-            ? markedDeletedText
-            : total == moderated
-            ? "\(total) messages moderated by \(moderatedBy.joined(separator: ", "))"
-            : total == blockedByAdmin
-            ? "\(total) messages blocked by admin"
-            : total == blocked + blockedByAdmin
-            ? "\(total) messages blocked"
-            : "\(total) messages marked deleted"
-        } else {
-            return markedDeletedText
-        }
-    }
-
-    // same texts are in markedDeletedText in ChatPreviewView, but it returns String;
-    // can be refactored into a single function if functions calling these are changed to return same type
-    var markedDeletedText: LocalizedStringKey {
-        switch chatItem.meta.itemDeleted {
-        case let .moderated(_, byGroupMember): "moderated by \(byGroupMember.displayName)"
-        case .blocked: "blocked"
-        case .blockedByAdmin: "blocked by admin"
-        case .deleted, nil: "marked deleted"
-        }
     }
 }
 
 struct MarkedDeletedItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            MarkedDeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(true))
+            MarkedDeletedItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -9,7 +9,7 @@
 import SwiftUI
 import SimpleXChat
 
-let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
+private let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
 
 private let noTyping = Text("   ")
 
@@ -25,13 +25,12 @@ private func typing(_ w: Font.Weight = .light) -> Text {
 }
 
 struct MsgContentView: View {
-    @ObservedObject var chat: Chat
+    @EnvironmentObject var chat: Chat
     var text: String
     var formattedText: [FormattedText]? = nil
     var sender: String? = nil
     var meta: CIMeta? = nil
     var rightToLeft = false
-    var showSecrets: Bool
     @State private var typingIdx = 0
     @State private var timer: Timer?
 
@@ -63,7 +62,7 @@ struct MsgContentView: View {
     }
 
     private func msgContentView() -> Text {
-        var v = messageText(text, formattedText, sender, showSecrets: showSecrets)
+        var v = messageText(text, formattedText, sender)
         if let mt = meta {
             if mt.isLive {
                 v = v + typingIndicator(mt.recent)
@@ -85,14 +84,14 @@ struct MsgContentView: View {
     }
 }
 
-func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false, showSecrets: Bool) -> Text {
+func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false) -> Text {
     let s = text
     var res: Text
     if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
-        res = formatText(ft[0], preview, showSecret: showSecrets)
+        res = formatText(ft[0], preview)
         var i = 1
         while i < ft.count {
-            res = res + formatText(ft[i], preview, showSecret: showSecrets)
+            res = res + formatText(ft[i], preview)
             i = i + 1
         }
     } else {
@@ -111,7 +110,7 @@ func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: St
     }
 }
 
-private func formatText(_ ft: FormattedText, _ preview: Bool, showSecret: Bool) -> Text {
+private func formatText(_ ft: FormattedText, _ preview: Bool) -> Text {
     let t = ft.text
     if let f = ft.format {
         switch (f) {
@@ -119,20 +118,16 @@ private func formatText(_ ft: FormattedText, _ preview: Bool, showSecret: Bool)
         case .italic: return Text(t).italic()
         case .strikeThrough: return Text(t).strikethrough()
         case .snippet: return Text(t).font(.body.monospaced())
-        case .secret: return
+        case .secret: return Text(t).foregroundColor(.clear).underline(color: .primary)
-            showSecret
-            ? Text(t)
-            : Text(AttributedString(t, attributes: AttributeContainer([
-                .foregroundColor: UIColor.clear as Any,
-                .backgroundColor: UIColor.secondarySystemFill as Any
-            ])))
         case let .colored(color): return Text(t).foregroundColor(color.uiColor)
         case .uri: return linkText(t, t, preview, prefix: "")
-        case let .simplexLink(linkType, simplexUri, smpHosts):
+        case let .simplexLink(linkType, simplexUri, trustedUri, 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 linkText(t, simplexUri, preview, prefix: "")
+            case .browser: return trustedUri
+                                    ? linkText(t, t, preview, prefix: "")
+                                    : linkText(t, t, preview, prefix: "", color: .red, uiColor: .red)
             }
         case .email: return linkText(t, t, preview, prefix: "mailto:")
         case .phone: return linkText(t, t.replacingOccurrences(of: " ", with: ""), preview, prefix: "tel:")
@@ -151,7 +146,7 @@ private func linkText(_ s: String, _ link: String, _ preview: Bool, prefix: Stri
     ]))).underline()
 }
 
-func simplexLinkText(_ linkType: SimplexLinkType, _ smpHosts: [String]) -> String {
+private func simplexLinkText(_ linkType: SimplexLinkType, _ smpHosts: [String]) -> String {
     linkType.description + " " + "(via \(smpHosts.first ?? "?"))"
 }
 
@@ -159,12 +154,10 @@ 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,
-            meta: chatItem.meta,
+            meta: chatItem.meta
-            showSecrets: false
         )
         .environmentObject(Chat.sampleData)
     }

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatItemInfoView: View {
-    @EnvironmentObject var chatModel: ChatModel
     @Environment(\.colorScheme) var colorScheme
     var ci: ChatItem
     @Binding var chatItemInfo: ChatItemInfo?
@@ -53,9 +52,7 @@ struct ChatItemInfoView: View {
     }
 
     private var title: String {
-        ci.localNote
+        ci.chatDir.sent
-        ? NSLocalizedString("Saved message", comment: "message info title")
-        : ci.chatDir.sent
         ? NSLocalizedString("Sent message", comment: "message info title")
         : NSLocalizedString("Received message", comment: "message info title")
     }
@@ -112,11 +109,7 @@ struct ChatItemInfoView: View {
                 .bold()
                 .padding(.bottom)
 
-            if ci.localNote {
-                infoRow("Created at", localTimestamp(meta.itemTs))
-            } else {
             infoRow("Sent at", localTimestamp(meta.itemTs))
-            }
             if !ci.chatDir.sent {
                 infoRow("Received at", localTimestamp(meta.createdAt))
             }
@@ -174,6 +167,7 @@ struct ChatItemInfoView: View {
     @ViewBuilder private func itemVersionView(_ itemVersion: ChatItemVersion, _ maxWidth: CGFloat, current: Bool) -> some View {
         VStack(alignment: .leading, spacing: 4) {
             textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil)
+                .allowsHitTesting(false)
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
                 .background(chatItemFrameColor(ci, colorScheme))
@@ -203,7 +197,7 @@ struct ChatItemInfoView: View {
 
     @ViewBuilder private func textBubble(_ text: String, _ formattedText: [FormattedText]?, _ sender: String? = nil) -> some View {
         if text != "" {
-            TextBubble(text: text, formattedText: formattedText, sender: sender)
+            messageText(text, formattedText, sender)
         } else {
             Text("no text")
                 .italic()
@@ -211,17 +205,6 @@ struct ChatItemInfoView: View {
         }
     }
 
-    private struct TextBubble: View {
-        var text: String
-        var formattedText: [FormattedText]?
-        var sender: String? = nil
-        @State private var showSecrets = false
-
-        var body: some View {
-            toggleSecrets(formattedText, $showSecrets, messageText(text, formattedText, sender, showSecrets: showSecrets))
-        }
-    }
-
     @ViewBuilder private func quoteTab(_ qi: CIQuote) -> some View {
         GeometryReader { g in
             let maxWidth = (g.size.width - 32) * 0.84
@@ -243,6 +226,7 @@ struct ChatItemInfoView: View {
     @ViewBuilder private func quotedMsgView(_ qi: CIQuote, _ maxWidth: CGFloat) -> some View {
         VStack(alignment: .leading, spacing: 4) {
             textBubble(qi.text, qi.formattedText, qi.getSender(nil))
+                .allowsHitTesting(false)
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
                 .background(quotedMsgFrameColor(qi, colorScheme))
@@ -306,8 +290,8 @@ struct ChatItemInfoView: View {
 
     private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus)] {
         memberDeliveryStatuses.compactMap({ mds in
-            if let mem = chatModel.getGroupMember(mds.groupMemberId) {
+            if let mem = ChatModel.shared.groupMembers.first(where: { $0.groupMemberId == mds.groupMemberId }) {
-                return (mem.wrapped, mds.memberDeliveryStatus)
+                return (mem, mds.memberDeliveryStatus)
             } else {
                 return nil
             }
@@ -356,12 +340,7 @@ struct ChatItemInfoView: View {
     private func itemInfoShareText() -> String {
         let meta = ci.meta
         var shareText: [String] = [String.localizedStringWithFormat(NSLocalizedString("# %@", comment: "copied message info title, # <title>"), title), ""]
-        shareText += [String.localizedStringWithFormat(
+        shareText += [String.localizedStringWithFormat(NSLocalizedString("Sent at: %@", comment: "copied message info"), localTimestamp(meta.itemTs))]
-            ci.localNote
-                ? NSLocalizedString("Created at: %@", comment: "copied message info")
-                : NSLocalizedString("Sent at: %@", comment: "copied message info"),
-            localTimestamp(meta.itemTs))
-        ]
         if !ci.chatDir.sent {
             shareText += [String.localizedStringWithFormat(NSLocalizedString("Received at: %@", comment: "copied message info"), localTimestamp(meta.createdAt))]
         }

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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatItemView: View {
-    @ObservedObject var chat: Chat
+    var chatInfo: ChatInfo
     var chatItem: ChatItem
     var maxWidth: CGFloat = .infinity
     @State var scrollProxy: ScrollViewProxy? = nil
@@ -19,19 +19,8 @@ struct ChatItemView: View {
     @Binding var audioPlayer: AudioPlayer?
     @Binding var playbackState: VoiceMessagePlaybackState
     @Binding var playbackTime: TimeInterval?
-    init(
+    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)) {
-        chat: Chat,
+        self.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.chat = chat
         self.chatItem = chatItem
         self.maxWidth = maxWidth
         _scrollProxy = .init(initialValue: scrollProxy)
@@ -44,15 +33,15 @@ struct ChatItemView: View {
 
     var body: some View {
         let ci = chatItem
-        if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
+        if chatItem.meta.itemDeleted != nil && !revealed {
-            MarkedDeletedItemView(chat: chat, chatItem: chatItem, revealed: $revealed)
+            MarkedDeletedItemView(chatItem: chatItem)
         } 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(chat: chat, chatItem: ci)
+                EmojiItemView(chatItem: ci)
             } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
-                CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
+                CIVoiceView(chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
             } else if ci.content.msgContent == nil {
-                ChatItemContentView(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chatInfo: chatInfo, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
             } else {
                 framedItemView()
             }
@@ -62,15 +51,14 @@ struct ChatItemView: View {
     }
 
     private func framedItemView() -> some View {
-        FramedItemView(chat: chat, chatItem: chatItem, revealed: $revealed, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
+        FramedItemView(chatInfo: chatInfo, chatItem: chatItem, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
     }
 }
 
 struct ChatItemContentView<Content: View>: View {
     @EnvironmentObject var chatModel: ChatModel
-    @ObservedObject var chat: Chat
+    var chatInfo: ChatInfo
     var chatItem: ChatItem
-    @Binding var revealed: Bool
     var msgContentView: () -> Content
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
@@ -84,14 +72,14 @@ struct ChatItemContentView<Content: View>: View {
         case let .rcvCall(status, duration): callItemView(status, duration)
         case let .rcvIntegrityError(msgError):
             if developerTools {
-                IntegrityErrorItemView(chat: chat, msgError: msgError, chatItem: chatItem)
+                IntegrityErrorItemView(msgError: msgError, chatItem: chatItem)
             } else {
                 ZStack {}
             }
-        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(chat: chat, msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
+        case let .rcvDecryptionError(msgDecryptError, msgCount): CIRcvDecryptionError(msgDecryptError: msgDecryptError, msgCount: msgCount, chatItem: chatItem)
         case let .rcvGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
         case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
-        case .rcvDirectEvent: eventItemView()
+        case .rcvGroupEvent(.memberConnected): CIEventView(eventText: membersConnectedItemText)
         case .rcvGroupEvent(.memberCreatedContact): CIMemberCreatedContactView(chatItem: chatItem)
         case .rcvGroupEvent: eventItemView()
         case .sndGroupEvent: eventItemView()
@@ -100,30 +88,29 @@ 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(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
+            CIFeaturePreferenceView(chatItem: chatItem, feature: feature, allowed: allowed, param: param)
         case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: .secondary)
+            CIChatFeatureView(chatItem: chatItem, 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)
         case let .rcvGroupFeatureRejected(feature): chatFeatureView(feature, .red)
         case .sndModerated: deletedItemView()
         case .rcvModerated: deletedItemView()
-        case .rcvBlocked: deletedItemView()
         case let .invalidJSON(json): CIInvalidJSONView(json: json)
         }
     }
 
     private func deletedItemView() -> some View {
-        DeletedItemView(chat: chat, chatItem: chatItem)
+        DeletedItemView(chatItem: chatItem)
     }
 
     private func callItemView(_ status: CICallStatus, _ duration: Int) -> some View {
-        CICallItemView(chat: chat, chatItem: chatItem, status: status, duration: duration)
+        CICallItemView(chatInfo: chatInfo, chatItem: chatItem, status: status, duration: duration)
     }
 
     private func groupInvitationItemView(_ groupInvitation: CIGroupInvitation, _ memberRole: GroupMemberRole) -> some View {
-        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chat.chatInfo.incognito)
+        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chatInfo.incognito)
     }
 
     private func eventItemView() -> some View {
@@ -131,9 +118,7 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func eventItemViewText() -> Text {
-        if !revealed, let t = mergedGroupEventText {
+        if let member = chatItem.memberDisplayName {
-            return chatEventText(t + Text(" ") + chatItem.timestampText)
-        } else if let member = chatItem.memberDisplayName {
             return Text(member + " ")
                     .font(.caption)
                     .foregroundColor(.secondary)
@@ -145,42 +130,34 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
-        CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, iconColor: iconColor)
+        CIChatFeatureView(chatItem: chatItem, feature: feature, iconColor: iconColor)
     }
 
-    private var mergedGroupEventText: Text? {
+    private var membersConnectedItemText: Text {
-        let (count, ns) = chatModel.getConnectedMemberNames(chatItem)
+        if let t = membersConnectedText {
-        let members: LocalizedStringKey =
+            return chatEventText(t, chatItem.timestampText)
-            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 {
-            Text(members)
+            return eventItemViewText()
         }
     }
-}
 
-func chatEventText(_ text: Text) -> Text {
+    private var membersConnectedText: LocalizedStringKey? {
-    text
+        let ns = chatModel.getConnectedMemberNames(chatItem)
-        .font(.caption)
+        return ns.count > 3
-        .foregroundColor(.secondary)
+            ? "\(ns[0]), \(ns[1]) and \(ns.count - 2) other members connected"
-        .fontWeight(.light)
+            : 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 {
-    chatEventText(Text(eventText) + Text(" ") + ts)
+    (Text(eventText) + Text(" ") + ts)
+        .font(.caption)
+        .foregroundColor(.secondary)
+        .fontWeight(.light)
 }
 
 func chatEventText(_ ci: ChatItem) -> Text {
@@ -190,15 +167,15 @@ func chatEventText(_ ci: ChatItem) -> Text {
 struct ChatItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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(chatInfo: ChatInfo.sampleData.direct, 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))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, 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)
@@ -210,7 +187,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
         let ciFeatureContent = CIContent.rcvChatFeature(feature: .fullDelete, enabled: FeatureEnabled(forUser: false, forContact: false), param: nil)
         Group{
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -221,7 +198,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead),
@@ -232,7 +209,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "received invitation to join group team as admin", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -243,7 +220,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "group event text", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
@@ -254,7 +231,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                 revealed: Binding.constant(true)
             )
             ChatItemView(
-                chat: Chat.sampleData,
+                chatInfo: ChatInfo.sampleData.direct,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, ciFeatureContent.text, .rcvRead, itemDeleted: .deleted(deletedTs: .now)),

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

@@ -21,7 +21,9 @@ 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?
@@ -34,12 +36,7 @@ struct ChatView: View {
     @State private var searchText: String = ""
     @FocusState private var searchFocussed
     // opening GroupMemberInfoView on member icon
-    @State private var membersLoaded = false
+    @State private var selectedMember: GroupMember? = nil
-    @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, *) {
@@ -94,10 +91,7 @@ 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
                     }
                 }
             }
@@ -114,7 +108,7 @@ struct ChatView: View {
                                     connectionStats = stats
                                     customUserProfile = profile
                                     connectionCode = code
-                                    if contact.activeConn?.connectionCode != ct.activeConn?.connectionCode {
+                                    if contact.activeConn.connectionCode != ct.activeConn.connectionCode {
                                         chat.chatInfo = .direct(contact: ct)
                                     }
                                 }
@@ -135,47 +129,41 @@ struct ChatView: View {
                     }
                 } else if case let .group(groupInfo) = cInfo {
                     Button {
-                        Task { await loadGroupMembers(groupInfo) { showChatInfoSheet = true } }
+                        Task {
+                            let groupMembers = await apiListMembers(groupInfo.groupId)
+                            await MainActor.run {
+                                ChatModel.shared.groupMembers = groupMembers
+                                showChatInfoSheet = true
+                            }
+                        }
                     } label: {
                         ChatInfoToolbar(chat: chat)
                     }
                     .appSheet(isPresented: $showChatInfoSheet) {
-                        GroupChatInfoView(
+                        GroupChatInfoView(chat: chat, groupInfo: groupInfo)
-                            chat: chat,
-                            groupInfo: Binding(
-                                get: { groupInfo },
-                                set: { gInfo in
-                                    chat.chatInfo = .group(groupInfo: gInfo)
-                                    chat.created = Date.now
                     }
-                            )
-                        )
-                    }
-                } else if case .local = cInfo {
-                    ChatInfoToolbar(chat: chat)
                 }
             }
             ToolbarItem(placement: .navigationBarTrailing) {
                 switch cInfo {
                 case let .direct(contact):
                     HStack {
-                        let callsPrefEnabled = contact.mergedPreferences.calls.enabled.forUser
+                        if contact.allowsFeature(.calls) {
-                        if callsPrefEnabled {
                             callButton(contact, .audio, imageName: "phone")
-                                .disabled(!contact.ready || !contact.active)
+                                .disabled(!contact.ready)
                         }
                         Menu {
-                            if callsPrefEnabled {
+                            if contact.allowsFeature(.calls) {
                                 Button {
                                     CallController.shared.startCall(contact, .video)
                                 } label: {
                                     Label("Video call", systemImage: "video")
                                 }
-                                .disabled(!contact.ready || !contact.active)
+                                .disabled(!contact.ready)
                             }
                             searchButton()
                             toggleNtfsButton(chat)
-                                .disabled(!contact.ready || !contact.active)
+                                .disabled(!contact.ready)
                         } label: {
                             Image(systemName: "ellipsis")
                         }
@@ -184,16 +172,9 @@ struct ChatView: View {
                     HStack {
                         if groupInfo.canAddMembers {
                             if (chat.chatInfo.incognito) {
-                                groupLinkButton()
+                                Image(systemName: "person.crop.circle.badge.plus")
-                                    .appSheet(isPresented: $showGroupLinkSheet) {
+                                    .foregroundColor(Color(uiColor: .tertiaryLabel))
-                                        GroupLinkView(
+                                    .onTapGesture { AlertManager.shared.showAlert(cantInviteIncognitoAlert()) }
-                                            groupId: groupInfo.groupId,
-                                            groupLink: $groupLink,
-                                            groupLinkMemberRole: $groupLinkMemberRole,
-                                            showTitle: true,
-                                            creatingGroup: false
-                                        )
-                                    }
                             } else {
                                 addMembersButton()
                                     .appSheet(isPresented: $showAddMembersSheet) {
@@ -208,8 +189,6 @@ struct ChatView: View {
                             Image(systemName: "ellipsis")
                         }
                     }
-                case .local:
-                    searchButton()
                 default:
                     EmptyView()
                 }
@@ -217,17 +196,6 @@ 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 {
@@ -255,8 +223,8 @@ struct ChatView: View {
     }
 
     private func searchToolbar() -> some View {
-        HStack(spacing: 12) {
+        HStack {
-            HStack(spacing: 4) {
+            HStack {
                 Image(systemName: "magnifyingglass")
                 TextField("Search", text: $searchText)
                     .focused($searchFocussed)
@@ -269,9 +237,9 @@ struct ChatView: View {
                     Image(systemName: "xmark.circle.fill").opacity(searchText == "" ? 0 : 1)
                 }
             }
-            .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
+            .padding(EdgeInsets(top: 8, leading: 6, bottom: 8, trailing: 6))
             .foregroundColor(.secondary)
-            .background(Color(.tertiarySystemFill))
+            .background(Color(.secondarySystemBackground))
             .cornerRadius(10.0)
 
             Button ("Cancel") {
@@ -353,7 +321,6 @@ struct ChatView: View {
     @ViewBuilder private func connectingText() -> some View {
         if case let .direct(contact) = chat.chatInfo,
            !contact.ready,
-           contact.active,
            !contact.nextSendGrpInv {
             Text("connecting…")
                 .font(.caption)
@@ -436,32 +403,19 @@ struct ChatView: View {
     private func addMembersButton() -> some View {
         Button {
             if case let .group(gInfo) = chat.chatInfo {
-                Task { await loadGroupMembers(gInfo) { showAddMembersSheet = true } }
+                Task {
+                    let groupMembers = await apiListMembers(gInfo.groupId)
+                    await MainActor.run {
+                        ChatModel.shared.groupMembers = groupMembers
+                        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 }
@@ -491,30 +445,73 @@ 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(
-            chat: chat,
+            ci: ci,
-            chatItem: ci,
             maxWidth: maxWidth,
+            scrollProxy: scrollProxy,
+            deleteMessage: deleteMessage,
+            deletingItem: $deletingItem,
             composeState: $composeState,
-            selectedMember: $selectedMember,
+            showDeleteMessage: $showDeleteMessage
-            chatView: self
         )
+        .environmentObject(chat)
     }
 
     private struct ChatItemWithMenu: View {
-        @EnvironmentObject var m: ChatModel
+        @EnvironmentObject var chat: Chat
         @Environment(\.colorScheme) var colorScheme
-        @ObservedObject var chat: Chat
+        var ci: ChatItem
-        var chatItem: ChatItem
         var maxWidth: CGFloat
+        var scrollProxy: ScrollViewProxy?
+        var deleteMessage: (CIDeleteMode) -> Void
+        @Binding var deletingItem: ChatItem?
         @Binding var composeState: ComposeState
-        @Binding var selectedMember: GMember?
+        @Binding var showDeleteMessage: Bool
-        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?
@@ -526,114 +523,18 @@ 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(ci, range, live: composeState.liveMessage != nil)) },
+                get: { UIMenu(title: "", children: menu(live: composeState.liveMessage != nil)) },
                 set: { _ in }
             )
             
             VStack(alignment: alignment.horizontal, spacing: 3) {
-                ChatItemView(
+                ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, maxWidth: maxWidth, scrollProxy: scrollProxy, revealed: $revealed, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
-                    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(ci)
+                    chatItemReactions()
                         .padding(.bottom, 4)
                 }
             }
@@ -641,17 +542,12 @@ struct ChatView: View {
                     Button("Delete for me", role: .destructive) {
                         deleteMessage(.cidmInternal)
                     }
-                    if let di = deletingItem, di.meta.editable && !di.localNote {
+                    if let di = deletingItem, di.meta.editable {
                         Button(broadcastDeleteButtonText, role: .destructive) {
                             deleteMessage(.cidmBroadcast)
                         }
                     }
                 }
-                .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 {
@@ -669,15 +565,7 @@ struct ChatView: View {
                 }
         }
 
-        private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
+        private func chatItemReactions() -> some View {
-            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) {
@@ -697,7 +585,7 @@ struct ChatView: View {
 
                     if chat.chatInfo.featureEnabled(.reactions) && (ci.allowAddReaction || r.userReacted) {
                         v.onTapGesture {
-                            setReaction(ci, add: !r.userReacted, reaction: r.reaction)
+                            setReaction(add: !r.userReacted, reaction: r.reaction)
                         }
                     } else {
                         v
@@ -706,10 +594,10 @@ struct ChatView: View {
             }
         }
 
-        private func menu(_ ci: ChatItem, _ range: ClosedRange<Int>?, live: Bool) -> [UIMenuElement] {
+        private func menu(live: Bool) -> [UIMenuElement] {
             var menu: [UIMenuElement] = []
             if let mc = ci.content.msgContent, ci.meta.itemDeleted == nil || revealed {
-                let rs = allReactions(ci)
+                let rs = allReactions()
                 if chat.chatInfo.featureEnabled(.reactions) && ci.allowAddReaction,
                    rs.count > 0 {
                     var rm: UIMenu
@@ -725,17 +613,12 @@ struct ChatView: View {
                     }
                     menu.append(rm)
                 }
-                if ci.meta.itemDeleted == nil && !ci.isLiveDummy && !live && !ci.localNote {
+                if ci.meta.itemDeleted == nil && !ci.isLiveDummy && !live {
-                    menu.append(replyUIAction(ci))
+                    menu.append(replyUIAction())
                 }
-                let fileSource = getLoadedFileSource(ci.file)
+                menu.append(shareUIAction())
-                let fileExists = if let fs = fileSource, FileManager.default.fileExists(atPath: getAppFilePath(fs.filePath).path) { true } else { false }
+                menu.append(copyUIAction())
-                let copyAndShareAllowed = !ci.content.text.isEmpty || (ci.content.msgContent?.isImage == true && fileExists)
+                if let fileSource = getLoadedFileSource(ci.file) {
-                if copyAndShareAllowed {
-                    menu.append(shareUIAction(ci))
-                    menu.append(copyUIAction(ci))
-                }
-                if let fileSource = fileSource, fileExists {
                     if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                         if image.imageData != nil {
                             menu.append(saveFileAction(fileSource))
@@ -747,45 +630,37 @@ struct ChatView: View {
                     }
                 }
                 if ci.meta.editable && !mc.isVoice && !live {
-                    menu.append(editAction(ci))
+                    menu.append(editAction())
-                }
-                if !ci.isLiveDummy {
-                    menu.append(viewInfoUIAction(ci))
                 }
+                menu.append(viewInfoUIAction())
                 if revealed {
                     menu.append(hideUIAction())
                 }
-                if ci.meta.itemDeleted == nil && !ci.localNote,
+                if ci.meta.itemDeleted == nil,
                    let file = ci.file,
                    let cancelAction = file.cancelAction  {
                     menu.append(cancelFileUIAction(file.fileId, cancelAction))
                 }
                 if !live || !ci.meta.isLive {
-                    menu.append(deleteUIAction(ci))
+                    menu.append(deleteUIAction())
                 }
                 if let (groupInfo, _) = ci.memberToModerate(chat.chatInfo) {
-                    menu.append(moderateUIAction(ci, groupInfo))
+                    menu.append(moderateUIAction(groupInfo))
                 }
             } else if ci.meta.itemDeleted != nil {
-                if revealed {
+                if !ci.isDeletedContent {
-                    menu.append(hideUIAction())
-                } else if !ci.isDeletedContent {
                     menu.append(revealUIAction())
-                } else if range != nil {
-                    menu.append(expandUIAction())
                 }
-                menu.append(viewInfoUIAction(ci))
+                menu.append(viewInfoUIAction())
-                menu.append(deleteUIAction(ci))
+                menu.append(deleteUIAction())
             } else if ci.isDeletedContent {
-                menu.append(viewInfoUIAction(ci))
+                menu.append(viewInfoUIAction())
-                menu.append(deleteUIAction(ci))
+                menu.append(deleteUIAction())
-            } else if ci.mergeCategory != nil && ((range?.count ?? 0) > 1 || revealed) {
-                menu.append(revealed ? shrinkUIAction() : expandUIAction())
             }
             return menu
         }
         
-        private func replyUIAction(_ ci: ChatItem) -> UIAction {
+        private func replyUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Reply", comment: "chat item action"),
                 image: UIImage(systemName: "arrowshape.turn.up.left")
@@ -820,11 +695,11 @@ struct ChatView: View {
             )
         }
 
-        private func allReactions(_ ci: ChatItem) -> [UIAction] {
+        private func allReactions() -> [UIAction] {
             MsgReaction.values.compactMap { r in
                 ci.reactions.contains(where: { $0.userReacted && $0.reaction == r })
                 ? nil
-                : UIAction(title: r.text) { _ in setReaction(ci, add: true, reaction: r) }
+                : UIAction(title: r.text) { _ in setReaction(add: true, reaction: r) }
             }
         }
 
@@ -832,7 +707,7 @@ struct ChatView: View {
             rs.count > 4 ? 3 : 4
         }
 
-        private func setReaction(_ ci: ChatItem, add: Bool, reaction: MsgReaction) {
+        private func setReaction(add: Bool, reaction: MsgReaction) {
             Task {
                 do {
                     let cInfo = chat.chatInfo
@@ -844,7 +719,7 @@ struct ChatView: View {
                         reaction: reaction
                     )
                     await MainActor.run {
-                        m.updateChatItem(chat.chatInfo, chatItem)
+                        ChatModel.shared.updateChatItem(chat.chatInfo, chatItem)
                     }
                 } catch let error {
                     logger.error("apiChatItemReaction error: \(responseError(error))")
@@ -852,7 +727,7 @@ struct ChatView: View {
             }
         }
 
-        private func shareUIAction(_ ci: ChatItem) -> UIAction {
+        private func shareUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Share", comment: "chat item action"),
                 image: UIImage(systemName: "square.and.arrow.up")
@@ -865,7 +740,7 @@ struct ChatView: View {
             }
         }
         
-        private func copyUIAction(_ ci: ChatItem) -> UIAction {
+        private func copyUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Copy", comment: "chat item action"),
                 image: UIImage(systemName: "doc.on.doc")
@@ -898,7 +773,7 @@ struct ChatView: View {
             }
         }
         
-        private func editAction(_ ci: ChatItem) -> UIAction {
+        private func editAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Edit", comment: "chat item action"),
                 image: UIImage(systemName: "square.and.pencil")
@@ -909,7 +784,7 @@ struct ChatView: View {
             }
         }
 
-        private func viewInfoUIAction(_ ci: ChatItem) -> UIAction {
+        private func viewInfoUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Info", comment: "chat item action"),
                 image: UIImage(systemName: "info.circle")
@@ -922,7 +797,10 @@ struct ChatView: View {
                             chatItemInfo = ciInfo
                         }
                         if case let .group(gInfo) = chat.chatInfo {
-                            await chatView.loadGroupMembers(gInfo)
+                            let groupMembers = await apiListMembers(gInfo.groupId)
+                            await MainActor.run {
+                                ChatModel.shared.groupMembers = groupMembers
+                            }
                         }
                     } catch let error {
                         logger.error("apiGetChatItemInfo error: \(responseError(error))")
@@ -943,7 +821,7 @@ struct ChatView: View {
                     message: Text(cancelAction.alert.message),
                     primaryButton: .destructive(Text(cancelAction.alert.confirm)) {
                         Task {
-                            if let user = m.currentUser {
+                            if let user = ChatModel.shared.currentUser {
                                 await cancelFile(user: user, fileId: fileId)
                             }
                         }
@@ -964,45 +842,18 @@ struct ChatView: View {
             }
         }
         
-        private func deleteUIAction(_ ci: ChatItem) -> UIAction {
+        private func deleteUIAction() -> UIAction {
             UIAction(
                 title: NSLocalizedString("Delete", comment: "chat item action"),
                 image: UIImage(systemName: "trash"),
                 attributes: [.destructive]
             ) { _ in
-                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 itemsRange(_ currIndex: Int?, _ prevHidden: Int?) -> ClosedRange<Int>? {
+        private func moderateUIAction(_ groupInfo: GroupInfo) -> UIAction {
-            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"),
@@ -1035,62 +886,28 @@ 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"
         }
-
-        var deleteMessagesTitle: LocalizedStringKey {
-            let n = deletingItems.count
-            return n == 1 ? "Delete message?" : "Delete \(n) messages?"
     }
 
-        private func deleteMessages() {
+    private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
-            let itemIds = deletingItems
+        switch (prevItem?.chatDir) {
-            if itemIds.count > 0 {
+        case .groupSnd: return true
-                let chatInfo = chat.chatInfo
+        case let .groupRcv(prevMember): return prevMember.groupMemberId != member.groupMemberId
-                Task {
+        default: return false
-                    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 {
+    private func scrollToBottom(_ proxy: ScrollViewProxy) {
-                            m.removeChatItem(chatInfo, di)
+        if let ci = chatModel.reversedChatItems.first {
-                        }
+            withAnimation { proxy.scrollTo(ci.viewId, anchor: .top) }
         }
     }
+    
+    private func scrollUp(_ proxy: ScrollViewProxy) {
+        if let ci = chatModel.topItemInView(itemsInView: itemsInView) {
+            withAnimation { proxy.scrollTo(ci.viewId, anchor: .top) }
         }
     }
     
@@ -1120,9 +937,9 @@ struct ChatView: View {
                     DispatchQueue.main.async {
                         deletingItem = nil
                         if let toItem = toItem {
-                                _ = m.upsertChatItem(chat.chatInfo, toItem)
+                            _ = chatModel.upsertChatItem(chat.chatInfo, toItem)
                         } else {
-                                m.removeChatItem(chat.chatInfo, deletedItem)
+                            chatModel.removeChatItem(chat.chatInfo, deletedItem)
                         }
                     }
                 }
@@ -1131,19 +948,6 @@ struct ChatView: View {
             }
         }
     }
-    }
-
-    private func scrollToBottom(_ proxy: ScrollViewProxy) {
-        if let ci = chatModel.reversedChatItems.first {
-            withAnimation { proxy.scrollTo(ci.viewId, anchor: .top) }
-        }
-    }
-    
-    private func scrollUp(_ proxy: ScrollViewProxy) {
-        if let ci = chatModel.topItemInView(itemsInView: itemsInView) {
-            withAnimation { proxy.scrollTo(ci.viewId, anchor: .top) }
-        }
-    }
 }
 
 @ViewBuilder func toggleNtfsButton(_ chat: Chat) -> some View {
@@ -1160,7 +964,7 @@ struct ChatView: View {
 
 func toggleNotifications(_ chat: Chat, enableNtfs: Bool) {
     var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
-    chatSettings.enableNtfs = enableNtfs ? .all : .none
+    chatSettings.enableNtfs = enableNtfs
     updateChatSettings(chat, chatSettings: chatSettings)
 }
 

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

@@ -104,7 +104,7 @@ struct ComposeState {
 
     var sendEnabled: Bool {
         switch preview {
-        case let .mediaPreviews(media): return !media.isEmpty
+        case .mediaPreviews: return true
         case .voicePreview: return voiceMessageRecordingState == .finished
         case .filePreview: return true
         default: return !message.isEmpty || liveMessage != nil
@@ -295,7 +295,7 @@ struct ComposeView: View {
                             sendMessage(ttl: ttl)
                             resetLinkPreview()
                         },
-                        sendLiveMessage: chat.chatInfo.chatType != .local ? sendLiveMessage : nil,
+                        sendLiveMessage: sendLiveMessage,
                         updateLiveMessage: updateLiveMessage,
                         cancelLiveMessage: {
                             composeState.liveMessage = nil
@@ -384,10 +384,10 @@ struct ComposeView: View {
             }
         }
         .sheet(isPresented: $showMediaPicker) {
-            LibraryMediaListPicker(addMedia: addMediaContent, selectionLimit: 10, finishedPreprocessing: finishedPreprocessingMediaContent) { itemsSelected in
+            LibraryMediaListPicker(media: $chosenMedia, selectionLimit: 10) { itemsSelected in
-                await MainActor.run {
                 showMediaPicker = false
                 if itemsSelected {
+                    DispatchQueue.main.async {
                         composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: []))
                     }
                 }
@@ -488,30 +488,6 @@ struct ComposeView: View {
         }
     }
 
-    private func addMediaContent(_ content: UploadContent) async {
-        if let img = resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
-            var newMedia: [(String, UploadContent?)] = []
-            if case var .mediaPreviews(media) = composeState.preview {
-                media.append((img, content))
-                newMedia = media
-            } else {
-                newMedia = [(img, content)]
-            }
-            await MainActor.run {
-                composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: newMedia))
-            }
-        }
-    }
-
-    // When error occurs while converting video, remove media preview
-    private func finishedPreprocessingMediaContent() {
-        if case let .mediaPreviews(media) = composeState.preview, media.isEmpty {
-            DispatchQueue.main.async {
-                composeState = composeState.copy(preview: .noPreview)
-            }
-        }
-    }
-
     private var maxFileSize: Int64 {
         getMaxFileSize(.xftp)
     }
@@ -616,14 +592,12 @@ 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() }
@@ -689,7 +663,7 @@ struct ComposeView: View {
                 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)
                 }
             }
@@ -792,9 +766,7 @@ struct ComposeView: View {
         }
 
         func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
-            if let chatItem = chat.chatInfo.chatType == .local
+            if let chatItem = await apiSendMessage(
-                ? await apiCreateChatItem(noteFolderId: chat.chatInfo.apiId, file: file, msg: mc)
-                : await apiSendMessage(
                 type: chat.chatInfo.chatType,
                 id: chat.chatInfo.apiId,
                 file: file,
@@ -978,9 +950,6 @@ struct ComposeView: View {
     }
 
     private func cancelLinkPreview() {
-        if let pendingLink = pendingLinkUrl?.absoluteString {
-            cancelledLinks.insert(pendingLink)
-        }
         if let uri = composeState.linkPreview?.uri.absoluteString {
             cancelledLinks.insert(uri)
         }

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

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

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

@@ -14,28 +14,20 @@ import PhotosUI
 struct NativeTextEditor: UIViewRepresentable {
     @Binding var text: String
     @Binding var disableEditing: Bool
-    @Binding var height: CGFloat
+    let height: CGFloat
+    let font: UIFont
     @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(height: _height)
+        let field = CustomUITextField()
         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
@@ -47,68 +39,20 @@ 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
     }
@@ -200,14 +144,14 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
 
 struct NativeTextEditor_Previews: PreviewProvider{
     static var previews: some View {
-        NativeTextEditor(
+        return NativeTextEditor(
             text: Binding.constant("Hello, world!"),
             disableEditing: Binding.constant(false),
-            height: Binding.constant(100),
+            height: 100,
+            font: UIFont.preferredFont(forTextStyle: .body),
             focused: Binding.constant(false),
             alignment: TextAlignment.leading,
             onImagesAdded: { _ in }
         )
-        .fixedSize(horizontal: false, vertical: true)
     }
 }

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

@@ -32,12 +32,15 @@ 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 {
@@ -54,16 +57,30 @@ 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,
+                            height: teHeight,
+                            font: teUiFont,
                             focused: $keyboardVisible,
                             alignment: alignment,
                             onImagesAdded: onMediaAdded
                         )
                         .allowsTightening(false)
-                        .fixedSize(horizontal: false, vertical: true)
+                        .frame(height: teHeight)
                     }
                 }
 
@@ -83,13 +100,11 @@ 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) {
@@ -400,12 +415,16 @@ struct SendMessageView: View {
         .padding([.bottom, .trailing], 4)
     }
 
-    private func updateFont(_ text: String) {
+    private func updateHeight(_ g: GeometryProxy) -> Color {
         DispatchQueue.main.async {
-            teFont = isShortEmoji(text)
+            teHeight = min(max(g.frame(in: .local).size.height, minHeight), maxHeight)
-            ? (text.count < 4 ? largeEmojiFont : mediumEmojiFont)
+            (teFont, teUiFont) = isShortEmoji(composeState.message)
-            : .body
+                                    ? composeState.message.count < 4
+                                        ? (largeEmojiFont, largeEmojiUIFont)
+                                        : (mediumEmojiFont, mediumEmojiUIFont)
+                                    : (.body, UIFont.preferredFont(forTextStyle: .body))
         }
+        return Color.clear
     }
 }
 

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

@@ -116,6 +116,7 @@ struct ContactPreferencesView: View {
 
     private func featureFooter(_ feature: ChatFeature, _ enabled: FeatureEnabled) -> some View {
         Text(feature.enabledDescription(enabled))
+        .frame(height: 36, alignment: .topLeading)
     }
 
     private func savePreferences() {

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.upsertGroupMember(groupInfo, member) }
+                    await MainActor.run { _ = ChatModel.shared.upsertGroupMember(groupInfo, member) }
                 }
                 addedMembersCb(selectedContacts)
             } catch {
@@ -157,7 +157,7 @@ struct AddGroupMembersViewCommon: View {
     private func rolePicker() -> some View {
         Picker("New member role", selection: $selectedRole) {
             ForEach(GroupMemberRole.allCases) { role in
-                if role <= groupInfo.membership.memberRole && role != .author {
+                if role <= groupInfo.membership.memberRole {
                     Text(role.text)
                 }
             }

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

@@ -15,7 +15,8 @@ struct GroupChatInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
     @ObservedObject var chat: Chat
-    @Binding var groupInfo: GroupInfo
+    @State var groupInfo: GroupInfo
+    @ObservedObject private var alertManager = AlertManager.shared
     @State private var alert: GroupChatInfoViewAlert? = nil
     @State private var groupLink: String?
     @State private var groupLinkMemberRole: GroupMemberRole = .member
@@ -34,34 +35,14 @@ struct GroupChatInfoView: View {
         case leaveGroupAlert
         case cantInviteIncognitoAlert
         case largeGroupReceiptsDisabled
-        case blockMemberAlert(mem: GroupMember)
-        case unblockMemberAlert(mem: GroupMember)
-        case blockForAllAlert(mem: GroupMember)
-        case unblockForAllAlert(mem: GroupMember)
-        case removeMemberAlert(mem: GroupMember)
-        case error(title: LocalizedStringKey, error: LocalizedStringKey)
 
-        var id: String {
+        var id: GroupChatInfoViewAlert { get { self } }
-            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 .blockForAllAlert(mem): return "blockForAllAlert \(mem.groupMemberId)"
-            case let .unblockForAllAlert(mem): return "unblockForAllAlert \(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 { m in let status = m.wrapped.memberStatus; return status != .memLeft && status != .memRemoved }
+                .filter { $0.memberStatus != .memLeft && $0.memberStatus != .memRemoved }
                 .sorted { $0.displayName.lowercased() < $1.displayName.lowercased() }
 
             List {
@@ -76,7 +57,7 @@ struct GroupChatInfoView: View {
                         addOrEditWelcomeMessage()
                     }
                     groupPreferencesButton($groupInfo)
-                    if members.filter({ $0.wrapped.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
+                    if members.filter({ $0.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
                         sendReceiptsOption()
                     } else {
                         sendReceiptsOptionDisabled()
@@ -103,17 +84,17 @@ struct GroupChatInfoView: View {
                             .padding(.leading, 8)
                     }
                     let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                    let filteredMembers = s == "" ? members : members.filter { $0.wrapped.chatViewName.localizedLowercase.contains(s) }
+                    let filteredMembers = s == "" ? members : members.filter { $0.chatViewName.localizedLowercase.contains(s) }
-                    MemberRowView(groupInfo: groupInfo, groupMember: GMember(groupInfo.membership), user: true, alert: $alert)
+                    memberView(groupInfo.membership, user: true)
                     ForEach(filteredMembers) { member in
                         ZStack {
                             NavigationLink {
-                                memberInfoView(member)
+                                memberInfoView(member.groupMemberId)
                             } label: {
                                 EmptyView()
                             }
                             .opacity(0)
-                            MemberRowView(groupInfo: groupInfo, groupMember: member, alert: $alert)
+                            memberView(member)
                         }
                     }
                 }
@@ -145,12 +126,6 @@ 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 .blockForAllAlert(mem): return blockForAllAlert(groupInfo, mem)
-            case let .unblockForAllAlert(mem): return unblockForAllAlert(groupInfo, mem)
-            case let .removeMemberAlert(mem): return removeMemberAlert(mem)
-            case let .error(title, error): return Alert(title: Text(title), message: Text(error))
             }
         }
         .onAppear {
@@ -199,7 +174,7 @@ struct GroupChatInfoView: View {
                     Task {
                         let groupMembers = await apiListMembers(groupInfo.groupId)
                         await MainActor.run {
-                            chatModel.groupMembers = groupMembers.map { GMember.init($0) }
+                            ChatModel.shared.groupMembers = groupMembers
                         }
                     }
                 }
@@ -208,15 +183,8 @@ struct GroupChatInfoView: View {
         }
     }
 
-    private struct MemberRowView: View {
+    private func memberView(_ member: GroupMember, user: Bool = false) -> some View {
-        var groupInfo: GroupInfo
+        HStack{
-        @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)
@@ -232,118 +200,32 @@ struct GroupChatInfoView: View {
                     .foregroundColor(.secondary)
             }
             Spacer()
-                memberInfo(member)
-            }
-
-            // revert from this:
-            if user {
-                v
-            } else if member.canBeRemoved(groupInfo: groupInfo) {
-                removeSwipe(member, blockSwipe(member, v))
-            } else {
-                blockSwipe(member, v)
-            }
-            // revert to this: vvv
-//            if user {
-//                v
-//            } else if groupInfo.membership.memberRole >= .admin {
-//                // TODO if there are more actions, refactor with lists of swipeActions
-//                let canBlockForAll = member.canBlockForAll(groupInfo: groupInfo)
-//                let canRemove = member.canBeRemoved(groupInfo: groupInfo)
-//                if canBlockForAll && canRemove {
-//                    removeSwipe(member, blockForAllSwipe(member, v))
-//                } else if canBlockForAll {
-//                    blockForAllSwipe(member, v)
-//                } else if canRemove {
-//                    removeSwipe(member, v)
-//                } else {
-//                    v
-//                }
-//            } else {
-//                if !member.blockedByAdmin {
-//                    blockSwipe(member, v)
-//                } else {
-//                    v
-//                }
-//            }
-            // ^^^
-        }
-
-        @ViewBuilder private func memberInfo(_ member: GroupMember) -> some View {
-            if member.blocked {
-                Text("blocked")
-                    .foregroundColor(.secondary)
-            } else {
             let role = member.memberRole
-                if [.owner, .admin, .observer].contains(role) {
+            if role == .owner || role == .admin {
                 Text(member.memberRole.text)
                     .foregroundColor(.secondary)
             }
         }
     }
 
-        private func blockSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
+    private var memberVerifiedShield: Text {
-            v.swipeActions(edge: .leading) {
+        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
-                if member.memberSettings.showMessages {
+            .font(.caption)
-                    Button {
+            .baselineOffset(2)
-                        alert = .blockMemberAlert(mem: member)
+            .kerning(-2)
-                    } label: {
+            .foregroundColor(.secondary)
-                        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 blockForAllSwipe<V: View>(_ member: GroupMember, _ v: V) -> some View {
+    @ViewBuilder private func memberInfoView(_ groupMemberId: Int64?) -> some View {
-            v.swipeActions(edge: .leading) {
+        if let mId = groupMemberId, let member = chatModel.groupMembers.first(where: { $0.groupMemberId == mId }) {
-                if member.blockedByAdmin {
+            GroupMemberInfoView(groupInfo: groupInfo, member: member)
-                    Button {
-                        alert = .unblockForAllAlert(mem: member)
-                    } label: {
-                        Label("Unblock for all", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
-                    }
-                } else {
-                    Button {
-                        alert = .blockForAllAlert(mem: member)
-                    } label: {
-                        Label("Block for all", systemImage: "hand.raised").foregroundColor(.secondary)
-                    }
-                }
-            }
-        }
-
-        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 func memberInfoView(_ groupMember: GMember) -> some View {
-        GroupMemberInfoView(groupInfo: groupInfo, groupMember: groupMember)
                 .navigationBarHidden(false)
         }
+    }
 
     private func groupLinkButton() -> some View {
         NavigationLink {
-            GroupLinkView(
+            GroupLinkView(groupId: groupInfo.groupId, groupLink: $groupLink, groupLinkMemberRole: $groupLinkMemberRole)
-                groupId: groupInfo.groupId,
-                groupLink: $groupLink,
-                groupLinkMemberRole: $groupLinkMemberRole,
-                showTitle: false,
-                creatingGroup: false
-            )
                 .navigationBarTitle("Group link")
                 .navigationBarTitleDisplayMode(.large)
         } label: {
@@ -370,11 +252,7 @@ struct GroupChatInfoView: View {
 
     private func addOrEditWelcomeMessage() -> some View {
         NavigationLink {
-            GroupWelcomeView(
+            GroupWelcomeView(groupId: groupInfo.groupId, groupInfo: $groupInfo)
-                groupInfo: $groupInfo,
-                groupProfile: groupInfo.groupProfile,
-                welcomeText: groupInfo.groupProfile.description ?? ""
-            )
             .navigationTitle("Welcome message")
             .navigationBarTitleDisplayMode(.large)
         } label: {
@@ -497,28 +375,6 @@ 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 {
@@ -540,14 +396,6 @@ 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!"),
@@ -564,9 +412,6 @@ func largeGroupReceiptsDisabledAlert() -> Alert {
 
 struct GroupChatInfoView_Previews: PreviewProvider {
     static var previews: some View {
-        GroupChatInfoView(
+        GroupChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []), groupInfo: GroupInfo.sampleData)
-            chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
-            groupInfo: Binding.constant(GroupInfo.sampleData)
-        )
     }
 }

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

@@ -13,12 +13,8 @@ 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?
-    @State private var shouldCreate = true
 
     private enum GroupLinkAlert: Identifiable {
         case deleteLink
@@ -33,35 +29,10 @@ 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 {
-            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) {
@@ -70,19 +41,16 @@ struct GroupLinkView: View {
                         }
                     }
                     .frame(height: 36)
-                    SimpleXLinkQRCode(uri: groupLink)
+                    QRCode(uri: groupLink)
-                        .id("simplex-qrcode-view-for-\(groupLink)")
                     Button {
-                        showShareSheet(items: [simplexChatLink(groupLink)])
+                        showShareSheet(items: [groupLink])
                     } label: {
                         Label("Share link", systemImage: "square.and.arrow.up")
                     }
 
-                    if !creatingGroup {
                     Button(role: .destructive) { alert = .deleteLink } label: {
                         Label("Delete link", systemImage: "trash")
                     }
-                    }
                 } else {
                     Button(action: createGroupLink) {
                         Label("Create link", systemImage: "link.badge.plus")
@@ -127,10 +95,9 @@ struct GroupLinkView: View {
                 }
             }
             .onAppear {
-                if groupLink == nil && !creatingLink && shouldCreate {
+                if groupLink == nil && !creatingLink {
                     createGroupLink()
                 }
-                shouldCreate = false
             }
         }
     }

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

@@ -12,44 +12,38 @@ import SimpleXChat
 struct GroupMemberInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.dismiss) var dismiss: DismissAction
-    @State var groupInfo: GroupInfo
+    var groupInfo: GroupInfo
-    @ObservedObject var groupMember: GMember
+    @State var member: GroupMember
     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 sheet: PlanAndConnectActionSheet?
+    @State private var connectToMemberDialog: Bool = false
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
     @State private var justOpened = true
     @State private var progressIndicator = false
 
     enum GroupMemberInfoViewAlert: Identifiable {
-        case blockMemberAlert(mem: GroupMember)
-        case unblockMemberAlert(mem: GroupMember)
-        case blockForAllAlert(mem: GroupMember)
-        case unblockForAllAlert(mem: GroupMember)
         case removeMemberAlert(mem: GroupMember)
         case changeMemberRoleAlert(mem: GroupMember, role: GroupMemberRole)
         case switchAddressAlert
         case abortSwitchAddressAlert
         case syncConnectionForceAlert
-        case planAndConnectAlert(alert: PlanAndConnectAlert)
+        case connRequestSentAlert(type: ConnReqType)
         case error(title: LocalizedStringKey, error: LocalizedStringKey)
+        case other(alert: Alert)
 
         var id: String {
             switch self {
-            case let .blockMemberAlert(mem): return "blockMemberAlert \(mem.groupMemberId)"
+            case .removeMemberAlert: return "removeMemberAlert"
-            case let .unblockMemberAlert(mem): return "unblockMemberAlert \(mem.groupMemberId)"
+            case let .changeMemberRoleAlert(_, role): return "changeMemberRoleAlert \(role.rawValue)"
-            case let .blockForAllAlert(mem): return "blockForAllAlert \(mem.groupMemberId)"
-            case let .unblockForAllAlert(mem): return "unblockForAllAlert \(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 let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
+            case .connRequestSentAlert: return "connRequestSentAlert"
             case let .error(title, _): return "error \(title)"
+            case let .other(alert): return "other \(alert)"
             }
         }
     }
@@ -74,7 +68,6 @@ struct GroupMemberInfoView: View {
     private func groupMemberInfoView() -> some View {
         ZStack {
             VStack {
-                let member = groupMember.wrapped
                 List {
                     groupMemberInfoHeader(member)
                         .listRowBackground(Color.clear)
@@ -103,9 +96,9 @@ struct GroupMemberInfoView: View {
 
                     if let contactLink = member.contactLink {
                         Section {
-                            SimpleXLinkQRCode(uri: contactLink)
+                            QRCode(uri: contactLink)
                             Button {
-                                showShareSheet(items: [simplexChatLink(contactLink)])
+                                showShareSheet(items: [contactLink])
                             } label: {
                                 Label("Share address", systemImage: "square.and.arrow.up")
                             }
@@ -168,24 +161,11 @@ struct GroupMemberInfoView: View {
                         }
                     }
 
-                    // revert from this:
-                    Section {
-                        if member.memberSettings.showMessages {
-                            blockMemberButton(member)
-                        } else {
-                            unblockMemberButton(member)
-                        }
                     if member.canBeRemoved(groupInfo: groupInfo) {
+                        Section {
                             removeMemberButton(member)
                         }
                     }
-                    // revert to this: vvv
-//                    if groupInfo.membership.memberRole >= .admin {
-//                        adminDestructiveSection(member)
-//                    } else {
-//                        nonAdminBlockSection(member)
-//                    }
-                    // ^^^
 
                     if developerTools {
                         Section("For console") {
@@ -200,46 +180,37 @@ struct GroupMemberInfoView: View {
                         // this condition prevents re-setting picker
                         if !justOpened { return }
                     }
-                    justOpened = false
-                    DispatchQueue.main.async {
                     newRole = member.memberRole
                     do {
                         let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
                         let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
-                            _ = chatModel.upsertGroupMember(groupInfo, mem)
+                        member = mem
                         connectionStats = stats
                         connectionCode = code
                     } catch let error {
                         logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
                     }
+                    justOpened = false
                 }
-                }
+                .onChange(of: newRole) { _ in
-                .onChange(of: newRole) { 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 .blockMemberAlert(mem): return blockMemberAlert(groupInfo, mem)
-                case let .unblockMemberAlert(mem): return unblockMemberAlert(groupInfo, mem)
-                case let .blockForAllAlert(mem): return blockForAllAlert(groupInfo, mem)
-                case let .unblockForAllAlert(mem): return unblockForAllAlert(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 .connRequestSentAlert(type): return connReqSentAlert(type)
                 case let .error(title, error): return Alert(title: Text(title), message: Text(error))
+                case let .other(alert): return alert
                 }
             }
-            .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
 
             if progressIndicator {
                 ProgressView().scaleEffect(2)
@@ -249,16 +220,25 @@ struct GroupMemberInfoView: View {
 
     func connectViaAddressButton(_ contactLink: String) -> some View {
         Button {
-            planAndConnect(
+            connectToMemberDialog = true
-                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 {
@@ -294,7 +274,7 @@ struct GroupMemberInfoView: View {
             progressIndicator = true
             Task {
                 do {
-                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, groupMember.groupMemberId)
+                    let memberContact = try await apiCreateMemberContact(groupInfo.apiId, member.groupMemberId)
                     await MainActor.run {
                         progressIndicator = false
                         chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
@@ -352,20 +332,20 @@ struct GroupMemberInfoView: View {
     }
 
     private func verifyCodeButton(_ code: String) -> some View {
-        let member = groupMember.wrapped
+        NavigationLink {
-        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
-                        _ = chatModel.upsertGroupMember(groupInfo, member)
+                        if let i = chatModel.groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
+                            chatModel.groupMembers[i].activeConn?.connectionCode = connCode
+                        }
                         return r
                     }
                     return nil
@@ -399,78 +379,12 @@ struct GroupMemberInfoView: View {
         }
     }
 
-    @ViewBuilder private func adminDestructiveSection(_ mem: GroupMember) -> some View {
-        let canBlockForAll = mem.canBlockForAll(groupInfo: groupInfo)
-        let canRemove = mem.canBeRemoved(groupInfo: groupInfo)
-        if canBlockForAll || canRemove {
-            Section {
-                if canBlockForAll {
-                    if mem.blockedByAdmin {
-                        unblockForAllButton(mem)
-                    } else {
-                        blockForAllButton(mem)
-                    }
-                }
-                if canRemove {
-                    removeMemberButton(mem)
-                }
-            }
-        }
-    }
-
-    private func nonAdminBlockSection(_ mem: GroupMember) -> some View {
-        Section {
-            if mem.blockedByAdmin {
-                Label("Blocked by admin", systemImage: "hand.raised")
-                    .foregroundColor(.secondary)
-            } else if mem.memberSettings.showMessages {
-                blockMemberButton(mem)
-            } else {
-                unblockMemberButton(mem)
-            }
-        }
-    }
-
-    private func blockForAllButton(_ mem: GroupMember) -> some View {
-        Button(role: .destructive) {
-            alert = .blockForAllAlert(mem: mem)
-        } label: {
-            Label("Block for all", systemImage: "hand.raised")
-                .foregroundColor(.red)
-        }
-    }
-
-    private func unblockForAllButton(_ mem: GroupMember) -> some View {
-        Button {
-            alert = .unblockForAllAlert(mem: mem)
-        } label: {
-            Label("Unblock for all", systemImage: "hand.raised.slash")
-        }
-    }
-
-    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(.red)
+                .foregroundColor(Color.red)
         }
     }
 
@@ -506,6 +420,7 @@ struct GroupMemberInfoView: View {
                     do {
                         let updatedMember = try await apiMemberRole(groupInfo.groupId, mem.groupMemberId, newRole)
                         await MainActor.run {
+                            member = updatedMember
                             _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
                         }
                         
@@ -526,10 +441,10 @@ struct GroupMemberInfoView: View {
     private func switchMemberAddress() {
         Task {
             do {
-                let stats = try apiSwitchGroupMember(groupInfo.apiId, groupMember.groupMemberId)
+                let stats = try apiSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
                 connectionStats = stats
                 await MainActor.run {
-                    chatModel.updateGroupMemberConnectionStats(groupInfo, groupMember.wrapped, stats)
+                    chatModel.updateGroupMemberConnectionStats(groupInfo, member, stats)
                     dismiss()
                 }
             } catch let error {
@@ -545,10 +460,10 @@ struct GroupMemberInfoView: View {
     private func abortSwitchMemberAddress() {
         Task {
             do {
-                let stats = try apiAbortSwitchGroupMember(groupInfo.apiId, groupMember.groupMemberId)
+                let stats = try apiAbortSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
                 connectionStats = stats
                 await MainActor.run {
-                    chatModel.updateGroupMemberConnectionStats(groupInfo, groupMember.wrapped, stats)
+                    chatModel.updateGroupMemberConnectionStats(groupInfo, member, stats)
                 }
             } catch let error {
                 logger.error("abortSwitchMemberAddress apiAbortSwitchGroupMember error: \(responseError(error))")
@@ -563,7 +478,7 @@ struct GroupMemberInfoView: View {
     private func syncMemberConnection(force: Bool) {
         Task {
             do {
-                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, groupMember.groupMemberId, force)
+                let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, force)
                 connectionStats = stats
                 await MainActor.run {
                     chatModel.updateGroupMemberConnectionStats(groupInfo, mem, stats)
@@ -580,89 +495,11 @@ 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))")
-        }
-    }
-}
-
-func blockForAllAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
-    Alert(
-        title: Text("Block member for all?"),
-        message: Text("All new messages from \(mem.chatViewName) will be hidden!"),
-        primaryButton: .destructive(Text("Block for all")) {
-            blockMemberForAll(gInfo, mem, true)
-        },
-        secondaryButton: .cancel()
-    )
-}
-
-func unblockForAllAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
-    Alert(
-        title: Text("Unblock member for all?"),
-        message: Text("Messages from \(mem.chatViewName) will be shown!"),
-        primaryButton: .default(Text("Unblock for all")) {
-            blockMemberForAll(gInfo, mem, false)
-        },
-        secondaryButton: .cancel()
-    )
-}
-
-func blockMemberForAll(_ gInfo: GroupInfo, _ member: GroupMember, _ blocked: Bool) {
-    Task {
-        do {
-            let updatedMember = try await apiBlockMemberForAll(gInfo.groupId, member.groupMemberId, blocked)
-            await MainActor.run {
-                _ = ChatModel.shared.upsertGroupMember(gInfo, updatedMember)
-            }
-        } catch let error {
-            logger.error("apiBlockMemberForAll error: \(responseError(error))")
-        }
-    }
-}
-
 struct GroupMemberInfoView_Previews: PreviewProvider {
     static var previews: some View {
         GroupMemberInfoView(
             groupInfo: GroupInfo.sampleData,
-            groupMember: GMember.sampleData
+            member: GroupMember.sampleData
         )
     }
 }

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

@@ -27,8 +27,8 @@ struct GroupPreferencesView: View {
                 featureSection(.directMessages, $preferences.directMessages.enable)
                 featureSection(.reactions, $preferences.reactions.enable)
                 featureSection(.voice, $preferences.voice.enable)
-                featureSection(.files, $preferences.files.enable)
+//                TODO uncomment in 5.3
-                featureSection(.history, $preferences.history.enable)
+//                featureSection(.files, $preferences.files.enable)
 
                 if groupInfo.canEdit {
                     Section {
@@ -97,6 +97,7 @@ struct GroupPreferencesView: View {
             }
         } footer: {
             Text(feature.enableDescription(enableFeature.wrappedValue, groupInfo.canEdit))
+                .frame(height: 36, alignment: .topLeading)
         }
     }
 

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

@@ -9,18 +9,6 @@
 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
@@ -30,7 +18,8 @@ struct GroupProfileView: View {
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
-    @State private var alert: GroupProfileAlert?
+    @State private var showSaveErrorAlert = false
+    @State private var saveGroupError: String? = nil
     @FocusState private var focusDisplayName
 
     var body: some View {
@@ -58,29 +47,20 @@ struct GroupProfileView: View {
             .frame(maxWidth: .infinity, alignment: .center)
 
             VStack(alignment: .leading) {
-                ZStack(alignment: .topLeading) {
+                ZStack(alignment: .leading) {
-                    if !validNewProfileName() {
+                    if !validDisplayName(groupProfile.displayName) {
-                        Button {
+                        Image(systemName: "exclamationmark.circle")
-                            alert = .invalidName(validName: mkValidName(groupProfile.displayName))
+                            .foregroundColor(.red)
-                        } label: {
+                            .padding(.bottom, 10)
-                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                        }
-                    } else {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                     }
                     profileNameTextEdit("Group display name", $groupProfile.displayName)
                         .focused($focusDisplayName)
                 }
-                .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(!canUpdateProfile())
+                        .disabled(groupProfile.displayName == "" || !validDisplayName(groupProfile.displayName))
                 }
             }
             .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -103,10 +83,8 @@ struct GroupProfileView: View {
             }
         }
         .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) { _ in
+            LibraryImagePicker(image: $chosenImage) {
-                await MainActor.run {
+                didSelectItem in showImagePicker = false
-                    showImagePicker = false
-                }
             }
         }
         .onChange(of: chosenImage) { image in
@@ -121,39 +99,27 @@ struct GroupProfileView: View {
                 focusDisplayName = true
             }
         }
-        .alert(item: $alert) { a in
+        .alert(isPresented: $showSaveErrorAlert) {
-            switch a {
+            Alert(
-            case let .saveError(err):
-                return Alert(
                 title: Text("Error saving group profile"),
-                    message: Text(err)
+                message: Text("\(saveGroupError ?? "Unexpected error")")
             )
-            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)
-            .padding(.leading, 32)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.bottom)
+            .padding(.leading, 28)
     }
 
     func saveProfile() {
         Task {
             do {
-                groupProfile.displayName = groupProfile.displayName.trimmingCharacters(in: .whitespaces)
                 let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
                 await MainActor.run {
                     groupInfo = gInfo
@@ -162,7 +128,8 @@ struct GroupProfileView: View {
                 }
             } catch let error {
                 let err = responseError(error)
-                alert = .saveError(err: err)
+                saveGroupError = err
+                showSaveErrorAlert = true
                 logger.error("GroupProfile apiUpdateGroup error: \(err)")
             }
         }

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

@@ -11,32 +11,29 @@ import SimpleXChat
 
 struct GroupWelcomeView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
+    @EnvironmentObject private var m: ChatModel
+    var groupId: Int64
     @Binding var groupInfo: GroupInfo
-    @State var groupProfile: GroupProfile
+    @State private var welcomeText: String = ""
-    @State var welcomeText: String
     @State private var editMode = true
     @FocusState private var keyboardVisible: Bool
     @State private var showSaveDialog = false
 
-    let maxByteCount = 1200
-
     var body: some View {
         VStack {
             if groupInfo.canEdit {
                 editorView()
                     .modifier(BackButton {
-                        if welcomeTextUnchanged() {
+                        if welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil) {
                             dismiss()
                         } else {
                             showSaveDialog = true
                         }
                     })
-                    .confirmationDialog(
+                    .confirmationDialog("Save welcome message?", isPresented: $showSaveDialog) {
-                        welcomeTextFitsLimit() ? "Save welcome message?" : "Welcome message is too long",
+                        Button("Save and update group profile") {
-                        isPresented: $showSaveDialog
+                            save()
-                    ) {
+                            dismiss()
-                        if welcomeTextFitsLimit() {
-                            Button("Save and update group profile") { save() }
                         }
                         Button("Exit without saving") { dismiss() }
                     }
@@ -50,15 +47,15 @@ struct GroupWelcomeView: View {
             }
         }
         .onAppear {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+            welcomeText = groupInfo.groupProfile.description ?? ""
             keyboardVisible = true
         }
     }
-    }
 
     private func textPreview() -> some View {
-        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false)
+        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil)
-            .frame(minHeight: 130, alignment: .topLeading)
+            .allowsHitTesting(false)
+            .frame(minHeight: 140, alignment: .topLeading)
             .frame(maxWidth: .infinity, alignment: .leading)
     }
 
@@ -78,7 +75,7 @@ struct GroupWelcomeView: View {
                         }
                         .padding(.horizontal, -5)
                         .padding(.top, -8)
-                        .frame(height: 130, alignment: .topLeading)
+                        .frame(height: 140, alignment: .topLeading)
                         .frame(maxWidth: .infinity, alignment: .leading)
                     }
                 } else {
@@ -97,9 +94,6 @@ struct GroupWelcomeView: View {
                 }
                 .disabled(welcomeText.isEmpty)
                 copyButton()
-            } footer: {
-                Text(!welcomeTextFitsLimit() ? "Message too large" : "")
-                    .foregroundColor(.red)
             }
 
             Section {
@@ -120,15 +114,7 @@ struct GroupWelcomeView: View {
         Button("Save and update group profile") {
             save()
         }
-        .disabled(welcomeTextUnchanged() || !welcomeTextFitsLimit())
+        .disabled(welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil))
-    }
-
-    private func welcomeTextUnchanged() -> Bool {
-        welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil)
-    }
-
-    private func welcomeTextFitsLimit() -> Bool {
-        chatJsonLength(welcomeText) <= maxByteCount
     }
 
     private func save() {
@@ -138,13 +124,11 @@ struct GroupWelcomeView: View {
                 if welcome?.count == 0 {
                     welcome = nil
                 }
-                groupProfile.description = welcome
+                var groupProfileUpdated = groupInfo.groupProfile
-                let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
+                groupProfileUpdated.description = welcome
-                await MainActor.run {
+                groupInfo = try await apiUpdateGroup(groupId, groupProfileUpdated)
-                    groupInfo = gInfo
+                m.updateGroup(groupInfo)
-                    ChatModel.shared.updateGroup(gInfo)
+                welcomeText = welcome ?? ""
-                    dismiss()
-                }
             } catch let error {
                 logger.error("apiUpdateGroup error: \(responseError(error))")
             }
@@ -154,6 +138,6 @@ struct GroupWelcomeView: View {
 
 struct GroupWelcomeView_Previews: PreviewProvider {
     static var previews: some View {
-        GroupProfileView(groupInfo: Binding.constant(GroupInfo.sampleData), groupProfile: GroupProfile.sampleData)
+        GroupWelcomeView(groupId: 1, groupInfo: Binding.constant(GroupInfo.sampleData))
     }
 }

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

@@ -17,7 +17,7 @@ struct ScanCodeView: View {
 
     var body: some View {
         VStack(alignment: .leading) {
-            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
                 .aspectRatio(1, contentMode: .fit)
                 .cornerRadius(12)
             Text("Scan security code from your contact's app.")

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

@@ -11,7 +11,7 @@ import SwiftUI
 struct ChatHelp: View {
     @EnvironmentObject var chatModel: ChatModel
     @Binding var showSettings: Bool
-    @State private var newChatMenuOption: NewChatMenuOption? = nil
+    @State private var showAddChat = false
 
     var body: some View {
         ScrollView { chatHelp() }
@@ -39,12 +39,13 @@ struct ChatHelp: View {
 
                 HStack(spacing: 8) {
                     Text("Tap button ")
-                    NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
+                    NewChatButton(showAddChat: $showAddChat)
                     Text("above, then choose:")
                 }
 
-                Text("**Add contact**: to create a new invitation link, or connect via a link you received.")
+                Text("**Create link / QR code** for your contact to use.")
-                Text("**Create group**: to create a new group.")
+                Text("**Paste received link** or open it in the browser and tap **Open in mobile app**.")
+                Text("**Scan QR code**: to connect to your contact in person or via video call.")
             }
             .padding(.top, 24)
 

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

@@ -32,20 +32,13 @@ 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 showConnectContactViaAddressDialog = false
-    @State private var inProgress = false
-    @State private var progressByTimeout = false
 
     var body: some View {
-        Group {
         switch chat.chatInfo {
         case let .direct(contact):
             contactNavLink(contact)
         case let .group(groupInfo):
             groupNavLink(groupInfo)
-            case let .local(noteFolder):
-                noteFolderNavLink(noteFolder)
         case let .contactRequest(cReq):
             contactRequestNavLink(cReq)
         case let .contactConnection(cConn):
@@ -54,40 +47,12 @@ struct ChatListNavLink: View {
             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 {
-        Group {
-            if contact.activeConn == nil && contact.profile.contactLink != nil {
-                ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
-                    .frame(height: rowHeights[dynamicTypeSize])
-                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-                        Button {
-                            showDeleteContactActionSheet = true
-                        } label: {
-                            Label("Delete", systemImage: "trash")
-                        }
-                        .tint(.red)
-                    }
-                    .onTapGesture { showConnectContactViaAddressDialog = true }
-                    .confirmationDialog("Connect with \(contact.chatViewName)", isPresented: $showConnectContactViaAddressDialog, titleVisibility: .visible) {
-                        Button("Use current profile") { connectContactViaAddress_(contact, false) }
-                        Button("Use new incognito profile") { connectContactViaAddress_(contact, true) }
-                    }
-            } else {
         NavLinkPlain(
             tag: chat.chatInfo.id,
             selection: $chatModel.chatId,
-                    label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
+            label: { ChatPreviewView(chat: chat) }
         )
         .swipeActions(edge: .leading, allowsFullSwipe: true) {
             markReadButton()
@@ -99,11 +64,11 @@ struct ChatListNavLink: View {
                 clearChatButton()
             }
             Button {
-                        if contact.ready || !contact.active {
+                AlertManager.shared.showAlert(
-                            showDeleteContactActionSheet = true
+                    contact.ready
-                        } else {
+                    ? deleteContactAlert(chat.chatInfo)
-                            AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
+                    : deletePendingContactAlert(chat, contact)
-                        }
+                )
             } label: {
                 Label("Delete", systemImage: "trash")
             }
@@ -111,33 +76,11 @@ struct ChatListNavLink: View {
         }
         .frame(height: rowHeights[dynamicTypeSize])
     }
-        }
-        .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()
-                    ]
-                )
-            }
-        }
-    }
 
     @ViewBuilder private func groupNavLink(_ groupInfo: GroupInfo) -> some View {
         switch (groupInfo.membership.memberStatus) {
         case .memInvited:
-            ChatPreviewView(chat: chat, progressByTimeout: $progressByTimeout)
+            ChatPreviewView(chat: chat)
                 .frame(height: rowHeights[dynamicTypeSize])
                 .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                     joinGroupButton()
@@ -148,16 +91,12 @@ struct ChatListNavLink: View {
                 .onTapGesture { showJoinGroupDialog = true }
                 .confirmationDialog("Group invitation", isPresented: $showJoinGroupDialog, titleVisibility: .visible) {
                     Button(chat.chatInfo.incognito ? "Join incognito" : "Join group") {
-                        inProgress = true
+                        joinGroup(groupInfo.groupId)
-                        joinGroup(groupInfo.groupId) {
-                            await MainActor.run { inProgress = false }
-                        }
                     }
                     Button("Delete invitation", role: .destructive) { Task { await deleteChat(chat) } }
                 }
-                .disabled(inProgress)
         case .memAccepted:
-            ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
+            ChatPreviewView(chat: chat)
                 .frame(height: rowHeights[dynamicTypeSize])
                 .onTapGesture {
                     AlertManager.shared.showAlert(groupInvitationAcceptedAlert())
@@ -174,7 +113,7 @@ struct ChatListNavLink: View {
             NavLinkPlain(
                 tag: chat.chatInfo.id,
                 selection: $chatModel.chatId,
-                label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
+                label: { ChatPreviewView(chat: chat) },
                 disabled: !groupInfo.ready
             )
             .frame(height: rowHeights[dynamicTypeSize])
@@ -197,30 +136,9 @@ struct ChatListNavLink: View {
         }
     }
 
-    @ViewBuilder private func noteFolderNavLink(_ noteFolder: NoteFolder) -> some View {
-        NavLinkPlain(
-            tag: chat.chatInfo.id,
-            selection: $chatModel.chatId,
-            label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
-            disabled: !noteFolder.ready
-        )
-        .frame(height: rowHeights[dynamicTypeSize])
-        .swipeActions(edge: .leading, allowsFullSwipe: true) {
-            markReadButton()
-        }
-        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
-            if !chat.chatItems.isEmpty {
-                clearNoteFolderButton()
-            }
-        }
-    }
-
     private func joinGroupButton() -> some View {
         Button {
-            inProgress = true
+            joinGroup(chat.chatInfo.apiId)
-            joinGroup(chat.chatInfo.apiId) {
-                await MainActor.run { inProgress = false }
-            }
         } label: {
             Label("Join", systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward")
         }
@@ -273,15 +191,6 @@ struct ChatListNavLink: View {
         .tint(Color.orange)
     }
 
-    private func clearNoteFolderButton() -> some View {
-        Button {
-            AlertManager.shared.showAlert(clearNoteFolderAlert())
-        } label: {
-            Label("Clear", systemImage: "gobackward")
-        }
-        .tint(Color.orange)
-    }
-
     private func leaveGroupChatButton(_ groupInfo: GroupInfo) -> some View {
         Button {
             AlertManager.shared.showAlert(leaveGroupAlert(groupInfo))
@@ -360,6 +269,17 @@ 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?"),
@@ -386,17 +306,6 @@ struct ChatListNavLink: View {
         )
     }
 
-    private func clearNoteFolderAlert() -> Alert {
-        Alert(
-            title: Text("Clear private notes?"),
-            message: Text("All messages will be deleted - this cannot be undone!"),
-            primaryButton: .destructive(Text("Clear")) {
-                Task { await clearChat(chat) }
-            },
-            secondaryButton: .cancel()
-        )
-    }
-
     private func leaveGroupAlert(_ groupInfo: GroupInfo) -> Alert {
         Alert(
             title: Text("Leave group?"),
@@ -472,17 +381,6 @@ struct ChatListNavLink: View {
                     .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
             }
     }
-
-    private func connectContactViaAddress_(_ contact: Contact, _ incognito: Bool) {
-        Task {
-            let ok = await connectContactViaAddress(contact.contactId, incognito)
-            if ok {
-                await MainActor.run {
-                    chatModel.chatId = contact.id
-                }
-            }
-        }
-    }
 }
 
 func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection, showError: @escaping (ErrorAlert) -> Void, success: @escaping () -> Void = {}) -> Alert {
@@ -511,22 +409,7 @@ func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection,
     )
 }
 
-func connectContactViaAddress(_ contactId: Int64, _ incognito: Bool) async -> Bool {
+func joinGroup(_ groupId: Int64) {
-    let (contact, alert) = await apiConnectContactViaAddress(incognito: incognito, contactId: contactId)
-    if let alert = alert {
-        AlertManager.shared.showAlert(alert)
-        return false
-    } else if let contact = contact {
-        await MainActor.run {
-            ChatModel.shared.updateContact(contact)
-            AlertManager.shared.showAlert(connReqSentAlert(.contact))
-        }
-        return true
-    }
-    return false
-}
-
-func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
     Task {
         logger.debug("joinGroup")
         do {
@@ -541,9 +424,7 @@ func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
                 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

@@ -12,14 +12,9 @@ import SimpleXChat
 struct ChatListView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Binding var showSettings: Bool
-    @State private var searchMode = false
-    @FocusState private var searchFocussed
     @State private var searchText = ""
-    @State private var searchShowingSimplexLink = false
+    @State private var showAddChat = false
-    @State private var searchChatFilteredBySimplexLink: String? = nil
-    @State private var newChatMenuOption: NewChatMenuOption? = nil
     @State private var userPickerVisible = false
-    @State private var showConnectDesktop = false
     @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
 
     var body: some View {
@@ -34,7 +29,7 @@ struct ChatListView: View {
         ZStack(alignment: .topLeading) {
             NavStackCompat(
                 isActive: Binding(
-                    get: { chatModel.chatId != nil },
+                    get: { ChatModel.shared.chatId != nil },
                     set: { _ in }
                 ),
                 destination: chatView
@@ -53,21 +48,18 @@ struct ChatListView: View {
                     }
                 }
             }
-            UserPicker(
+            UserPicker(showSettings: $showSettings, userPickerVisible: $userPickerVisible)
-                showSettings: $showSettings,
-                showConnectDesktop: $showConnectDesktop,
-                userPickerVisible: $userPickerVisible
-            )
-        }
-        .sheet(isPresented: $showConnectDesktop) {
-            ConnectDesktopView()
         }
     }
 
     private var chatListView: some View {
         VStack {
+            if chatModel.chats.count > 0 {
+                chatList.searchable(text: $searchText)
+            } else {
                 chatList
             }
+        }
         .onDisappear() { withAnimation { userPickerVisible = false } }
         .refreshable {
             AlertManager.shared.showAlert(Alert(
@@ -85,9 +77,9 @@ struct ChatListView: View {
                 secondaryButton: .cancel()
             ))
         }
+        .offset(x: -8)
         .listStyle(.plain)
         .navigationBarTitleDisplayMode(.inline)
-        .navigationBarHidden(searchMode)
         .toolbar {
             ToolbarItem(placement: .navigationBarLeading) {
                 let user = chatModel.currentUser ?? User.sampleData
@@ -124,7 +116,7 @@ struct ChatListView: View {
             }
             ToolbarItem(placement: .navigationBarTrailing) {
                 switch chatModel.chatRunning {
-                case .some(true): NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
+                case .some(true): NewChatButton(showAddChat: $showAddChat)
                 case .some(false): chatStoppedIcon()
                 case .none: EmptyView()
                 }
@@ -144,25 +136,11 @@ struct ChatListView: View {
     @ViewBuilder private var chatList: some View {
         let cs = filteredChats()
         ZStack {
-            VStack {
             List {
-                    if !chatModel.chats.isEmpty {
-                        ChatListSearchBar(
-                            searchMode: $searchMode,
-                            searchFocussed: $searchFocussed,
-                            searchText: $searchText,
-                            searchShowingSimplexLink: $searchShowingSimplexLink,
-                            searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
-                        )
-                        .listRowSeparator(.hidden)
-                        .frame(maxWidth: .infinity)
-                    }
                 ForEach(cs, id: \.viewId) { chat in
                     ChatListNavLink(chat: chat)
                         .padding(.trailing, -16)
-                            .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
+                        .disabled(chatModel.chatRunning != true)
-                    }
-                    .offset(x: -8)
                 }
             }
             .onChange(of: chatModel.chatId) { _ in
@@ -196,9 +174,16 @@ struct ChatListView: View {
             .padding(.trailing, 12)
 
             connectButton("Tap to start a new chat") {
-                newChatMenuOption = .newContact
+                showAddChat = true
             }
 
+            connectButton("or chat with the developers") {
+                DispatchQueue.main.async {
+                    UIApplication.shared.open(simplexTeamURL)
+                }
+            }
+            .padding(.top, 10)
+
             Spacer()
             Text("You have no chats")
                 .foregroundColor(.secondary)
@@ -228,10 +213,7 @@ struct ChatListView: View {
     }
 
     private func filteredChats() -> [Chat] {
-        if let linkChatId = searchChatFilteredBySimplexLink {
+        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-            return chatModel.chats.filter { $0.id == linkChatId }
-        } else {
-            let s = searchString()
         return s == "" && !showUnreadAndFavorites
             ? chatModel.chats
             : chatModel.chats.filter { chat in
@@ -247,8 +229,6 @@ struct ChatListView: View {
                     return s == ""
                             ? (filtered(chat) || gInfo.membership.memberStatus == .memInvited)
                             : viewNameContains(cInfo, s)
-                case .local:
-                    return s == "" || viewNameContains(cInfo, s)
                 case .contactRequest:
                     return s == "" || viewNameContains(cInfo, s)
                 case let .contactConnection(conn):
@@ -257,11 +237,6 @@ struct ChatListView: View {
                     return false
                 }
             }
-        }
-
-        func searchString() -> String {
-            searchShowingSimplexLink ? "" : searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-        }
 
         func filtered(_ chat: Chat) -> Bool {
             (chat.chatInfo.chatSettings?.favorite ?? false) || chat.chatStats.unreadCount > 0 || chat.chatStats.unreadChat
@@ -273,121 +248,6 @@ struct ChatListView: View {
     }
 }
 
-struct ChatListSearchBar: View {
-    @EnvironmentObject var m: ChatModel
-    @Binding var searchMode: Bool
-    @FocusState.Binding var searchFocussed: Bool
-    @Binding var searchText: String
-    @Binding var searchShowingSimplexLink: Bool
-    @Binding var searchChatFilteredBySimplexLink: String?
-    @State private var ignoreSearchTextChange = false
-    @State private var showScanCodeSheet = false
-    @State private var alert: PlanAndConnectAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
-
-    var body: some View {
-        VStack(spacing: 12) {
-            HStack(spacing: 12) {
-                HStack(spacing: 4) {
-                    Image(systemName: "magnifyingglass")
-                    TextField("Search or paste SimpleX link", text: $searchText)
-                        .foregroundColor(searchShowingSimplexLink ? .secondary : .primary)
-                        .disabled(searchShowingSimplexLink)
-                        .focused($searchFocussed)
-                        .frame(maxWidth: .infinity)
-                    if !searchText.isEmpty {
-                        Image(systemName: "xmark.circle.fill")
-                            .onTapGesture {
-                                searchText = ""
-                            }
-                    } else if !searchFocussed {
-                        HStack(spacing: 24) {
-                            if m.pasteboardHasStrings {
-                                Image(systemName: "doc")
-                                    .onTapGesture {
-                                        if let str = UIPasteboard.general.string {
-                                            searchText = str
-                                        }
-                                    }
-                            }
-
-                            Image(systemName: "qrcode")
-                                .resizable()
-                                .scaledToFit()
-                                .frame(width: 20, height: 20)
-                                .onTapGesture {
-                                    showScanCodeSheet = true
-                                }
-                        }
-                        .padding(.trailing, 2)
-                    }
-                }
-                .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
-                .foregroundColor(.secondary)
-                .background(Color(.tertiarySystemFill))
-                .cornerRadius(10.0)
-
-                if searchFocussed {
-                    Text("Cancel")
-                        .foregroundColor(.accentColor)
-                        .onTapGesture {
-                            searchText = ""
-                            searchFocussed = false
-                        }
-                }
-            }
-            Divider()
-        }
-        .sheet(isPresented: $showScanCodeSheet) {
-            NewChatView(selection: .connect, showQRCodeScanner: true)
-                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil) // fixes .refreshable in ChatListView affecting nested view
-        }
-        .onChange(of: searchFocussed) { sf in
-            withAnimation { searchMode = sf }
-        }
-        .onChange(of: searchText) { t in
-            if ignoreSearchTextChange {
-                ignoreSearchTextChange = false
-            } else {
-                if let link = strHasSingleSimplexLink(t.trimmingCharacters(in: .whitespaces)) { // if SimpleX link is pasted, show connection dialogue
-                    searchFocussed = false
-                    if case let .simplexLink(linkType, _, smpHosts) = link.format {
-                        ignoreSearchTextChange = true
-                        searchText = simplexLinkText(linkType, smpHosts)
-                    }
-                    searchShowingSimplexLink = true
-                    searchChatFilteredBySimplexLink = nil
-                    connect(link.text)
-                } else {
-                    if t != "" { // if some other text is pasted, enter search mode
-                        searchFocussed = true
-                    }
-                    searchShowingSimplexLink = false
-                    searchChatFilteredBySimplexLink = nil
-                }
-            }
-        }
-        .alert(item: $alert) { a in
-            planAndConnectAlert(a, dismiss: true, cleanup: { searchText = "" })
-        }
-        .actionSheet(item: $sheet) { s in
-            planAndConnectActionSheet(s, dismiss: true, cleanup: { searchText = "" })
-        }
-    }
-
-    private func connect(_ link: String) {
-        planAndConnect(
-            link,
-            showAlert: { alert = $0 },
-            showActionSheet: { sheet = $0 },
-            dismiss: false,
-            incognito: nil,
-            filterKnownContact: { searchChatFilteredBySimplexLink = $0.id },
-            filterKnownGroup: { searchChatFilteredBySimplexLink = $0.id }
-        )
-    }
-}
-
 func chatStoppedIcon() -> some View {
     Button {
         AlertManager.shared.showAlertMsg(

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

@@ -12,8 +12,6 @@ import SimpleXChat
 struct ChatPreviewView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var chat: Chat
-    @Binding var progressByTimeout: Bool
-    @State var deleting: Bool = false
     @Environment(\.colorScheme) var colorScheme
     var darkGreen = Color(red: 0, green: 0.5, blue: 0)
 
@@ -34,7 +32,7 @@ struct ChatPreviewView: View {
                 HStack(alignment: .top) {
                     chatPreviewTitle()
                     Spacer()
-                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.chatTs))
+                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.updatedAt))
                         .font(.subheadline)
                         .frame(minWidth: 60, alignment: .trailing)
                         .foregroundColor(.secondary)
@@ -56,32 +54,22 @@ struct ChatPreviewView: View {
             .frame(maxHeight: .infinity)
         }
         .padding(.bottom, -8)
-        .onChange(of: chatModel.deletedChats.contains(chat.chatInfo.id)) { contains in
-            deleting = contains
-        }
     }
 
     @ViewBuilder private func chatPreviewImageOverlayIcon() -> some View {
-        switch chat.chatInfo {
+        if case let .group(groupInfo) = chat.chatInfo {
-        case let .direct(contact):
-            if !contact.active {
-                inactiveIcon()
-            } else {
-                EmptyView()
-            }
-        case let .group(groupInfo):
             switch (groupInfo.membership.memberStatus) {
-            case .memLeft: inactiveIcon()
+            case .memLeft: groupInactiveIcon()
-            case .memRemoved: inactiveIcon()
+            case .memRemoved: groupInactiveIcon()
-            case .memGroupDeleted: inactiveIcon()
+            case .memGroupDeleted: groupInactiveIcon()
             default: EmptyView()
             }
-        default:
+        } else {
             EmptyView()
         }
     }
 
-    @ViewBuilder private func inactiveIcon() -> some View {
+    @ViewBuilder private func groupInactiveIcon() -> some View {
         Image(systemName: "multiply.circle.fill")
             .foregroundColor(.secondary.opacity(0.65))
             .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
@@ -91,13 +79,14 @@ struct ChatPreviewView: View {
         let t = Text(chat.chatInfo.chatViewName).font(.title3).fontWeight(.bold)
         switch chat.chatInfo {
         case let .direct(contact):
-            previewTitle(contact.verified == true ? verifiedIcon + t : t).foregroundColor(deleting ? Color.secondary : nil)
+            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) {
-            case .memInvited: v.foregroundColor(deleting ? .secondary : chat.chatInfo.incognito ? .indigo : .accentColor)
+            case .memInvited: v.foregroundColor(chat.chatInfo.incognito ? .indigo : .accentColor)
             case .memAccepted: v.foregroundColor(.secondary)
-            default: if deleting  { v.foregroundColor(.secondary) } else { v }
+            default: v
             }
         default: previewTitle(t)
         }
@@ -116,17 +105,14 @@ struct ChatPreviewView: View {
 
     private func chatPreviewLayout(_ text: Text, draft: Bool = false) -> some View {
         ZStack(alignment: .topTrailing) {
-            let t = text
+            text
                 .lineLimit(2)
                 .multilineTextAlignment(.leading)
                 .frame(maxWidth: .infinity, alignment: .topLeading)
                 .padding(.leading, 8)
                 .padding(.trailing, 36)
-            if !showChatPreviews && !draft {
+                .privacySensitive(!showChatPreviews && !draft)
-                t.privacySensitive(true).redacted(reason: .privacy)
+                .redacted(reason: .privacy)
-            } else {
-                t
-            }
             let s = chat.chatStats
             if s.unreadCount > 0 || s.unreadChat {
                 unreadCountText(s.unreadCount)
@@ -134,9 +120,9 @@ struct ChatPreviewView: View {
                     .foregroundColor(.white)
                     .padding(.horizontal, 4)
                     .frame(minWidth: 18, minHeight: 18)
-                    .background(chat.chatInfo.ntfsEnabled || chat.chatInfo.chatType == .local ? Color.accentColor : Color.secondary)
+                    .background(chat.chatInfo.ntfsEnabled ? Color.accentColor : Color.secondary)
                     .cornerRadius(10)
-            } else if !chat.chatInfo.ntfsEnabled && chat.chatInfo.chatType != .local {
+            } else if !chat.chatInfo.ntfsEnabled {
                 Image(systemName: "speaker.slash.fill")
                     .foregroundColor(.secondary)
             } else if chat.chatInfo.chatSettings?.favorite ?? false {
@@ -154,7 +140,7 @@ struct ChatPreviewView: View {
         let msg = draft.message
         return image("rectangle.and.pencil.and.ellipsis", color: .accentColor)
                 + attachment()
-                + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true, showSecrets: false)
+                + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true)
 
         func image(_ s: String, color: Color = Color(uiColor: .tertiaryLabel)) -> Text {
             Text(Image(systemName: s)).foregroundColor(color) + Text(" ")
@@ -171,20 +157,9 @@ struct ChatPreviewView: View {
     }
 
     func chatItemPreview(_ cItem: ChatItem) -> Text {
-        let itemText = cItem.meta.itemDeleted == nil ? cItem.text : markedDeletedText()
+        let itemText = cItem.meta.itemDeleted == nil ? cItem.text : NSLocalizedString("marked deleted", comment: "marked deleted chat item preview text")
         let itemFormattedText = cItem.meta.itemDeleted == nil ? cItem.formattedText : nil
-        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: attachment(), preview: true, showSecrets: false)
+        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: attachment(), preview: true)
-
-        // same texts are in markedDeletedText in MarkedDeletedItemView, but it returns LocalizedStringKey;
-        // can be refactored into a single function if functions calling these are changed to return same type
-        func markedDeletedText() -> String {
-            switch cItem.meta.itemDeleted {
-            case let .moderated(_, byGroupMember): String.localizedStringWithFormat(NSLocalizedString("moderated by %@", comment: "marked deleted chat item preview text"), byGroupMember.displayName)
-            case .blocked: NSLocalizedString("blocked", comment: "marked deleted chat item preview text")
-            case .blockedByAdmin: NSLocalizedString("blocked by admin", comment: "marked deleted chat item preview text")
-            case .deleted, nil: NSLocalizedString("marked deleted", comment: "marked deleted chat item preview text")
-            }
-        }
 
         func attachment() -> String? {
             switch cItem.content.msgContent {
@@ -205,13 +180,10 @@ struct ChatPreviewView: View {
         } else {
             switch (chat.chatInfo) {
             case let .direct(contact):
-                if contact.activeConn == nil && contact.profile.contactLink != nil {
+                if !contact.ready {
-                    chatPreviewInfoText("Tap to Connect")
-                        .foregroundColor(.accentColor)
-                } else if !contact.ready && contact.activeConn != nil {
                     if contact.nextSendGrpInv {
                         chatPreviewInfoText("send direct message")
-                    } else if contact.active {
+                    } else {
                         chatPreviewInfoText("connecting…")
                     }
                 }
@@ -256,7 +228,6 @@ struct ChatPreviewView: View {
     @ViewBuilder private func chatStatusImage() -> some View {
         switch chat.chatInfo {
         case let .direct(contact):
-            if contact.active && contact.activeConn != nil {
             switch (chatModel.contactNetworkStatus(contact)) {
             case .connected: incognitoIcon(chat.chatInfo.incognito)
             case .error:
@@ -268,15 +239,6 @@ struct ChatPreviewView: View {
             default:
                 ProgressView()
             }
-            } else {
-                incognitoIcon(chat.chatInfo.incognito)
-            }
-        case .group:
-            if progressByTimeout {
-                ProgressView()
-            } else {
-                incognitoIcon(chat.chatInfo.incognito)
-            }
         default:
             incognitoIcon(chat.chatInfo.incognito)
         }
@@ -305,30 +267,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 {
-                        SimpleXLinkQRCode(uri: simplexChatLink(connReqInv))
+                        QRCode(uri: 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
-                        m.updateContactConnection(conn)
+                        ChatModel.shared.updateContactConnection(conn)
                         dismiss()
                     }
                 }
@@ -164,28 +164,6 @@ struct ContactConnectionInfo: View {
     }
 }
 
-private func shareLinkButton(_ connReqInvitation: String) -> some View {
-    Button {
-        showShareSheet(items: [simplexChatLink(connReqInvitation)])
-    } label: {
-        settingsRow("square.and.arrow.up") {
-            Text("Share 1-time link")
-        }
-    }
-}
-
-private func oneTimeLinkLearnMoreButton() -> some View {
-    NavigationLink {
-        AddContactLearnMore(showTitle: false)
-            .navigationTitle("One-time invitation link")
-            .navigationBarTitleDisplayMode(.large)
-    } label: {
-        settingsRow("info.circle") {
-            Text("Learn more")
-        }
-    }
-}
-
 struct ContactConnectionInfo_Previews: PreviewProvider {
     static var previews: some View {
         ContactConnectionInfo(contactConnection: PendingContactConnection.getSampleData())

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

@@ -13,7 +13,6 @@ struct UserPicker: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme
     @Binding var showSettings: Bool
-    @Binding var showConnectDesktop: Bool
     @Binding var userPickerVisible: Bool
     @State var scrollViewContentSize: CGSize = .zero
     @State var disableScrolling: Bool = true
@@ -63,13 +62,6 @@ struct UserPicker: View {
                 .simultaneousGesture(DragGesture(minimumDistance: disableScrolling ? 0 : 10000000))
                 .frame(maxHeight: scrollViewContentSize.height)
 
-                menuButton("Use from desktop", icon: "desktopcomputer") {
-                    showConnectDesktop = true
-                    withAnimation {
-                        userPickerVisible.toggle()
-                    }
-                }
-                Divider()
                 menuButton("Settings", icon: "gearshape") {
                     showSettings = true
                     withAnimation {
@@ -93,7 +85,7 @@ struct UserPicker: View {
             do {
                 m.users = try listUsers()
             } catch let error {
-                logger.error("Error loading users \(responseError(error))")
+                logger.error("Error updating users \(responseError(error))")
             }
         }
     }
@@ -152,8 +144,7 @@ struct UserPicker: View {
                     .overlay(DetermineWidth())
                 Spacer()
                 Image(systemName: icon)
-                    .symbolRenderingMode(.monochrome)
+//                    .frame(width: 24, alignment: .center)
-                    .foregroundColor(.secondary)
             }
             .padding(.horizontal)
             .padding(.vertical, 22)
@@ -179,7 +170,6 @@ struct UserPicker_Previews: PreviewProvider {
         m.users = [UserInfo.sampleData, UserInfo.sampleData]
         return UserPicker(
             showSettings: Binding.constant(false),
-            showConnectDesktop: Binding.constant(false),
             userPickerVisible: Binding.constant(true)
         )
         .environmentObject(m)

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

@@ -149,7 +149,7 @@ struct DatabaseErrorView: View {
     private func runChatSync(confirmMigrations: MigrationConfirmation? = nil) {
         do {
             resetChatCtrl()
-            try initializeChat(start: m.v3DBMigration.startChat, confirmStart: m.v3DBMigration.startChat && AppChatState.shared.value == .stopped, dbKey: useKeychain ? nil : dbKey, confirmMigrations: confirmMigrations)
+            try initializeChat(start: m.v3DBMigration.startChat, dbKey: useKeychain ? nil : dbKey, confirmMigrations: confirmMigrations)
             if let s = m.chatDbStatus {
                 status = s
                 let am = AlertManager.shared

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

@@ -415,7 +415,7 @@ struct DatabaseView: View {
                 do {
                     try initializeChat(start: true)
                     m.chatDbChanged = false
-                    AppChatState.shared.set(.active)
+                    appStateGroupDefault.set(.active)
                 } catch let error {
                     fatalError("Error starting chat \(responseError(error))")
                 }
@@ -427,7 +427,7 @@ struct DatabaseView: View {
                 m.chatRunning = true
                 ChatReceiver.shared.start()
                 chatLastStartGroupDefault.set(Date.now)
-                AppChatState.shared.set(.active)
+                appStateGroupDefault.set(.active)
             } catch let error {
                 runChat = false
                 alert = .error(title: "Error starting chat", error: responseError(error))
@@ -477,14 +477,13 @@ func stopChatAsync() async throws {
     try await apiStopChat()
     ChatReceiver.shared.stop()
     await MainActor.run { ChatModel.shared.chatRunning = false }
-    AppChatState.shared.set(.stopped)
+    appStateGroupDefault.set(.stopped)
 }
 
 func deleteChatAsync() async throws {
     try await apiDeleteStorage()
     _ = kcDatabasePassword.remove()
     storeDBPassphraseGroupDefault.set(true)
-    deleteAppDatabaseAndFiles()
 }
 
 struct DatabaseView_Previews: PreviewProvider {

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

@@ -10,7 +10,6 @@ import SwiftUI
 import SimpleXChat
 
 struct ChatInfoImage: View {
-    @Environment(\.colorScheme) var colorScheme
     @ObservedObject var chat: Chat
     var color = Color(uiColor: .tertiarySystemGroupedBackground)
 
@@ -19,16 +18,13 @@ struct ChatInfoImage: View {
         switch chat.chatInfo {
         case .direct: iconName = "person.crop.circle.fill"
         case .group: iconName = "person.2.circle.fill"
-        case .local: iconName = "folder.circle.fill"
         case .contactRequest: iconName = "person.crop.circle.fill"
         default: iconName = "circle.fill"
         }
-        let notesColor = colorScheme == .light ? notesChatColorLight : notesChatColorDark
-        let iconColor = if case .local = chat.chatInfo { notesColor } else { color }
         return ProfileImage(
             imageStr: chat.chatInfo.image,
             iconName: iconName,
-            color: iconColor
+            color: color
         )
     }
 }

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

@@ -13,130 +13,112 @@ import SimpleXChat
 
 struct LibraryImagePicker: View {
     @Binding var image: UIImage?
-    var didFinishPicking: (_ didSelectImage: Bool) async -> Void
+    var didFinishPicking: (_ didSelectItems: Bool) -> Void
-    @State var mediaAdded = false
+    @State var images: [UploadContent] = []
 
     var body: some View {
-        LibraryMediaListPicker(addMedia: addMedia, selectionLimit: 1, didFinishPicking: didFinishPicking)
+        LibraryMediaListPicker(media: $images, selectionLimit: 1, didFinishPicking: didFinishPicking)
+            .onChange(of: images) { _ in
+                if let img = images.first {
+                    image = img.uiImage
                 }
-
-    private func addMedia(_ content: UploadContent) async {
-        if mediaAdded { return }
-        await MainActor.run {
-            mediaAdded = true
-            image = content.uiImage
             }
     }
 }
 
 struct LibraryMediaListPicker: UIViewControllerRepresentable {
     typealias UIViewControllerType = PHPickerViewController
-    var addMedia: (_ content: UploadContent) async -> Void
+    @Binding var media: [UploadContent]
     var selectionLimit: Int
-    var finishedPreprocessing: () -> Void = {}
+    var didFinishPicking: (_ didSelectItems: Bool) -> Void
-    var didFinishPicking: (_ didSelectItems: Bool) async -> Void
 
     class Coordinator: PHPickerViewControllerDelegate {
         let parent: LibraryMediaListPicker
         let dispatchQueue = DispatchQueue(label: "chat.simplex.app.LibraryMediaListPicker")
+        var media: [UploadContent] = []
+        var mediaCount: Int = 0
 
         init(_ parent: LibraryMediaListPicker) {
             self.parent = parent
         }
 
         func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
-            Task {
+            parent.didFinishPicking(!results.isEmpty)
-                await parent.didFinishPicking(!results.isEmpty)
+            guard !results.isEmpty else {
-                if results.isEmpty { return }
+                return
-                for r in results {
-                    await loadItem(r.itemProvider)
-                }
-                parent.finishedPreprocessing()
-            }
             }
 
-        private func loadItem(_ p: NSItemProvider) async {
+            parent.media = []
-            logger.debug("LibraryMediaListPicker result")
+            media = []
+            mediaCount = results.count
+            for result in results {
+                logger.log("LibraryMediaListPicker result")
+                let p = result.itemProvider
                 if p.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
-                if let video = await loadVideo(p) {
+                    p.loadFileRepresentation(forTypeIdentifier: UTType.movie.identifier) { url, error in
-                    await self.parent.addMedia(video)
+                        if let url = url {
-                    logger.debug("LibraryMediaListPicker: added video")
+                            let tempUrl = URL(fileURLWithPath: getTempFilesDirectory().path + "/" + generateNewFileName("video", url.pathExtension))
+                            if ((try? FileManager.default.copyItem(at: url, to: tempUrl)) != nil) {
+                                ChatModel.shared.filesToDelete.insert(tempUrl)
+                                self.loadVideo(url: tempUrl, error: error)
+                            }
+                        }
                     }
                 } else if p.hasItemConformingToTypeIdentifier(UTType.data.identifier) {
-                if let img = await loadImageData(p) {
+                    p.loadFileRepresentation(forTypeIdentifier: UTType.data.identifier) { url, error in
-                    await self.parent.addMedia(img)
+                        self.loadImage(object: url, error: error)
-                    logger.debug("LibraryMediaListPicker: added image")
                     }
                 } else if p.canLoadObject(ofClass: UIImage.self) {
-                if let img = await loadImage(p) {
+                    p.loadObject(ofClass: UIImage.self)  { image, error in
-                    await self.parent.addMedia(.simpleImage(image: img))
+                        DispatchQueue.main.async {
-                    logger.debug("LibraryMediaListPicker: added image")
+                            self.loadImage(object: image, error: error)
                         }
                     }
-        }
-
-        private func loadImageData(_ p: NSItemProvider) async -> UploadContent? {
-            await withCheckedContinuation { cont in
-                loadFileURL(p, type: UTType.data) { url in
-                    if let url = url {
-                        let img = UploadContent.loadFromURL(url: url)
-                        cont.resume(returning: img)
                 } else {
-                        cont.resume(returning: nil)
+                    dispatchQueue.sync { self.mediaCount -= 1}
+                }
+            }
+            DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
+                self.dispatchQueue.sync {
+                    if self.parent.media.count == 0 {
+                        logger.log("LibraryMediaListPicker: added \(self.media.count) images out of \(results.count)")
+                        self.parent.media = self.media
                     }
                 }
             }
         }
 
-        private func loadImage(_ p: NSItemProvider) async -> UIImage? {
+        func loadImage(object: Any?, error: Error? = nil) {
-            await withCheckedContinuation { cont in
+            if let error = error {
-                p.loadObject(ofClass: UIImage.self)  { obj, err in
+                logger.error("LibraryMediaListPicker: couldn't load image with error: \(error.localizedDescription)")
-                    if let err = err {
+            } else if let image = object as? UIImage {
-                        logger.error("LibraryMediaListPicker result image error: \(err.localizedDescription)")
+                media.append(.simpleImage(image: image))
-                        cont.resume(returning: nil)
+                logger.log("LibraryMediaListPicker: added image")
-                    } else  {
+            } else if let url = object as? URL, let image = UploadContent.loadFromURL(url: url) {
-                        cont.resume(returning: obj as? UIImage)
+                media.append(image)
             }
+            dispatchQueue.sync {
+                self.mediaCount -= 1
+                if self.mediaCount == 0 && self.parent.media.count == 0 {
+                    logger.log("LibraryMediaListPicker: added all media")
+                    self.parent.media = self.media
+                    self.media = []
                 }
             }
         }
 
-        private func loadVideo(_ p: NSItemProvider) async -> UploadContent? {
+        func loadVideo(url: URL?, error: Error? = nil) {
-            await withCheckedContinuation { cont in
+            if let error = error {
-                loadFileURL(p, type: UTType.movie) { url in
+                logger.error("LibraryMediaListPicker: couldn't load video with error: \(error.localizedDescription)")
-                    if let url = url  {
+            } else if let url = url as URL?, let video = UploadContent.loadVideoFromURL(url: url) {
-                        let tempUrl = URL(fileURLWithPath: generateNewFileName(getTempFilesDirectory().path + "/" + "rawvideo", url.pathExtension, fullPath: true))
+                media.append(video)
-                        let convertedVideoUrl = URL(fileURLWithPath: generateNewFileName(getTempFilesDirectory().path + "/" + "video", "mp4", fullPath: true))
-                        do {
-//                          logger.debug("LibraryMediaListPicker copyItem \(url) to \(tempUrl)")
-                            try FileManager.default.copyItem(at: url, to: tempUrl)
-                        } catch let err {
-                            logger.error("LibraryMediaListPicker copyItem error: \(err.localizedDescription)")
-                            return cont.resume(returning: nil)
             }
-                        Task {
+            dispatchQueue.sync {
-                            let success = await makeVideoQualityLower(tempUrl, outputUrl: convertedVideoUrl)
+                self.mediaCount -= 1
-                            try? FileManager.default.removeItem(at: tempUrl)
+                if self.mediaCount == 0 && self.parent.media.count == 0 {
-                            if success {
+                    logger.log("LibraryMediaListPicker: added all media")
-                                _ = ChatModel.shared.filesToDelete.insert(convertedVideoUrl)
+                    self.parent.media = self.media
-                                let video = UploadContent.loadVideoFromURL(url: convertedVideoUrl)
+                    self.media = []
-                                return cont.resume(returning: video)
-                            }
-                            try? FileManager.default.removeItem(at: convertedVideoUrl)
-                            cont.resume(returning: nil)
-                        }
-                    }
-                }
-            }
-        }
-
-        private func loadFileURL(_ p: NSItemProvider, type: UTType, completion: @escaping (URL?) -> Void) {
-            p.loadFileRepresentation(forTypeIdentifier: type.identifier) { url, err in
-                if let err = err {
-                    logger.error("LibraryMediaListPicker loadFileURL error: \(err.localizedDescription)")
-                    completion(nil)
-                } else {
-                    completion(url)
                 }
             }
         }

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

@@ -6,7 +6,6 @@
 import Foundation
 import SwiftUI
 import AVKit
-import Combine
 
 struct VideoPlayerView: UIViewRepresentable {
 
@@ -38,14 +37,6 @@ struct VideoPlayerView: UIViewRepresentable {
             player.seek(to: CMTime.zero)
             player.play()
         }
-        var played = false
-        context.coordinator.publisher = player.publisher(for: \.timeControlStatus).sink { status in
-            if played || status == .playing {
-                AppDelegate.keepScreenOn(status == .playing)
-                AudioPlayer.changeAudioSession(status == .playing)
-            }
-            played = status == .playing
-        }
         return controller.view
     }
 
@@ -59,13 +50,12 @@ struct VideoPlayerView: UIViewRepresentable {
     class Coordinator: NSObject {
         var controller: AVPlayerViewController?
         var timeObserver: Any? = nil
-        var publisher: AnyCancellable? = nil
 
         deinit {
+            print("deinit coordinator of VideoPlayer")
             if let timeObserver = timeObserver {
                 NotificationCenter.default.removeObserver(timeObserver)
             }
-            publisher?.cancel()
         }
     }
 }

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

@@ -1,26 +0,0 @@
-//
-//  VideoUtils.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 25.12.2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import AVFoundation
-import Foundation
-import SimpleXChat
-
-func makeVideoQualityLower(_ input: URL, outputUrl: URL) async -> Bool {
-    let asset: AVURLAsset = AVURLAsset(url: input, options: nil)
-    if let s = AVAssetExportSession(asset: asset, presetName: AVAssetExportPreset640x480) {
-        s.outputURL = outputUrl
-        s.outputFileType = .mp4
-        s.metadataItemFilter = AVMetadataItemFilter.forSharing()
-        await s.export()
-        if let err = s.error {
-            logger.error("Failed to export video with error: \(err)")
-        }
-        return s.status == .completed
-    }
-    return false
-}

apps/ios/Shared/Views/LocalAuth/LocalAuthView.swift

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

apps/ios/Shared/Views/LocalAuth/PasscodeView.swift

@@ -14,8 +14,6 @@ struct PasscodeView: View {
     var reason: String? = nil
     var submitLabel: LocalizedStringKey
     var submitEnabled: ((String) -> Bool)?
-    @Binding var buttonsEnabled: Bool
-
     var submit: () -> Void
     var cancel: () -> Void
 
@@ -72,11 +70,11 @@ struct PasscodeView: View {
     @ViewBuilder private func buttonsView() -> some View {
         Button(action: cancel) {
             Label("Cancel", systemImage: "multiply")
-        }.disabled(!buttonsEnabled)
+        }
         Button(action: submit) {
             Label(submitLabel, systemImage: "checkmark")
         }
-        .disabled(submitEnabled?(passcode) == false || passcode.count < 4 || !buttonsEnabled)
+        .disabled(submitEnabled?(passcode) == false || passcode.count < 4)
     }
 }
 
@@ -87,7 +85,6 @@ struct PasscodeViewView_Previews: PreviewProvider {
             title: "Enter Passcode",
             reason: "Unlock app",
             submitLabel: "Submit",
-            buttonsEnabled: Binding.constant(true),
             submit: {},
             cancel: {}
         )

apps/ios/Shared/Views/LocalAuth/SetAppPasscodeView.swift

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct SetAppPasscodeView: View {
     var passcodeKeychain: KeyChainItem = kcAppPassword
-    var prohibitedPasscodeKeychain: KeyChainItem = kcSelfDestructPassword
     var title: LocalizedStringKey = "New Passcode"
     var reason: String?
     var submit: () -> Void
@@ -42,10 +41,7 @@ struct SetAppPasscodeView: View {
                     }
                 }
             } else {
-                setPasswordView(title: title,
+                setPasswordView(title: title, submitLabel: "Save") {
-                                submitLabel: "Save",
-                                // Do not allow to set app passcode == selfDestruct passcode
-                                submitEnabled: { pwd in pwd != prohibitedPasscodeKeychain.get() }) {
                     enteredPassword = passcode
                     passcode = ""
                     confirming = true
@@ -58,7 +54,7 @@ struct SetAppPasscodeView: View {
     }
 
     private func setPasswordView(title: LocalizedStringKey, submitLabel: LocalizedStringKey, submitEnabled: (((String) -> Bool))? = nil, submit: @escaping () -> Void) -> some View {
-        PasscodeView(passcode: $passcode, title: title, reason: reason, submitLabel: submitLabel, submitEnabled: submitEnabled, buttonsEnabled: Binding.constant(true), submit: submit) {
+        PasscodeView(passcode: $passcode, title: title, reason: reason, submitLabel: submitLabel, submitEnabled: submitEnabled, submit: submit) {
             dismiss()
             cancel()
         }

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

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

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

@@ -0,0 +1,129 @@
+//
+//  AddContactView.swift
+//  SimpleX
+//
+//  Created by Evgeny Poberezkin on 29/01/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import CoreImage.CIFilterBuiltins
+import SimpleXChat
+
+struct AddContactView: View {
+    @EnvironmentObject private var chatModel: ChatModel
+    @Binding var contactConnection: PendingContactConnection?
+    var connReqInvitation: String
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+
+    var body: some View {
+        VStack {
+            List {
+                Section {
+                    if connReqInvitation != "" {
+                        QRCode(uri: connReqInvitation)
+                    } else {
+                        ProgressView()
+                            .progressViewStyle(.circular)
+                            .scaleEffect(2)
+                            .frame(maxWidth: .infinity)
+                            .padding(.vertical)
+                    }
+                    IncognitoToggle(incognitoEnabled: $incognitoDefault)
+                        .disabled(contactConnection == nil)
+                    shareLinkButton(connReqInvitation)
+                    oneTimeLinkLearnMoreButton()
+                } header: {
+                    Text("1-time link")
+                } footer: {
+                    sharedProfileInfo(incognitoDefault)
+                }
+            }
+        }
+        .onAppear { chatModel.connReqInv = connReqInvitation }
+        .onChange(of: incognitoDefault) { incognito in
+            Task {
+                do {
+                    if let contactConn = contactConnection,
+                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
+                        await MainActor.run {
+                            contactConnection = conn
+                            ChatModel.shared.updateContactConnection(conn)
+                        }
+                    }
+                } catch {
+                    logger.error("apiSetConnectionIncognito error: \(responseError(error))")
+                }
+            }
+        }
+    }
+}
+
+struct IncognitoToggle: View {
+    @Binding var incognitoEnabled: Bool
+    @State private var showIncognitoSheet = false
+
+    var body: some View {
+        ZStack(alignment: .leading) {
+            Image(systemName: incognitoEnabled ? "theatermasks.fill" : "theatermasks")
+                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+                .foregroundColor(incognitoEnabled ? Color.indigo : .secondary)
+                .font(.system(size: 14))
+            Toggle(isOn: $incognitoEnabled) {
+                HStack(spacing: 6) {
+                    Text("Incognito")
+                    Image(systemName: "info.circle")
+                        .foregroundColor(.accentColor)
+                        .font(.system(size: 14))
+                }
+                .onTapGesture {
+                    showIncognitoSheet = true
+                }
+            }
+            .padding(.leading, 36)
+        }
+        .sheet(isPresented: $showIncognitoSheet) {
+            IncognitoHelp()
+        }
+    }
+}
+
+func sharedProfileInfo(_ incognito: Bool) -> Text {
+    let name = ChatModel.shared.currentUser?.displayName ?? ""
+    return Text(
+        incognito
+        ? "A new random profile will be shared."
+        : "Your profile **\(name)** will be shared."
+    )
+}
+
+func shareLinkButton(_ connReqInvitation: String) -> some View {
+    Button {
+        showShareSheet(items: [connReqInvitation])
+    } label: {
+        settingsRow("square.and.arrow.up") {
+            Text("Share 1-time link")
+        }
+    }
+}
+
+func oneTimeLinkLearnMoreButton() -> some View {
+    NavigationLink {
+        AddContactLearnMore()
+            .navigationTitle("One-time invitation link")
+            .navigationBarTitleDisplayMode(.large)
+    } label: {
+        settingsRow("info.circle") {
+            Text("Learn more")
+        }
+    }
+}
+
+struct AddContactView_Previews: PreviewProvider {
+    static var previews: some View {
+        AddContactView(
+            contactConnection: Binding.constant(PendingContactConnection.getSampleData()),
+            connReqInvitation: "https://simplex.chat/invitation#/?v=1&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FFe5ICmvrm4wkrr6X1LTMii-lhBqLeB76%23MCowBQYDK2VuAyEAdhZZsHpuaAk3Hh1q0uNb_6hGTpuwBIrsp2z9U2T0oC0%3D&e2e=v%3D1%26x3dh%3DMEIwBQYDK2VvAzkAcz6jJk71InuxA0bOX7OUhddfB8Ov7xwQIlIDeXBRZaOntUU4brU5Y3rBzroZBdQJi0FKdtt_D7I%3D%2CMEIwBQYDK2VvAzkA-hDvk1duBi1hlOr08VWSI-Ou4JNNSQjseY69QyKm7Kgg1zZjbpGfyBqSZ2eqys6xtoV4ZtoQUXQ%3D"
+        )
+    }
+}

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

@@ -12,22 +12,18 @@ 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 {
-            if !groupInfo.membership.memberIncognito {
             AddGroupMembersViewCommon(
                 chat: chat,
                 groupInfo: groupInfo,
@@ -39,40 +35,29 @@ struct AddGroupView: View {
                     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 {
             createGroupView().keyboardPadding()
         }
     }
 
     func createGroupView() -> some View {
-        List {
+        VStack(alignment: .leading) {
-            Group {
             Text("Create secret group")
                 .font(.largeTitle)
-                    .bold()
+                .padding(.vertical, 4)
-                    .fixedSize(horizontal: false, vertical: true)
+            Text("The group is fully decentralized – it is visible only to the members.")
-                    .padding(.bottom, 24)
+                .padding(.bottom, 4)
-                    .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) {
-                        ProfileImage(imageStr: profile.image, color: Color(uiColor: .secondarySystemGroupedBackground))
+                    profileImageView(profile.image)
-                            .aspectRatio(1, contentMode: .fit)
-                            .frame(maxWidth: 128, maxHeight: 128)
                     if profile.image != nil {
                         Button {
                             profile.image = nil
@@ -86,35 +71,49 @@ struct AddGroupView: View {
                 }
 
                 editImageButton { showChooseSource = true }
-                        .buttonStyle(BorderlessButtonStyle()) // otherwise whole "list row" is clickable
             }
             .frame(maxWidth: .infinity, alignment: .center)
-            }
+            .padding(.bottom, 4)
-            .listRowBackground(Color.clear)
-            .listRowSeparator(.hidden)
-            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
 
-            Section {
+            ZStack(alignment: .topLeading) {
-                groupNameTextField()
+                if !validDisplayName(profile.displayName) {
-                Button(action: createGroup) {
+                    Image(systemName: "exclamationmark.circle")
-                    settingsRow("checkmark", color: .accentColor) { Text("Create group") }
+                        .foregroundColor(.red)
+                        .padding(.top, 4)
+                }
+                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 }
+                }
+
+            Spacer()
+
+            Button {
+                createGroup()
+            } label: {
+                Text("Create")
+                Image(systemName: "greaterthan")
             }
             .disabled(!canCreateProfile())
-                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+            .frame(maxWidth: .infinity, alignment: .trailing)
-            } footer: {
-                VStack(alignment: .leading, spacing: 4) {
-                    sharedGroupProfileInfo(incognitoDefault)
-                    Text("Fully decentralized – visible only to members.")
-                }
-                .frame(maxWidth: .infinity, alignment: .leading)
-                .onTapGesture(perform: hideKeyboard)
-            }
         }
         .onAppear() {
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                 focusDisplayName = true
             }
         }
+        .padding()
         .confirmationDialog("Group image", isPresented: $showChooseSource, titleVisibility: .visible) {
             Button("Take picture") {
                 showTakePhoto = true
@@ -130,15 +129,10 @@ struct AddGroupView: View {
             }
         }
         .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) { _ in
+            LibraryImagePicker(image: $chosenImage) {
-                await MainActor.run {
+                didSelectItem in showImagePicker = false
-                    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)
@@ -146,53 +140,26 @@ 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)
-            .padding(.leading, 36)
+            .textInputAutocapitalization(.never)
-    }
+            .disableAutocorrection(true)
-
+            .padding(.leading, 28)
-    func sharedGroupProfileInfo(_ incognito: Bool) -> Text {
+            .padding(.bottom)
-        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 {
-            profile.displayName = profile.displayName.trimmingCharacters(in: .whitespaces)
+            let gInfo = try apiNewGroup(profile)
-            profile.groupPreferences = GroupPreferences(history: GroupPreference(enable: .on))
-            let gInfo = try apiNewGroup(incognito: incognitoDefault, groupProfile: profile)
             Task {
                 let groupMembers = await apiListMembers(gInfo.groupId)
                 await MainActor.run {
-                    m.groupMembers = groupMembers.map { GMember.init($0) }
+                    ChatModel.shared.groupMembers = groupMembers
                 }
             }
             let c = Chat(chatInfo: .group(groupInfo: gInfo), chatItems: [])
@@ -213,8 +180,7 @@ struct AddGroupView: View {
     }
 
     func canCreateProfile() -> Bool {
-        let name = profile.displayName.trimmingCharacters(in: .whitespaces)
+        profile.displayName != "" && validDisplayName(profile.displayName)
-        return name != "" && validDisplayName(name)
     }
 }
 

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

@@ -0,0 +1,42 @@
+//
+//  ConnectViaLinkView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 21/09/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+enum ConnectViaLinkTab: String {
+    case scan
+    case paste
+}
+
+struct ConnectViaLinkView: View {
+    @State private var selection: ConnectViaLinkTab = connectViaLinkTabDefault.get()
+
+    var body: some View {
+        TabView(selection: $selection) {
+            ScanToConnectView()
+                .tabItem {
+                    Label("Scan QR code", systemImage: "qrcode")
+                }
+                .tag(ConnectViaLinkTab.scan)
+            PasteToConnectView()
+                .tabItem {
+                    Label("Paste received link", systemImage: "doc.plaintext")
+                }
+                .tag(ConnectViaLinkTab.paste)
+        }
+        .onChange(of: selection) { _ in
+            connectViaLinkTabDefault.set(selection)
+        }
+    }
+}
+
+struct ConnectViaLinkView_Previews: PreviewProvider {
+    static var previews: some View {
+        ConnectViaLinkView()
+    }
+}

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

@@ -0,0 +1,93 @@
+//
+//  CreateLinkView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 21/09/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+enum CreateLinkTab {
+    case oneTime
+    case longTerm
+
+    var title: LocalizedStringKey {
+        switch self {
+        case .oneTime: return "One-time invitation link"
+        case .longTerm: return "Your SimpleX address"
+        }
+    }
+}
+
+struct CreateLinkView: View {
+    @EnvironmentObject var m: ChatModel
+    @State var selection: CreateLinkTab
+    @State var connReqInvitation: String = ""
+    @State var contactConnection: PendingContactConnection? = nil
+    @State private var creatingConnReq = false
+    var viaNavLink = false
+
+    var body: some View {
+        if viaNavLink {
+            createLinkView()
+        } else {
+            NavigationView {
+                createLinkView()
+            }
+        }
+    }
+
+    private func createLinkView() -> some View {
+        TabView(selection: $selection) {
+            AddContactView(contactConnection: $contactConnection, connReqInvitation: connReqInvitation)
+                .tabItem {
+                    Label(
+                        connReqInvitation == ""
+                        ? "Create one-time invitation link"
+                        : "One-time invitation link",
+                        systemImage: "1.circle"
+                    )
+                }
+                .tag(CreateLinkTab.oneTime)
+            UserAddressView(viaCreateLinkView: true)
+                .tabItem {
+                    Label("Your SimpleX address", systemImage: "infinity.circle")
+                }
+                .tag(CreateLinkTab.longTerm)
+        }
+        .onChange(of: selection) { _ in
+            if case .oneTime = selection, connReqInvitation == "", contactConnection == nil && !creatingConnReq {
+                createInvitation()
+            }
+        }
+        .onAppear { m.connReqInv = connReqInvitation }
+        .onDisappear { m.connReqInv = nil }
+        .navigationTitle(selection.title)
+        .navigationBarTitleDisplayMode(.large)
+    }
+
+    private func createInvitation() {
+        creatingConnReq = true
+        Task {
+            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
+                await MainActor.run {
+                    connReqInvitation = connReq
+                    contactConnection = pcc
+                    m.connReqInv = connReq
+                }
+            } else {
+                await MainActor.run {
+                    creatingConnReq = false
+                }
+            }
+        }
+    }
+}
+
+struct CreateLinkView_Previews: PreviewProvider {
+    static var previews: some View {
+        CreateLinkView(selection: CreateLinkTab.oneTime)
+    }
+}

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

@@ -0,0 +1,127 @@
+//
+//  NewChatButton.swift
+//  SimpleX
+//
+//  Created by Evgeny Poberezkin on 31/01/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+enum NewChatAction: Identifiable {
+    case createLink(link: String, connection: PendingContactConnection)
+    case connectViaLink
+    case createGroup
+
+    var id: String {
+        switch self {
+        case let .createLink(link, _): return "createLink \(link)"
+        case .connectViaLink: return "connectViaLink"
+        case .createGroup: return "createGroup"
+        }
+    }
+}
+
+struct NewChatButton: View {
+    @Binding var showAddChat: Bool
+    @State private var actionSheet: NewChatAction?
+
+    var body: some View {
+        Button { showAddChat = true } label: {
+            Image(systemName: "square.and.pencil")
+                .resizable()
+                .scaledToFit()
+                .frame(width: 24, height: 24)
+        }
+        .confirmationDialog("Start a new chat", isPresented: $showAddChat, titleVisibility: .visible) {
+            Button("Share one-time invitation link") { addContactAction() }
+            Button("Connect via link / QR code") { actionSheet = .connectViaLink }
+            Button("Create secret group") { actionSheet = .createGroup }
+        }
+        .sheet(item: $actionSheet) { sheet in
+            switch sheet {
+            case let .createLink(link, pcc):
+                CreateLinkView(selection: .oneTime, connReqInvitation: link, contactConnection: pcc)
+            case .connectViaLink: ConnectViaLinkView()
+            case .createGroup: AddGroupView()
+            }
+        }
+    }
+
+    func addContactAction() {
+        Task {
+            if let (connReq, pcc) = await apiAddContact(incognito: incognitoGroupDefault.get()) {
+                actionSheet = .createLink(link: connReq, connection: pcc)
+            }
+        }
+    }
+}
+
+enum ConnReqType: Equatable {
+    case contact
+    case invitation
+}
+
+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))
+            }
+        } else {
+            DispatchQueue.main.async {
+                dismiss?()
+            }
+        }
+    }
+}
+
+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
+    }
+}
+
+func checkCRDataGroup(_ crData: CReqClientData) -> Bool {
+    return crData.type == "group" && crData.groupLinkId != nil
+}
+
+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 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!"
+    )
+}
+
+struct NewChatButton_Previews: PreviewProvider {
+    static var previews: some View {
+        NewChatButton(showAddChat: Binding.constant(false))
+    }
+}

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

@@ -1,52 +0,0 @@
-//
-//  NewChatMenuButton.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 28.11.2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-enum NewChatMenuOption: Identifiable {
-    case newContact
-    case newGroup
-
-    var id: Self { self }
-}
-
-struct NewChatMenuButton: View {
-    @Binding var newChatMenuOption: NewChatMenuOption?
-
-    var body: some View {
-        Menu {
-            Button {
-                newChatMenuOption = .newContact
-            } label: {
-                Text("Add contact")
-            }
-            Button {
-                newChatMenuOption = .newGroup
-            } label: {
-                Text("Create group")
-            }
-        } label: {
-            Image(systemName: "square.and.pencil")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 24, height: 24)
-        }
-        .sheet(item: $newChatMenuOption) { opt in
-            switch opt {
-            case .newContact: NewChatView(selection: .invite)
-            case .newGroup: AddGroupView()
-            }
-        }
-    }
-}
-
-#Preview {
-    NewChatMenuButton(
-        newChatMenuOption: Binding.constant(nil)
-    )
-}

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

@@ -1,959 +0,0 @@
-//
-//  NewChatView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 28.11.2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-import CodeScanner
-import AVFoundation
-
-enum SomeAlert: Identifiable {
-    case someAlert(alert: Alert, id: String)
-
-    var id: String {
-        switch self {
-        case let .someAlert(_, id): return id
-        }
-    }
-}
-
-private enum NewChatViewAlert: Identifiable {
-    case planAndConnectAlert(alert: PlanAndConnectAlert)
-    case newChatSomeAlert(alert: SomeAlert)
-
-    var id: String {
-        switch self {
-        case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
-        case let .newChatSomeAlert(alert): return "newChatSomeAlert \(alert.id)"
-        }
-    }
-}
-
-enum NewChatOption: Identifiable {
-    case invite
-    case connect
-
-    var id: Self { self }
-}
-
-struct NewChatView: View {
-    @EnvironmentObject var m: ChatModel
-    @State var selection: NewChatOption
-    @State var showQRCodeScanner = false
-    @State private var invitationUsed: Bool = false
-    @State private var contactConnection: PendingContactConnection? = nil
-    @State private var connReqInvitation: String = ""
-    @State private var creatingConnReq = false
-    @State private var pastedLink: String = ""
-    @State private var alert: NewChatViewAlert?
-
-    var body: some View {
-        VStack(alignment: .leading) {
-            HStack {
-                Text("New chat")
-                    .font(.largeTitle)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                Spacer()
-                InfoSheetButton {
-                    AddContactLearnMore(showTitle: true)
-                }
-            }
-            .padding()
-            .padding(.top)
-
-            Picker("New chat", selection: $selection) {
-                Label("Add contact", systemImage: "link")
-                    .tag(NewChatOption.invite)
-                Label("Connect via link", systemImage: "qrcode")
-                    .tag(NewChatOption.connect)
-            }
-            .pickerStyle(.segmented)
-            .padding()
-
-            VStack {
-                // it seems there's a bug in iOS 15 if several views in switch (or if-else) statement have different transitions
-                // https://developer.apple.com/forums/thread/714977?answerId=731615022#731615022
-                if case .invite = selection {
-                    prepareAndInviteView()
-                        .transition(.move(edge: .leading))
-                        .onAppear {
-                            createInvitation()
-                        }
-                }
-                if case .connect = selection {
-                    ConnectView(showQRCodeScanner: showQRCodeScanner, pastedLink: $pastedLink, alert: $alert)
-                        .transition(.move(edge: .trailing))
-                }
-            }
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .background(
-                // Rectangle is needed for swipe gesture to work on mostly empty views (creatingLinkProgressView and retryButton)
-                Rectangle()
-                    .fill(Color(uiColor: .systemGroupedBackground))
-            )
-            .animation(.easeInOut(duration: 0.3333), value: selection)
-            .gesture(DragGesture(minimumDistance: 20.0, coordinateSpace: .local)
-                .onChanged { value in
-                    switch(value.translation.width, value.translation.height) {
-                    case (...0, -30...30): // left swipe
-                        if selection == .invite {
-                            selection = .connect
-                        }
-                    case (0..., -30...30): // right swipe
-                        if selection == .connect {
-                            selection = .invite
-                        }
-                    default: ()
-                    }
-                }
-            )
-        }
-        .background(Color(.systemGroupedBackground))
-        .onChange(of: invitationUsed) { used in
-            if used && !(m.showingInvitation?.connChatUsed ?? true) {
-                m.markShowingInvitationUsed()
-            }
-        }
-        .onDisappear {
-            if !(m.showingInvitation?.connChatUsed ?? true),
-               let conn = contactConnection {
-                AlertManager.shared.showAlert(Alert(
-                    title: Text("Keep unused invitation?"),
-                    message: Text("You can view invitation link again in connection details."),
-                    primaryButton: .default(Text("Keep")) {},
-                    secondaryButton: .destructive(Text("Delete")) {
-                        Task {
-                            await deleteChat(Chat(
-                                chatInfo: .contactConnection(contactConnection: conn),
-                                chatItems: []
-                            ))
-                        }
-                    }
-                ))
-            }
-            m.showingInvitation = nil
-        }
-        .alert(item: $alert) { a in
-            switch(a) {
-            case let .planAndConnectAlert(alert):
-                return planAndConnectAlert(alert, dismiss: true, cleanup: { pastedLink = "" })
-            case let .newChatSomeAlert(.someAlert(alert, _)):
-                return alert
-            }
-        }
-    }
-
-    private func prepareAndInviteView() -> some View {
-        ZStack { // ZStack is needed for views to not make transitions between each other
-            if connReqInvitation != "" {
-                InviteView(
-                    invitationUsed: $invitationUsed,
-                    contactConnection: $contactConnection,
-                    connReqInvitation: connReqInvitation
-                )
-            } else if creatingConnReq {
-                creatingLinkProgressView()
-            } else {
-                retryButton()
-            }
-        }
-    }
-
-    private func createInvitation() {
-        if connReqInvitation == "" && contactConnection == nil && !creatingConnReq {
-            creatingConnReq = true
-            Task {
-                _ = try? await Task.sleep(nanoseconds: 250_000000)
-                let (r, apiAlert) = await apiAddContact(incognito: incognitoGroupDefault.get())
-                if let (connReq, pcc) = r {
-                    await MainActor.run {
-                        m.updateContactConnection(pcc)
-                        m.showingInvitation = ShowingInvitation(connId: pcc.id, connChatUsed: false)
-                        connReqInvitation = connReq
-                        contactConnection = pcc
-                    }
-                } else {
-                    await MainActor.run {
-                        creatingConnReq = false
-                        if let apiAlert = apiAlert {
-                            alert = .newChatSomeAlert(alert: .someAlert(alert: apiAlert, id: "createInvitation error"))
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // Rectangle here and in retryButton are needed for gesture to work
-    private func creatingLinkProgressView() -> some View {
-        ProgressView("Creating link…")
-            .progressViewStyle(.circular)
-    }
-
-    private func retryButton() -> some View {
-        Button(action: createInvitation) {
-            VStack(spacing: 6) {
-                Image(systemName: "arrow.counterclockwise")
-                Text("Retry")
-            }
-        }
-    }
-}
-
-private struct InviteView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @Binding var invitationUsed: Bool
-    @Binding var contactConnection: PendingContactConnection?
-    var connReqInvitation: String
-    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
-
-    var body: some View {
-        List {
-            Section("Share this 1-time invite link") {
-                shareLinkView()
-            }
-            .listRowInsets(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 10))
-
-            qrCodeView()
-
-            Section {
-                IncognitoToggle(incognitoEnabled: $incognitoDefault)
-            } footer: {
-                sharedProfileInfo(incognitoDefault)
-            }
-        }
-        .onChange(of: incognitoDefault) { incognito in
-            Task {
-                do {
-                    if let contactConn = contactConnection,
-                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
-                        await MainActor.run {
-                            contactConnection = conn
-                            chatModel.updateContactConnection(conn)
-                        }
-                    }
-                } catch {
-                    logger.error("apiSetConnectionIncognito error: \(responseError(error))")
-                }
-            }
-            setInvitationUsed()
-        }
-    }
-
-    private func shareLinkView() -> some View {
-        HStack {
-            let link = simplexChatLink(connReqInvitation)
-            linkTextView(link)
-            Button {
-                showShareSheet(items: [link])
-                setInvitationUsed()
-            } label: {
-                Image(systemName: "square.and.arrow.up")
-                    .padding(.top, -7)
-            }
-        }
-        .frame(maxWidth: .infinity)
-    }
-
-    private func qrCodeView() -> some View {
-        Section("Or show this code") {
-            SimpleXLinkQRCode(uri: connReqInvitation, onShare: setInvitationUsed)
-                .padding()
-                .background(
-                    RoundedRectangle(cornerRadius: 12, style: .continuous)
-                        .fill(Color(uiColor: .secondarySystemGroupedBackground))
-                )
-                .padding(.horizontal)
-                .listRowBackground(Color.clear)
-                .listRowSeparator(.hidden)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-        }
-    }
-
-    private func setInvitationUsed() {
-        if !invitationUsed {
-            invitationUsed = true
-        }
-    }
-}
-
-private struct ConnectView: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @State var showQRCodeScanner = false
-    @State private var cameraAuthorizationStatus: AVAuthorizationStatus?
-    @Binding var pastedLink: String
-    @Binding var alert: NewChatViewAlert?
-    @State private var sheet: PlanAndConnectActionSheet?
-
-    var body: some View {
-        List {
-            Section("Paste the link you received") {
-                pasteLinkView()
-            }
-
-            scanCodeView()
-        }
-        .actionSheet(item: $sheet) { s in
-            planAndConnectActionSheet(s, dismiss: true, cleanup: { pastedLink = "" })
-        }
-        .onAppear {
-            let status = AVCaptureDevice.authorizationStatus(for: .video)
-            cameraAuthorizationStatus = status
-            if showQRCodeScanner {
-                switch status {
-                case .notDetermined: askCameraAuthorization()
-                case .restricted: showQRCodeScanner = false
-                case .denied: showQRCodeScanner = false
-                case .authorized: ()
-                @unknown default: askCameraAuthorization()
-                }
-            }
-        }
-    }
-
-    func askCameraAuthorization(_ cb: (() -> Void)? = nil) {
-        AVCaptureDevice.requestAccess(for: .video) { allowed in
-            cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)
-            if allowed { cb?() }
-        }
-    }
-
-    @ViewBuilder private func pasteLinkView() -> some View {
-        if pastedLink == "" {
-            Button {
-                if let str = UIPasteboard.general.string {
-                    if let link = strHasSingleSimplexLink(str.trimmingCharacters(in: .whitespaces)) {
-                        pastedLink = link.text
-                        // It would be good to hide it, but right now it is not clear how to release camera in CodeScanner
-                        // https://github.com/twostraws/CodeScanner/issues/121
-                        // No known tricks worked (changing view ID, wrapping it in another view, etc.)
-                        // showQRCodeScanner = false
-                        connect(pastedLink)
-                    } else {
-                        alert = .newChatSomeAlert(alert: .someAlert(
-                            alert: mkAlert(title: "Invalid link", message: "The text you pasted is not a SimpleX link."),
-                            id: "pasteLinkView: code is not a SimpleX link"
-                        ))
-                    }
-                }
-            } label: {
-                Text("Tap to paste link")
-            }
-            .disabled(!ChatModel.shared.pasteboardHasStrings)
-            .frame(maxWidth: .infinity, alignment: .center)
-        } else {
-            linkTextView(pastedLink)
-        }
-    }
-
-    private func scanCodeView() -> some View {
-        Section("Or scan QR code") {
-            if showQRCodeScanner, case .authorized = cameraAuthorizationStatus {
-                CodeScannerView(codeTypes: [.qr], scanMode: .continuous, completion: processQRCode)
-                    .aspectRatio(1, contentMode: .fit)
-                    .cornerRadius(12)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                    .padding(.horizontal)
-            } else {
-                Button {
-                    switch cameraAuthorizationStatus {
-                    case .notDetermined: askCameraAuthorization { showQRCodeScanner = true }
-                    case .restricted: ()
-                    case .denied: UIApplication.shared.open(appSettingsURL)
-                    case .authorized: showQRCodeScanner = true
-                    default: askCameraAuthorization { showQRCodeScanner = true }
-                    }
-                } label: {
-                    ZStack {
-                        Rectangle()
-                            .aspectRatio(contentMode: .fill)
-                            .frame(maxWidth: .infinity, maxHeight: .infinity)
-                            .foregroundColor(Color.clear)
-                        switch cameraAuthorizationStatus {
-                        case .restricted: Text("Camera not available")
-                        case .denied:  Label("Enable camera access", systemImage: "camera")
-                        default: Label("Tap to scan", systemImage: "qrcode")
-                        }
-                    }
-                }
-                .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
-                .padding()
-                .background(
-                    RoundedRectangle(cornerRadius: 12, style: .continuous)
-                        .fill(Color(uiColor: .secondarySystemGroupedBackground))
-                )
-                .padding(.horizontal)
-                .listRowBackground(Color.clear)
-                .listRowSeparator(.hidden)
-                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-                .disabled(cameraAuthorizationStatus == .restricted)
-            }
-        }
-    }
-
-    private func processQRCode(_ resp: Result<ScanResult, ScanError>) {
-        switch resp {
-        case let .success(r):
-            let link = r.string
-            if strIsSimplexLink(r.string) {
-                connect(link)
-            } else {
-                alert = .newChatSomeAlert(alert: .someAlert(
-                    alert: mkAlert(title: "Invalid QR code", message: "The code you scanned is not a SimpleX link QR code."),
-                    id: "processQRCode: code is not a SimpleX link"
-                ))
-            }
-        case let .failure(e):
-            logger.error("processQRCode QR code error: \(e.localizedDescription)")
-            alert = .newChatSomeAlert(alert: .someAlert(
-                alert: mkAlert(title: "Invalid QR code", message: "Error scanning code: \(e.localizedDescription)"),
-                id: "processQRCode: failure"
-            ))
-        }
-    }
-
-    private func connect(_ link: String) {
-        planAndConnect(
-            link,
-            showAlert: { alert = .planAndConnectAlert(alert: $0) },
-            showActionSheet: { sheet = $0 },
-            dismiss: true,
-            incognito: nil
-        )
-    }
-}
-
-private func linkTextView(_ link: String) -> some View {
-    Text(link)
-        .lineLimit(1)
-        .font(.caption)
-        .truncationMode(.middle)
-}
-
-struct InfoSheetButton<Content: View>: View {
-    @ViewBuilder let content: Content
-    @State private var showInfoSheet = false
-
-    var body: some View {
-        Button {
-            showInfoSheet = true
-        } label: {
-            Image(systemName: "info.circle")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 24, height: 24)
-        }
-        .sheet(isPresented: $showInfoSheet) {
-            content
-        }
-    }
-}
-
-func strIsSimplexLink(_ str: String) -> Bool {
-    if let parsedMd = parseSimpleXMarkdown(str),
-       parsedMd.count == 1,
-       case .simplexLink = parsedMd[0].format {
-        return true
-    } else {
-        return false
-    }
-}
-
-func strHasSingleSimplexLink(_ str: String) -> FormattedText? {
-    if let parsedMd = parseSimpleXMarkdown(str) {
-       let parsedLinks = parsedMd.filter({ $0.format?.isSimplexLink ?? false })
-        if parsedLinks.count == 1 {
-            return parsedLinks[0]
-        } else {
-            return nil
-        }
-    } else {
-        return nil
-    }
-}
-
-struct IncognitoToggle: View {
-    @Binding var incognitoEnabled: Bool
-    @State private var showIncognitoSheet = false
-
-    var body: some View {
-        ZStack(alignment: .leading) {
-            Image(systemName: incognitoEnabled ? "theatermasks.fill" : "theatermasks")
-                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
-                .foregroundColor(incognitoEnabled ? Color.indigo : .secondary)
-                .font(.system(size: 14))
-            Toggle(isOn: $incognitoEnabled) {
-                HStack(spacing: 6) {
-                    Text("Incognito")
-                    Image(systemName: "info.circle")
-                        .foregroundColor(.accentColor)
-                        .font(.system(size: 14))
-                }
-                .onTapGesture {
-                    showIncognitoSheet = true
-                }
-            }
-            .padding(.leading, 36)
-        }
-        .sheet(isPresented: $showIncognitoSheet) {
-            IncognitoHelp()
-        }
-    }
-}
-
-func sharedProfileInfo(_ incognito: Bool) -> Text {
-    let name = ChatModel.shared.currentUser?.displayName ?? ""
-    return Text(
-        incognito
-        ? "A new random profile will be shared."
-        : "Your profile **\(name)** will be shared."
-    )
-}
-
-enum PlanAndConnectAlert: Identifiable {
-    case ownInvitationLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case invitationLinkConnecting(connectionLink: String)
-    case ownContactAddressConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case contactAddressConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnectingConfirmReconnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool)
-    case groupLinkConnecting(connectionLink: String, groupInfo: GroupInfo?)
-
-    var id: String {
-        switch self {
-        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink)"
-        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink)"
-        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink)"
-        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink)"
-        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink)"
-        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink)"
-        }
-    }
-}
-
-func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool, cleanup: (() -> Void)? = nil) -> Alert {
-    switch alert {
-    case let .ownInvitationLinkConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Connect to yourself?"),
-            message: Text("This is your own one-time link!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
-            ),
-            secondaryButton: .cancel() { cleanup?() }
-        )
-    case .invitationLinkConnecting:
-        return Alert(
-            title: Text("Already connecting!"),
-            message: Text("You are already connecting via this one-time link!"),
-            dismissButton: .default(Text("OK")) { cleanup?() }
-        )
-    case let .ownContactAddressConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Connect to yourself?"),
-            message: Text("This is your own SimpleX address!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
-            ),
-            secondaryButton: .cancel() { cleanup?() }
-        )
-    case let .contactAddressConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Repeat connection request?"),
-            message: Text("You have already requested connection via this address!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Connect incognito" : "Connect"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
-            ),
-            secondaryButton: .cancel() { cleanup?() }
-        )
-    case let .groupLinkConfirmConnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Join group?"),
-            message: Text("You will connect to all group members."),
-            primaryButton: .default(
-                Text(incognito ? "Join incognito" : "Join"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
-            ),
-            secondaryButton: .cancel() { cleanup?() }
-        )
-    case let .groupLinkConnectingConfirmReconnect(connectionLink, connectionPlan, incognito):
-        return Alert(
-            title: Text("Repeat join request?"),
-            message: Text("You are already joining the group via this link!"),
-            primaryButton: .destructive(
-                Text(incognito ? "Join incognito" : "Join"),
-                action: { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) }
-            ),
-            secondaryButton: .cancel() { cleanup?() }
-        )
-    case let .groupLinkConnecting(_, groupInfo):
-        if let groupInfo = groupInfo {
-            return Alert(
-                title: Text("Group already exists!"),
-                message: Text("You are already joining the group \(groupInfo.displayName)."),
-                dismissButton: .default(Text("OK")) { cleanup?() }
-            )
-        } else {
-            return Alert(
-                title: Text("Already joining the group!"),
-                message: Text("You are already joining the group via this link."),
-                dismissButton: .default(Text("OK")) { cleanup?() }
-            )
-        }
-    }
-}
-
-enum PlanAndConnectActionSheet: Identifiable {
-    case askCurrentOrIncognitoProfile(connectionLink: String, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
-    case askCurrentOrIncognitoProfileDestructive(connectionLink: String, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
-    case askCurrentOrIncognitoProfileConnectContactViaAddress(contact: Contact)
-    case ownGroupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool?, groupInfo: GroupInfo)
-
-    var id: String {
-        switch self {
-        case let .askCurrentOrIncognitoProfile(connectionLink, _, _): return "askCurrentOrIncognitoProfile \(connectionLink)"
-        case let .askCurrentOrIncognitoProfileDestructive(connectionLink, _, _): return "askCurrentOrIncognitoProfileDestructive \(connectionLink)"
-        case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact): return "askCurrentOrIncognitoProfileConnectContactViaAddress \(contact.contactId)"
-        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink)"
-        }
-    }
-}
-
-func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool, cleanup: (() -> Void)? = nil) -> ActionSheet {
-    switch sheet {
-    case let .askCurrentOrIncognitoProfile(connectionLink, connectionPlan, title):
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .default(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false, cleanup: cleanup) },
-                .default(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true, cleanup: cleanup) },
-                .cancel() { cleanup?() }
-            ]
-        )
-    case let .askCurrentOrIncognitoProfileDestructive(connectionLink, connectionPlan, title):
-        return ActionSheet(
-            title: Text(title),
-            buttons: [
-                .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false, cleanup: cleanup) },
-                .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true, cleanup: cleanup) },
-                .cancel() { cleanup?() }
-            ]
-        )
-    case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact):
-        return ActionSheet(
-            title: Text("Connect with \(contact.chatViewName)"),
-            buttons: [
-                .default(Text("Use current profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: false, cleanup: cleanup) },
-                .default(Text("Use new incognito profile")) { connectContactViaAddress_(contact, dismiss: dismiss, incognito: true, cleanup: cleanup) },
-                .cancel() { cleanup?() }
-            ]
-        )
-    case let .ownGroupLinkConfirmConnect(connectionLink, connectionPlan, incognito, groupInfo):
-        if let incognito = incognito {
-            return ActionSheet(
-                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
-                buttons: [
-                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
-                    .destructive(Text(incognito ? "Join incognito" : "Join with current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup) },
-                    .cancel() { cleanup?() }
-                ]
-            )
-        } else {
-            return ActionSheet(
-                title: Text("Join your group?\nThis is your link for group \(groupInfo.displayName)!"),
-                buttons: [
-                    .default(Text("Open group")) { openKnownGroup(groupInfo, dismiss: dismiss, showAlreadyExistsAlert: nil) },
-                    .destructive(Text("Use current profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: false, cleanup: cleanup) },
-                    .destructive(Text("Use new incognito profile")) { connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: true, cleanup: cleanup) },
-                    .cancel() { cleanup?() }
-                ]
-            )
-        }
-    }
-}
-
-func planAndConnect(
-    _ connectionLink: String,
-    showAlert: @escaping (PlanAndConnectAlert) -> Void,
-    showActionSheet: @escaping (PlanAndConnectActionSheet) -> Void,
-    dismiss: Bool,
-    incognito: Bool?,
-    cleanup: (() -> Void)? = nil,
-    filterKnownContact: ((Contact) -> Void)? = nil,
-    filterKnownGroup: ((GroupInfo) -> Void)? = nil
-) {
-    Task {
-        do {
-            let connectionPlan = try await apiConnectPlan(connReq: connectionLink)
-            switch connectionPlan {
-            case let .invitationLink(ilp):
-                switch ilp {
-                case .ok:
-                    logger.debug("planAndConnect, .invitationLink, .ok, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
-                    }
-                case .ownLink:
-                    logger.debug("planAndConnect, .invitationLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownInvitationLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own one-time link!"))
-                    }
-                case let .connecting(contact_):
-                    logger.debug("planAndConnect, .invitationLink, .connecting, incognito=\(incognito?.description ?? "nil")")
-                    if let contact = contact_ {
-                        if let f = filterKnownContact {
-                            f(contact)
-                        } else {
-                            openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
-                        }
-                    } else {
-                        showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
-                    }
-                case let .known(contact):
-                    logger.debug("planAndConnect, .invitationLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownContact {
-                        f(contact)
-                    } else {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
-                    }
-                }
-            case let .contactAddress(cap):
-                switch cap {
-                case .ok:
-                    logger.debug("planAndConnect, .contactAddress, .ok, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
-                    }
-                case .ownLink:
-                    logger.debug("planAndConnect, .contactAddress, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.ownContactAddressConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect to yourself?\nThis is your own SimpleX address!"))
-                    }
-                case .connectingConfirmReconnect:
-                    logger.debug("planAndConnect, .contactAddress, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.contactAddressConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You have already requested connection!\nRepeat connection request?"))
-                    }
-                case let .connectingProhibit(contact):
-                    logger.debug("planAndConnect, .contactAddress, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownContact {
-                        f(contact)
-                    } else {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyConnectingAlert(contact)) }
-                    }
-                case let .known(contact):
-                    logger.debug("planAndConnect, .contactAddress, .known, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownContact {
-                        f(contact)
-                    } else {
-                        openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
-                    }
-                case let .contactViaAddress(contact):
-                    logger.debug("planAndConnect, .contactAddress, .contactViaAddress, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        connectContactViaAddress_(contact, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileConnectContactViaAddress(contact: contact))
-                    }
-                }
-            case let .groupLink(glp):
-                switch glp {
-                case .ok:
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Join group"))
-                    }
-                case let .ownLink(groupInfo):
-                    logger.debug("planAndConnect, .groupLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownGroup {
-                        f(groupInfo)
-                    }
-                    showActionSheet(.ownGroupLinkConfirmConnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito, groupInfo: groupInfo))
-                case .connectingConfirmReconnect:
-                    logger.debug("planAndConnect, .groupLink, .connectingConfirmReconnect, incognito=\(incognito?.description ?? "nil")")
-                    if let incognito = incognito {
-                        showAlert(.groupLinkConnectingConfirmReconnect(connectionLink: connectionLink, connectionPlan: connectionPlan, incognito: incognito))
-                    } else {
-                        showActionSheet(.askCurrentOrIncognitoProfileDestructive(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "You are already joining the group!\nRepeat join request?"))
-                    }
-                case let .connectingProhibit(groupInfo_):
-                    logger.debug("planAndConnect, .groupLink, .connectingProhibit, incognito=\(incognito?.description ?? "nil")")
-                    showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
-                case let .known(groupInfo):
-                    logger.debug("planAndConnect, .groupLink, .known, incognito=\(incognito?.description ?? "nil")")
-                    if let f = filterKnownGroup {
-                        f(groupInfo)
-                    } else {
-                        openKnownGroup(groupInfo, dismiss: dismiss) { AlertManager.shared.showAlert(groupAlreadyExistsAlert(groupInfo)) }
-                    }
-                }
-            }
-        } catch {
-            logger.debug("planAndConnect, plan error")
-            if let incognito = incognito {
-                connectViaLink(connectionLink, connectionPlan: nil, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
-            } else {
-                showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: nil, title: "Connect via link"))
-            }
-        }
-    }
-}
-
-private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incognito: Bool, cleanup: (() -> Void)? = nil) {
-    Task {
-        if dismiss {
-            DispatchQueue.main.async {
-                dismissAllSheets(animated: true)
-            }
-        }
-        _ = await connectContactViaAddress(contact.contactId, incognito)
-        cleanup?()
-    }
-}
-
-private func connectViaLink(
-    _ connectionLink: String,
-    connectionPlan: ConnectionPlan?,
-    dismiss: Bool,
-    incognito: Bool,
-    cleanup: (() -> Void)?
-) {
-    Task {
-        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connReq: connectionLink) {
-            await MainActor.run {
-                ChatModel.shared.updateContactConnection(pcc)
-            }
-            let crt: ConnReqType
-            if let plan = connectionPlan {
-                crt = planToConnReqType(plan)
-            } else {
-                crt = connReqType
-            }
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        AlertManager.shared.showAlert(connReqSentAlert(crt))
-                    }
-                } else {
-                    AlertManager.shared.showAlert(connReqSentAlert(crt))
-                }
-            }
-        } else {
-            if dismiss {
-                DispatchQueue.main.async {
-                    dismissAllSheets(animated: true)
-                }
-            }
-        }
-        cleanup?()
-    }
-}
-
-func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let c = m.getContactChat(contact.contactId) {
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        m.chatId = c.id
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    m.chatId = c.id
-                    showAlreadyExistsAlert?()
-                }
-            }
-        }
-    }
-}
-
-func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAlert: (() -> Void)?) {
-    Task {
-        let m = ChatModel.shared
-        if let g = m.getGroupChat(groupInfo.groupId) {
-            DispatchQueue.main.async {
-                if dismiss {
-                    dismissAllSheets(animated: true) {
-                        m.chatId = g.id
-                        showAlreadyExistsAlert?()
-                    }
-                } else {
-                    m.chatId = g.id
-                    showAlreadyExistsAlert?()
-                }
-            }
-        }
-    }
-}
-
-func contactAlreadyConnectingAlert(_ contact: Contact) -> Alert {
-    mkAlert(
-        title: "Contact already exists",
-        message: "You are already connecting to \(contact.displayName)."
-    )
-}
-
-func groupAlreadyExistsAlert(_ groupInfo: GroupInfo) -> Alert {
-    mkAlert(
-        title: "Group already exists",
-        message: "You are already in group \(groupInfo.displayName)."
-    )
-}
-
-enum ConnReqType: Equatable {
-    case invitation
-    case contact
-    case groupLink
-
-    var connReqSentText: LocalizedStringKey {
-        switch self {
-        case .invitation: return "You will be connected when your contact's device is online, please wait or check later!"
-        case .contact: return "You will be connected when your connection request is accepted, please wait or check later!"
-        case .groupLink: return "You will be connected when group link host's device is online, please wait or check later!"
-        }
-    }
-}
-
-private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType {
-    switch connectionPlan {
-    case .invitationLink: return .invitation
-    case .contactAddress: return .contact
-    case .groupLink: return .groupLink
-    }
-}
-
-func connReqSentAlert(_ type: ConnReqType) -> Alert {
-    return mkAlert(
-        title: "Connection request sent!",
-        message: type.connReqSentText
-    )
-}
-
-#Preview {
-    NewChatView(
-        selection: .invite
-    )
-}

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

@@ -0,0 +1,100 @@
+//
+//  PasteToConnectView.swift
+//  SimpleX (iOS)
+//
+//  Created by Ian Davies on 22/04/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct PasteToConnectView: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
+    @State private var connectionLink: String = ""
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+    @FocusState private var linkEditorFocused: Bool
+
+    var body: some View {
+        List {
+            Text("Connect via link")
+                .font(.largeTitle)
+                .bold()
+                .fixedSize(horizontal: false, vertical: true)
+                .listRowBackground(Color.clear)
+                .listRowSeparator(.hidden)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+                .onTapGesture { linkEditorFocused = false }
+
+            Section {
+                linkEditor()
+
+                Button {
+                    if connectionLink == "" {
+                        connectionLink = UIPasteboard.general.string ?? ""
+                    } else {
+                        connectionLink = ""
+                    }
+                } label: {
+                    if connectionLink == "" {
+                        settingsRow("doc.plaintext") { Text("Paste") }
+                    } else {
+                        settingsRow("multiply") { Text("Clear") }
+                    }
+                }
+                
+                Button {
+                    connect()
+                } label: {
+                    settingsRow("link") { Text("Connect") }
+                }
+                .disabled(connectionLink == "" || connectionLink.trimmingCharacters(in: .whitespaces).firstIndex(of: " ") != nil)
+                
+                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+            } footer: {
+                sharedProfileInfo(incognitoDefault)
+                + Text(String("\n\n"))
+                + Text("You can also connect by clicking the link. If it opens in the browser, click **Open in mobile app** button.")
+            }
+        }
+    }
+
+    private func linkEditor() -> some View {
+        ZStack {
+            Group {
+                if connectionLink.isEmpty {
+                    TextEditor(text: Binding.constant(NSLocalizedString("Paste the link you received to connect with your contact.", comment: "placeholder")))
+                        .foregroundColor(.secondary)
+                        .disabled(true)
+                }
+                TextEditor(text: $connectionLink)
+                    .onSubmit(connect)
+                    .textInputAutocapitalization(.never)
+                    .disableAutocorrection(true)
+                    .focused($linkEditorFocused)
+            }
+            .allowsTightening(false)
+            .padding(.horizontal, -5)
+            .padding(.top, -8)
+            .frame(height: 180, alignment: .topLeading)
+            .frame(maxWidth: .infinity, alignment: .leading)
+        }
+    }
+
+    private func connect() {
+        let link = connectionLink.trimmingCharacters(in: .whitespaces)
+        if let crData = parseLinkQueryData(link),
+           checkCRDataGroup(crData) {
+            dismiss()
+            AlertManager.shared.showAlert(groupLinkAlert(link, incognito: incognitoDefault))
+        } else {
+            connectViaLink(link, dismiss: dismiss, incognito: incognitoDefault)
+        }
+    }
+}
+
+struct PasteToConnectView_Previews: PreviewProvider {
+    static var previews: some View {
+        PasteToConnectView()
+    }
+}

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

@@ -11,39 +11,29 @@ import CoreImage.CIFilterBuiltins
 
 struct MutableQRCode: View {
     @Binding var uri: String
-    var withLogo: Bool = true
+    @State private var image: UIImage?
-    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
 
     var body: some View {
-        QRCode(uri: uri, withLogo: withLogo, tintColor: tintColor)
+        ZStack {
-            .id("simplex-qrcode-view-for-\(uri)")
+            if let image = image {
+                qrCodeImage(image)
+            }
+        }
+        .onAppear {
+            image = generateImage(uri)
+        }
+        .onChange(of: uri) { _ in
+            image = generateImage(uri)
         }
-}
-
-struct SimpleXLinkQRCode: View {
-    let uri: String
-    var withLogo: Bool = true
-    var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
-    var onShare: (() -> Void)? = nil
-
-    var body: some View {
-        QRCode(uri: simplexChatLink(uri), withLogo: withLogo, tintColor: tintColor, onShare: onShare)
     }
-}
-
-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
     var tintColor = UIColor(red: 0.023, green: 0.176, blue: 0.337, alpha: 1)
-    var onShare: (() -> Void)? = nil
     @State private var image: UIImage? = nil
-    @State private var makeScreenshotFunc: () -> Void = {}
+    @State private var makeScreenshotBinding: () -> Void = {}
 
     var body: some View {
         ZStack {
@@ -64,20 +54,18 @@ struct QRCode: View {
                     }
                 }
                 .onAppear {
-                    makeScreenshotFunc = {
+                    makeScreenshotBinding = {
                         let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
+                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])}
-                        onShare?()
-                    }
                 }
                 .frame(width: geo.size.width, height: geo.size.height)
             }
         }
-        .onTapGesture(perform: makeScreenshotFunc)
+        .onTapGesture(perform: makeScreenshotBinding)
         .onAppear {
-            image = image ?? generateImage(uri, tintColor: tintColor)
+            image = image ?? generateImage(uri)?.replaceColor(UIColor.black, tintColor)
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
+
     }
 }
 
@@ -89,13 +77,13 @@ private func qrCodeImage(_ image: UIImage) -> some View {
         .textSelection(.enabled)
 }
 
-private func generateImage(_ uri: String, tintColor: UIColor) -> UIImage? {
+private func generateImage(_ uri: String) -> UIImage? {
     let context = CIContext()
     let filter = CIFilter.qrCodeGenerator()
     filter.message = Data(uri.utf8)
     if let outputImage = filter.outputImage,
        let cgImage = context.createCGImage(outputImage, from: outputImage.extent) {
-        return UIImage(cgImage: cgImage).replaceColor(UIColor.black, tintColor)
+        return UIImage(cgImage: cgImage)
     }
     return nil
 }

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

@@ -0,0 +1,75 @@
+//
+//  ConnectContactView.swift
+//  SimpleX
+//
+//  Created by Evgeny Poberezkin on 29/01/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+import CodeScanner
+
+struct ScanToConnectView: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
+    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+
+    var body: some View {
+        ScrollView {
+            VStack(alignment: .leading) {
+                Text("Scan QR code")
+                    .font(.largeTitle)
+                    .bold()
+                    .fixedSize(horizontal: false, vertical: true)
+                    .padding(.vertical)
+
+                CodeScannerView(codeTypes: [.qr], completion: processQRCode)
+                    .aspectRatio(1, contentMode: .fit)
+                    .cornerRadius(12)
+
+                IncognitoToggle(incognitoEnabled: $incognitoDefault)
+                    .padding(.horizontal)
+                    .padding(.vertical, 6)
+                    .background(
+                        RoundedRectangle(cornerRadius: 12, style: .continuous)
+                            .fill(Color(uiColor: .systemBackground))
+                    )
+                    .padding(.top)
+
+                Group {
+                    sharedProfileInfo(incognitoDefault)
+                    + Text(String("\n\n"))
+                    + Text("If you cannot meet in person, you can **scan QR code in the video call**, or your contact can share an invitation link.")
+                }
+                .font(.footnote)
+                .foregroundColor(.secondary)
+                .padding(.horizontal)
+            }
+            .padding()
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+        }
+        .background(Color(.systemGroupedBackground))
+    }
+
+    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) }
+            }
+        case let .failure(e):
+            logger.error("ConnectContactView.processQRCode QR code error: \(e.localizedDescription)")
+            dismiss()
+        }
+    }
+}
+
+struct ConnectContactView_Previews: PreviewProvider {
+    static var previews: some View {
+        ScanToConnectView()
+    }
+}

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

@@ -9,124 +9,64 @@
 import SwiftUI
 import SimpleXChat
 
-enum UserProfileAlert: Identifiable {
+struct CreateProfile: 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 invalidDisplayNameError
         case createUserError(error: LocalizedStringKey)
-    case invalidNameError(validName: String)
 
         var id: String {
             switch self {
             case .duplicateUserError: return "duplicateUserError"
-        case .invalidDisplayNameError: return "invalidDisplayNameError"
             case .createUserError: return "createUserError"
-        case let .invalidNameError(validName): return "invalidNameError \(validName)"
-        }
-    }
-}
-
-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 = ""
-    @FocusState private var focusDisplayName
 
     var body: some View {
         VStack(alignment: .leading) {
-            Group {
             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.")
-                    .foregroundColor(.secondary)
+                .padding(.bottom, 4)
             Text("The profile is only shared with your contacts.")
-                    .foregroundColor(.secondary)
                 .padding(.bottom)
-            }
-            .padding(.bottom)
-
             ZStack(alignment: .topLeading) {
-                let name = displayName.trimmingCharacters(in: .whitespaces)
+                if !validDisplayName(displayName) {
-                let validName = mkValidName(name)
+                    Image(systemName: "exclamationmark.circle")
-                if name != validName {
+                        .foregroundColor(.red)
-                    Button {
+                        .padding(.top, 4)
-                        showAlert(.invalidNameError(validName: validName))
-                    } label: {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.red)
                 }
-                } else {
+                textField("Display name", text: $displayName)
-                    Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
-                }
-                TextField("Enter your name…", text: $displayName)
                     .focused($focusDisplayName)
-                    .padding(.leading, 32)
+                    .submitLabel(.next)
+                    .onSubmit {
+                        if canCreateProfile() { focusFullName = true }
+                        else { focusDisplayName = true }
                     }
-            .padding(.bottom)
-            Spacer()
-            onboardingButtons()
             }
-        .onAppear() {
+            textField("Full name (optional)", text: $fullName)
-            focusDisplayName = true
+                .focused($focusFullName)
-            setLastVersionDefault()
+                .submitLabel(.go)
-        }
+                .onSubmit {
-        .padding()
+                    if canCreateProfile() { createProfile() }
-        .frame(maxWidth: .infinity, alignment: .leading)
+                    else { focusFullName = true }
-        .keyboardPadding()
                 }
 
-    func onboardingButtons() -> some View {
+            Spacer()
+
             HStack {
+                if m.users.isEmpty {
                     Button {
                         hideKeyboard()
                         withAnimation {
@@ -138,33 +78,49 @@ struct CreateFirstProfile: View {
                             Text("About SimpleX")
                         }
                     }
+                }
 
                 Spacer()
 
-            Button {
-                createProfile(displayName, showAlert: showAlert, dismiss: dismiss)
-            } label: {
                 HStack {
+                    Button {
+                        createProfile()
+                    } label: {
                         Text("Create")
                         Image(systemName: "greaterthan")
                     }
+                    .disabled(!canCreateProfile())
                 }
-            .disabled(!canCreateProfile(displayName))
             }
         }
+        .onAppear() {
+            focusDisplayName = true
+            setLastVersionDefault()
+        }
+        .alert(item: $alert) { a in
+            switch a {
+            case .duplicateUserError: return duplicateUserAlert
+            case let .createUserError(err): return creatUserErrorAlert(err)
+            }
+        }
+        .padding()
+        .keyboardPadding()
+    }
 
-    private func showAlert(_ alert: UserProfileAlert) {
+    func textField(_ placeholder: LocalizedStringKey, text: Binding<String>) -> some View {
-        AlertManager.shared.showAlert(userProfileAlert(alert, $displayName))
+        TextField(placeholder, text: text)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.leading, 28)
+            .padding(.bottom)
     }
-}
 
-private func createProfile(_ displayName: String, showAlert: (UserProfileAlert) -> Void, dismiss: DismissAction) {
+    func createProfile() {
         hideKeyboard()
         let profile = Profile(
-        displayName: displayName.trimmingCharacters(in: .whitespaces),
+            displayName: displayName,
-        fullName: ""
+            fullName: fullName
         )
-    let m = ChatModel.shared
         do {
             m.currentUser = try apiCreateActiveUser(profile)
             if m.users.isEmpty {
@@ -187,82 +143,41 @@ private func createProfile(_ displayName: String, showAlert: (UserProfileAlert)
                 if m.currentUser == nil {
                     AlertManager.shared.showAlert(duplicateUserAlert)
                 } else {
-                showAlert(.duplicateUserError)
+                    alert = .duplicateUserError
-            }
-        case .chatCmdError(_, .error(.invalidDisplayName)):
-            if m.currentUser == nil {
-                AlertManager.shared.showAlert(invalidDisplayNameAlert)
-            } else {
-                showAlert(.invalidDisplayNameError)
                 }
             default:
                 let err: LocalizedStringKey = "Error: \(responseError(error))"
                 if m.currentUser == nil {
                     AlertManager.shared.showAlert(creatUserErrorAlert(err))
                 } else {
-                showAlert(.createUserError(error: err))
+                    alert = .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 .invalidDisplayNameError: return invalidDisplayNameAlert
-    case let .createUserError(err): return creatUserErrorAlert(err)
-    case let .invalidNameError(name): return createInvalidNameAlert(name, displayName)
     }
-}
 
-private var duplicateUserAlert: Alert {
+    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 var invalidDisplayNameAlert: Alert {
+    private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
-    Alert(
-        title: Text("Invalid display name!"),
-        message: Text("This display name is invalid. Please choose another name.")
-    )
-}
-
-private func creatUserErrorAlert(_ err: LocalizedStringKey) -> Alert {
         Alert(
             title: Text("Error creating profile!"),
             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 {
-    mkValidName(name.trimmingCharacters(in: .whitespaces)) == name
+    name.firstIndex(of: " ") == nil && name.first != "@" && name.first != "#"
-}
-
-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 {
-                            SimpleXLinkQRCode(uri: userAddress.connReqContact)
+                            QRCode(uri: userAddress.connReqContact)
                                 .frame(maxHeight: g.size.width)
                             shareQRCodeButton(userAddress)
                                 .frame(maxWidth: .infinity)
@@ -81,6 +81,11 @@ struct CreateSimpleXAddress: View {
                         DispatchQueue.main.async {
                             m.userAddress = UserContactLink(connReqContact: connReqContact)
                         }
+                        if let u = try await apiSetProfileAddress(on: true) {
+                            DispatchQueue.main.async {
+                                m.updateUser(u)
+                            }
+                        }
                         await MainActor.run { progressIndicator = false }
                     } catch let error {
                         logger.error("CreateSimpleXAddress create address: \(responseError(error))")
@@ -95,7 +100,7 @@ struct CreateSimpleXAddress: View {
             } label: {
                 Text("Create SimpleX address").font(.title)
             }
-            Text("You can make it visible to your SimpleX contacts via Settings.")
+            Text("Your contacts in SimpleX will see it.\nYou can change it in Settings.")
                 .multilineTextAlignment(.center)
                 .font(.footnote)
                 .padding(.horizontal, 32)
@@ -121,7 +126,7 @@ struct CreateSimpleXAddress: View {
 
     private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
         Button {
-            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
+            showShareSheet(items: [userAddress.connReqContact])
         } label: {
             Label("Share", systemImage: "square.and.arrow.up")
         }
@@ -189,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"), simplexChatLink(userAddress.connReqContact))
+            """, comment: "email text"), 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: CreateFirstProfile()
+        case .step2_CreateProfile: CreateProfile()
         case .step3_CreateSimpleXAddress: CreateSimpleXAddress()
         case .step4_SetNotificationsMode: SetNotificationsMode()
         case .onboardingComplete: EmptyView()

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

@@ -283,68 +283,6 @@ private let versionDescriptions: [VersionDescription] = [
             ),
         ]
     ),
-    VersionDescription(
-        version: "v5.4",
-        post: URL(string: "https://simplex.chat/blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.html"),
-        features: [
-            FeatureDescription(
-                icon: "desktopcomputer",
-                title: "Link mobile and desktop apps! 🔗",
-                description: "Via secure quantum resistant protocol."
-            ),
-            FeatureDescription(
-                icon: "person.2",
-                title: "Better groups",
-                description: "Faster joining and more reliable messages."
-            ),
-            FeatureDescription(
-                icon: "theatermasks",
-                title: "Incognito groups",
-                description: "Create a group using a random profile."
-            ),
-            FeatureDescription(
-                icon: "hand.raised",
-                title: "Block group members",
-                description: "To hide unwanted messages."
-            ),
-            FeatureDescription(
-                icon: "gift",
-                title: "A few more things",
-                description: "- optionally notify deleted contacts.\n- profile names with spaces.\n- and more!"
-            ),
-        ]
-    ),
-    VersionDescription(
-        version: "v5.5",
-        post: URL(string: "https://simplex.chat/blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.html"),
-        features: [
-            FeatureDescription(
-                icon: "folder",
-                title: "Private notes",
-                description: "With encrypted files and media."
-            ),
-            FeatureDescription(
-                icon: "link",
-                title: "Paste link to connect!",
-                description: "Search bar accepts invitation links."
-            ),
-            FeatureDescription(
-                icon: "bubble.left.and.bubble.right",
-                title: "Join group conversations",
-                description: "Recent history and improved [directory bot](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)."
-            ),
-            FeatureDescription(
-                icon: "battery.50",
-                title: "Improved message delivery",
-                description: "With reduced battery usage."
-            ),
-            FeatureDescription(
-                icon: "character",
-                title: "Turkish interface",
-                description: "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
-            ),
-        ]
-    )
 ]
 
 private let lastVersion = versionDescriptions.last!.version

apps/ios/Shared/Views/RemoteAccess/ConnectDesktopView.swift

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

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

@@ -51,9 +51,9 @@ struct AdvancedNetworkSettings: View {
                     }
                     .disabled(currentNetCfg == NetCfg.proxyDefaults)
 
-                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_000000], label: secondsLabel)
+                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [5_000000, 7_500000, 10_000000, 15_000000, 20_000000, 30_000000, 45_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
+                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [3_000000, 5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
-                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [15_000, 30_000, 45_000, 60_000, 90_000, 120_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/IncognitoHelp.swift

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

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

@@ -14,6 +14,9 @@ struct NotificationsView: View {
     @State private var notificationMode: NotificationsMode = ChatModel.shared.notificationMode
     @State private var showAlert: NotificationAlert?
     @State private var legacyDatabase = dbContainerGroupDefault.get() == .documents
+//    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+//    @AppStorage(GROUP_DEFAULT_NTF_ENABLE_LOCAL, store: groupDefaults) private var ntfEnableLocal = false
+//    @AppStorage(GROUP_DEFAULT_NTF_ENABLE_PERIODIC, store: groupDefaults) private var ntfEnablePeriodic = false
 
     var body: some View {
         List {
@@ -85,6 +88,13 @@ struct NotificationsView: View {
                         .padding(.top, 1)
                 }
             }
+
+//            if developerTools {
+//                Section(String("Experimental")) {
+//                    Toggle(String("Always enable local"), isOn: $ntfEnableLocal)
+//                    Toggle(String("Always enable periodic"), isOn: $ntfEnablePeriodic)
+//                }
+//            }
         }
         .disabled(legacyDatabase)
     }
@@ -109,7 +119,7 @@ struct NotificationsView: View {
 
     private func ntfModeAlertTitle(_ mode: NotificationsMode) -> LocalizedStringKey {
         switch mode {
-        case .off: return "Use only local notifications?"
+        case .off: return "Turn off notifications?"
         case .periodic: return "Enable periodic notifications?"
         case .instant: return "Enable instant notifications?"
         }

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

@@ -63,6 +63,7 @@ struct PreferencesView: View {
 
     private func featureFooter(_ feature: ChatFeature, _ allowFeature: Binding<FeatureAllowed>) -> some View {
         Text(feature.allowDescription(allowFeature.wrappedValue))
+            .frame(height: 36, alignment: .topLeading)
     }
 
     private func savePreferences() {

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

@@ -66,9 +66,6 @@ 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)
@@ -93,9 +90,7 @@ struct PrivacySettings: View {
                     }
                     settingsRow("link") {
                         Picker("SimpleX links", selection: $simplexLinkMode) {
-                            ForEach(
+                            ForEach(SimpleXLinkMode.values) { mode in
-                                SimpleXLinkMode.values + (SimpleXLinkMode.values.contains(simplexLinkMode) ? [] : [simplexLinkMode])
-                            ) { mode in
                                 Text(mode.text)
                             }
                         }
@@ -106,6 +101,10 @@ 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 {
@@ -119,7 +118,7 @@ struct PrivacySettings: View {
                     Text("Send delivery receipts to")
                 } footer: {
                     VStack(alignment: .leading) {
-                        Text("These settings are for your current profile **\(m.currentUser?.displayName ?? "")**.")
+                        Text("These settings are for your current profile **\(ChatModel.shared.currentUser?.displayName ?? "")**.")
                         Text("They can be overridden in contact and group settings.")
                     }
                     .frame(maxWidth: .infinity, alignment: .leading)
@@ -184,16 +183,6 @@ 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
@@ -356,7 +345,7 @@ struct SimplexLockView: View {
         var id: Self { self }
     }
 
-    let laDelays: [Int] = [10, 30, 60, 180, 600, 0]
+    let laDelays: [Int] = [10, 30, 60, 180, 0]
 
     func laDelayText(_ t: Int) -> LocalizedStringKey {
         let m = t / 60
@@ -378,7 +367,6 @@ struct SimplexLockView: View {
                             Text(mode.text)
                         }
                     }
-                    .frame(height: 36)
                     if performLA {
                         Picker("Lock after", selection: $laLockDelay) {
                             let delays = laDelays.contains(laLockDelay) ? laDelays : [laLockDelay] + laDelays
@@ -386,7 +374,6 @@ struct SimplexLockView: View {
                                 Text(laDelayText(t))
                             }
                         }
-                        .frame(height: 36)
                         if showChangePassword && laMode == .passcode {
                             Button("Change passcode") {
                                 changeLAPassword()
@@ -467,7 +454,6 @@ struct SimplexLockView: View {
             switch a {
             case .enableAuth:
                 SetAppPasscodeView {
-                    m.contentViewAccessAuthenticated = true
                     laLockDelay = 30
                     prefPerformLA = true
                     showChangePassword = true
@@ -491,23 +477,14 @@ struct SimplexLockView: View {
                     showLAAlert(.laPasscodeNotChangedAlert)
                 }
             case .enableSelfDestruct:
-                SetAppPasscodeView(
+                SetAppPasscodeView(passcodeKeychain: kcSelfDestructPassword, title: "Set passcode", reason: NSLocalizedString("Enable self-destruct passcode", comment: "set passcode view")) {
-                    passcodeKeychain: kcSelfDestructPassword,
-                    prohibitedPasscodeKeychain: kcAppPassword,
-                    title: "Set passcode",
-                    reason: NSLocalizedString("Enable self-destruct passcode", comment: "set passcode view")
-                ) {
                     updateSelfDestruct()
                     showLAAlert(.laSelfDestructPasscodeSetAlert)
                 } cancel: {
                     revertSelfDestruct()
                 }
             case .changeSelfDestructPasscode:
-                SetAppPasscodeView(
+                SetAppPasscodeView(passcodeKeychain: kcSelfDestructPassword, reason: NSLocalizedString("Change self-destruct passcode", comment: "set passcode view")) {
-                    passcodeKeychain: kcSelfDestructPassword,
-                    prohibitedPasscodeKeychain: kcAppPassword,
-                    reason: NSLocalizedString("Change self-destruct passcode", comment: "set passcode view")
-                ) {
                     showLAAlert(.laSelfDestructPasscodeChangedAlert)
                 } cancel: {
                     showLAAlert(.laPasscodeNotChangedAlert)
@@ -629,7 +606,6 @@ struct SimplexLockView: View {
         authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
             switch laResult {
             case .success:
-                m.contentViewAccessAuthenticated = true
                 prefPerformLA = true
                 laAlert = .laTurnedOnAlert
             case .failed:

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

@@ -21,7 +21,7 @@ struct ScanProtocolServer: View {
                 .font(.largeTitle)
                 .bold()
                 .padding(.vertical)
-            CodeScannerView(codeTypes: [.qr], scanMode: .oncePerCode, completion: processQRCode)
+            CodeScannerView(codeTypes: [.qr], completion: processQRCode)
                 .aspectRatio(1, contentMode: .fit)
                 .cornerRadius(12)
                 .padding(.top)

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

@@ -53,10 +53,6 @@ let DEFAULT_WHATS_NEW_VERSION = "defaultWhatsNewVersion"
 let DEFAULT_ONBOARDING_STAGE = "onboardingStage"
 let DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME = "customDisappearingMessageTime"
 let DEFAULT_SHOW_UNREAD_AND_FAVORITES = "showUnreadAndFavorites"
-let DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS = "deviceNameForRemoteAccess"
-let DEFAULT_CONFIRM_REMOTE_SESSIONS = "confirmRemoteSessions"
-let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST = "connectRemoteViaMulticast"
-let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "connectRemoteViaMulticastAuto"
 
 let appDefaults: [String: Any] = [
     DEFAULT_SHOW_LA_NOTICE: false,
@@ -89,24 +85,15 @@ let appDefaults: [String: Any] = [
     DEFAULT_SHOW_MUTE_PROFILE_ALERT: true,
     DEFAULT_ONBOARDING_STAGE: OnboardingStage.onboardingComplete.rawValue,
     DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME: 300,
-    DEFAULT_SHOW_UNREAD_AND_FAVORITES: false,
+    DEFAULT_SHOW_UNREAD_AND_FAVORITES: false
-    DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
-    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
-    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
 ]
 
-// not used anymore
-enum ConnectViaLinkTab: String {
-    case scan
-    case paste
-}
-
 enum SimpleXLinkMode: String, Identifiable {
     case description
     case full
     case browser
 
-    static var values: [SimpleXLinkMode] = [.description, .full]
+    static var values: [SimpleXLinkMode] = [.description, .full, .browser]
 
     public var id: Self { self }
 
@@ -159,11 +146,10 @@ struct SettingsView: View {
     }
 
     @ViewBuilder func settingsView() -> some View {
-        let user = chatModel.currentUser
+        let user: User = chatModel.currentUser!
         NavigationView {
             List {
                 Section("You") {
-                    if let user = user {
                     NavigationLink {
                         UserProfile()
                             .navigationTitle("Your current profile")
@@ -171,18 +157,15 @@ struct SettingsView: View {
                         ProfilePreview(profileOf: user)
                         .padding(.leading, -8)
                     }
-                    }
 
                     NavigationLink {
-                        UserProfilesView(showSettings: $showSettings)
+                        UserProfilesView()
                     } label: {
                         settingsRow("person.crop.rectangle.stack") { Text("Your chat profiles") }
                     }
 
-
-                    if let user = user {
                     NavigationLink {
-                            UserAddressView(shareViaProfile: user.addressShared)
+                        UserAddressView(shareViaProfile: chatModel.currentUser!.addressShared)
                             .navigationTitle("SimpleX address")
                             .navigationBarTitleDisplayMode(.large)
                     } label: {
@@ -196,13 +179,6 @@ struct SettingsView: View {
                         settingsRow("switch.2") { Text("Chat preferences") }
                     }
                 }
-
-                    NavigationLink {
-                        ConnectDesktopView(viaSettings: true)
-                    } label: {
-                        settingsRow("desktopcomputer") { Text("Use from desktop") }
-                    }
-                }
                 .disabled(chatModel.chatRunning != true)
                 
                 Section("Settings") {
@@ -255,7 +231,6 @@ struct SettingsView: View {
                 }
 
                 Section("Help") {
-                    if let user = user {
                     NavigationLink {
                         ChatHelp(showSettings: $showSettings)
                             .navigationTitle("Welcome \(user.displayName)!")
@@ -263,7 +238,6 @@ struct SettingsView: View {
                     } label: {
                         settingsRow("questionmark") { Text("How to use it") }
                     }
-                    }
                     NavigationLink {
                         WhatsNewView(viaSettings: true)
                             .navigationBarTitleDisplayMode(.inline)
@@ -388,9 +362,7 @@ struct SettingsView: View {
 
 func settingsRow<Content : View>(_ icon: String, color: Color = .secondary, content: @escaping () -> Content) -> some View {
     ZStack(alignment: .leading) {
-        Image(systemName: icon).frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+        Image(systemName: icon).frame(maxWidth: 24, maxHeight: 24, alignment: .center).foregroundColor(color)
-            .symbolRenderingMode(.monochrome)
-            .foregroundColor(color)
         content().padding(.leading, indent)
     }
 }
@@ -409,12 +381,10 @@ struct ProfilePreview: View {
                 Text(profileOf.displayName)
                     .fontWeight(.bold)
                     .font(.title2)
-                if profileOf.fullName != "" && profileOf.fullName != profileOf.displayName {
                 Text(profileOf.fullName)
             }
         }
     }
-    }
 }
 
 struct SettingsView_Previews: PreviewProvider {

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

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

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

@@ -17,8 +17,6 @@ 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!
@@ -49,27 +47,18 @@ struct UserProfile: View {
 
                 VStack(alignment: .leading) {
                     ZStack(alignment: .leading) {
-                        if !validNewProfileName(user) {
+                        if !validDisplayName(profile.displayName) {
-                            Button {
+                            Image(systemName: "exclamationmark.circle")
-                                alert = .invalidNameError(validName: mkValidName(profile.displayName))
+                                .foregroundColor(.red)
-                            } label: {
+                                .padding(.bottom, 10)
-                                Image(systemName: "exclamationmark.circle").foregroundColor(.red)
                         }
-                        } else {
+                        profileNameTextEdit("Display name", $profile.displayName)
-                            Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                     }
-                        profileNameTextEdit("Profile name", $profile.displayName)
-                            .focused($focusDisplayName)
-                    }
-                    .padding(.bottom)
-                    if showFullName(user) {
                     profileNameTextEdit("Full name (optional)", $profile.fullName)
-                            .padding(.bottom)
-                    }
                     HStack(spacing: 20) {
                         Button("Cancel") { editProfile = false }
                         Button("Save (and notify contacts)") { saveProfile() }
-                            .disabled(!canSaveProfile(user))
+                            .disabled(profile.displayName == "" || !validDisplayName(profile.displayName))
                     }
                 }
                 .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
@@ -85,14 +74,11 @@ struct UserProfile: View {
                 .frame(maxWidth: .infinity, alignment: .center)
 
                 VStack(alignment: .leading) {
-                    profileNameView("Profile name:", user.profile.displayName)
+                    profileNameView("Display 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)
@@ -120,10 +106,8 @@ struct UserProfile: View {
             }
         }
         .sheet(isPresented: $showImagePicker) {
-            LibraryImagePicker(image: $chosenImage) { _ in
+            LibraryImagePicker(image: $chosenImage) {
-                await MainActor.run {
+                didSelectItem in showImagePicker = false
-                    showImagePicker = false
-                }
             }
         }
         .onChange(of: chosenImage) { image in
@@ -133,12 +117,14 @@ 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)
-            .padding(.leading, 32)
+            .textInputAutocapitalization(.never)
+            .disableAutocorrection(true)
+            .padding(.bottom)
+            .padding(.leading, 28)
     }
 
     func profileNameView(_ label: LocalizedStringKey, _ name: String) -> some View {
@@ -155,34 +141,19 @@ 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 {
-                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/Shared/Views/UserSettings/UserProfilesView.swift

@@ -8,7 +8,6 @@ import SimpleXChat
 
 struct UserProfilesView: View {
     @EnvironmentObject private var m: ChatModel
-    @Binding var showSettings: Bool
     @Environment(\.editMode) private var editMode
     @AppStorage(DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE) private var showHiddenProfilesNotice = true
     @AppStorage(DEFAULT_SHOW_MUTE_PROFILE_ALERT) private var showMuteProfileAlert = true
@@ -26,6 +25,7 @@ struct UserProfilesView: View {
 
     private enum UserProfilesAlert: Identifiable {
         case deleteUser(user: User, delSMPQueues: Bool)
+        case cantDeleteLastUser
         case hiddenProfilesNotice
         case muteProfileAlert
         case activateUserError(error: String)
@@ -34,6 +34,7 @@ struct UserProfilesView: View {
         var id: String {
             switch self {
             case let .deleteUser(user, delSMPQueues): return "deleteUser \(user.userId) \(delSMPQueues)"
+            case .cantDeleteLastUser: return "cantDeleteLastUser"
             case .hiddenProfilesNotice: return "hiddenProfilesNotice"
             case .muteProfileAlert: return "muteProfileAlert"
             case let .activateUserError(err): return "activateUserError \(err)"
@@ -77,7 +78,7 @@ struct UserProfilesView: View {
             Section {
                 let users = filteredUsers()
                 let v = ForEach(users) { u in
-                    userView(u.user)
+                    userView(u.user, allowDelete: users.count > 1)
                 }
                 if #available(iOS 16, *) {
                     v.onDelete { indexSet in
@@ -145,6 +146,13 @@ struct UserProfilesView: View {
                     },
                     secondaryButton: .cancel()
                 )
+            case .cantDeleteLastUser:
+                return Alert(
+                    title: Text("Can't delete user profile!"),
+                    message: m.users.count > 1
+                            ? Text("There should be at least one visible user profile.")
+                            : Text("There should be at least one user profile.")
+                )
             case .hiddenProfilesNotice:
                 return Alert(
                     title: Text("Make profile private!"),
@@ -272,21 +280,11 @@ struct UserProfilesView: View {
                 if let newActive = m.users.first(where: { u in !u.user.activeUser && !u.user.hidden }) {
                     try await changeActiveUserAsync_(newActive.user.userId, viewPwd: nil)
                     try await deleteUser()
-                } else {
-                    // Deleting the last visible user while having hidden one(s)
-                    try await deleteUser()
-                    try await changeActiveUserAsync_(nil, viewPwd: nil)
-                    await MainActor.run {
-                        onboardingStageDefault.set(.step1_SimpleXInfo)
-                        m.onboardingStage = .step1_SimpleXInfo
-                        showSettings = false
-                    }
                 }
             } else {
                 try await deleteUser()
             }
         } catch let error {
-            logger.error("Error deleting user profile: \(error)")
             let a = getErrorAlert(error, "Error deleting user profile")
             alert = .error(title: a.title, error: a.message)
         }
@@ -297,7 +295,7 @@ struct UserProfilesView: View {
         }
     }
 
-    @ViewBuilder private func userView(_ user: User) -> some View {
+    @ViewBuilder private func userView(_ user: User, allowDelete: Bool) -> some View {
         let v = Button {
             Task {
                 do {
@@ -325,7 +323,9 @@ struct UserProfilesView: View {
                 }
             }
         }
+        .disabled(user.activeUser)
         .foregroundColor(.primary)
+        .deleteDisabled(!allowDelete)
         .swipeActions(edge: .leading, allowsFullSwipe: true) {
             if user.hidden {
                 Button("Unhide") {
@@ -361,6 +361,8 @@ struct UserProfilesView: View {
         }
         if #available(iOS 16, *) {
             v
+        } else if !allowDelete {
+            v
         } else {
             v.swipeActions(edge: .trailing, allowsFullSwipe: true) {
                 Button("Delete", role: .destructive) {
@@ -371,8 +373,12 @@ struct UserProfilesView: View {
     }
 
     private func confirmDeleteUser(_ user: User) {
+        if m.users.count > 1 && (user.hidden || visibleUsersCount > 1) {
             showDeleteConfirmation = true
             userToDelete = user
+        } else {
+            alert = .cantDeleteLastUser
+        }
     }
 
     private func setUserPrivacy(_ user: User, successAlert: UserProfilesAlert? = nil, _ api: @escaping () async throws -> User) {
@@ -403,6 +409,6 @@ public func chatPasswordHash(_ pwd: String, _ salt: String) -> String {
 
 struct UserProfilesView_Previews: PreviewProvider {
     static var previews: some View {
-        UserProfilesView(showSettings: Binding.constant(true))
+        UserProfilesView()
     }
 }

apps/ios/SimpleX (iOS).entitlements

@@ -18,9 +18,5 @@
 	<array>
 		<string>$(AppIdentifierPrefix)chat.simplex.app</string>
 	</array>
-	<key>com.apple.developer.networking.multicast</key>
-	<true/>
-	<key>com.apple.developer.device-information.user-assigned-device-name</key>
-	<true/>
 </dict>
 </plist>

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

@@ -4,8 +4,6 @@
 "NSCameraUsageDescription" = "SimpleX needs camera access to scan QR codes to connect to other users and for video calls.";
 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "SimpleX uses Face ID for local authentication";
-/* Privacy - Local Network Usage Description */
-"NSLocalNetworkUsageDescription" = "SimpleX uses local network access to allow using user chat profile via desktop app on the same network.";
 /* Privacy - Microphone Usage Description */
 "NSMicrophoneUsageDescription" = "SimpleX needs microphone access for audio and video calls, and to record voice messages.";
 /* Privacy - Photo Library Additions Usage Description */